diff --git a/.backportrc.json b/.backportrc.json
index 24e08d4768d9a..f89e758afe8a6 100644
--- a/.backportrc.json
+++ b/.backportrc.json
@@ -1,7 +1,7 @@
 {
   "upstream": "elastic/kibana",
   "targetBranchChoices": [
-    { "name": "master", "checked": true },
+    { "name": "main", "checked": true },
     "8.0",
     "7.16",
     "7.15",
@@ -33,7 +33,7 @@
   ],
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
-    "^v8.1.0$": "master",
+    "^v8.1.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,
diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
index 2aba49bfa6460..efe522f592ecd 100644
--- a/.buildkite/pipelines/on_merge.yml
+++ b/.buildkite/pipelines/on_merge.yml
@@ -10,8 +10,6 @@ steps:
 
   - command: .buildkite/scripts/steps/on_merge_build_and_metrics.sh
     label: Default Build and Metrics
-    env:
-      BAZEL_CACHE_MODE: read-write
     agents:
       queue: c2-8
     timeout_in_minutes: 60
diff --git a/.buildkite/scripts/steps/es_snapshots/build.sh b/.buildkite/scripts/steps/es_snapshots/build.sh
index 975d5944da883..c11f041836413 100755
--- a/.buildkite/scripts/steps/es_snapshots/build.sh
+++ b/.buildkite/scripts/steps/es_snapshots/build.sh
@@ -14,6 +14,10 @@ mkdir -p "$destination"
 mkdir -p elasticsearch && cd elasticsearch
 
 export ELASTICSEARCH_BRANCH="${ELASTICSEARCH_BRANCH:-$BUILDKITE_BRANCH}"
+# Until ES renames their master branch to main...
+if [[ "$ELASTICSEARCH_BRANCH" == "main" ]]; then
+  export ELASTICSEARCH_BRANCH="master"
+fi
 
 if [[ ! -d .git ]]; then
   git init
diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh
index 723008d8618d7..fc5a52f1ac991 100755
--- a/.ci/packer_cache.sh
+++ b/.ci/packer_cache.sh
@@ -7,5 +7,5 @@ if [[ "$(which docker)" != "" && "$(command uname -m)" != "aarch64" ]]; then
   docker pull "maven:3.6.3-openjdk-8-slim"
 fi
 
-./.ci/packer_cache_for_branch.sh master
+./.ci/packer_cache_for_branch.sh main
 ./.ci/packer_cache_for_branch.sh 7.16
diff --git a/.ci/packer_cache_for_branch.sh b/.ci/packer_cache_for_branch.sh
index ee220537de340..78548f4667a9f 100755
--- a/.ci/packer_cache_for_branch.sh
+++ b/.ci/packer_cache_for_branch.sh
@@ -7,7 +7,7 @@ checkoutDir="$(pwd)"
 
 function cleanup()
 {
-  if [[ "$branch" != "master" ]]; then
+  if [[ "$branch" != "main" ]]; then
     rm --preserve-root -rf "$checkoutDir"
   fi
 
@@ -16,7 +16,7 @@ function cleanup()
 
 trap 'cleanup' 0
 
-if [[ "$branch" != "master" ]]; then
+if [[ "$branch" != "main" ]]; then
   checkoutDir="/tmp/kibana-$branch"
   git clone https://github.com/elastic/kibana.git --branch "$branch" --depth 1 "$checkoutDir"
   cd "$checkoutDir"
diff --git a/.github/ISSUE_TEMPLATE/v8_breaking_change.md b/.github/ISSUE_TEMPLATE/v8_breaking_change.md
index 9361cf7a52b65..8ef570947dd41 100644
--- a/.github/ISSUE_TEMPLATE/v8_breaking_change.md
+++ b/.github/ISSUE_TEMPLATE/v8_breaking_change.md
@@ -37,7 +37,7 @@ changes to Upgrade Assistant itself, please tag Team:Elasticsearch UI.
 
 **Are there any edge cases?**
 
-**[For Kibana deprecations] Can the change be registered with the [Kibana deprecation service](https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md)?**
+**[For Kibana deprecations] Can the change be registered with the [Kibana deprecation service](https://github.com/elastic/kibana/blob/main/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md)?**
 
 <!-- The deprecation service is consumed by the Upgrade Assistant to surface Kibana deprecations.
   It provides a way for Kibana deprecations to be resolved automatically via an API
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1ea9e5a5a75bc..5974a1ee9a58a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,12 +7,12 @@ Summarize your PR. If it involves visual changes include a screenshot or gif.
 
 Delete any items that are not applicable to this PR.
 
-- [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md)
+- [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
 - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials
 - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
 - [ ] Any UI touched in this PR is usable by keyboard only (learn more about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
 - [ ] Any UI touched in this PR does not create any new axe failures (run axe in browser: [FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/), [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
-- [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/master/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
+- [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
 - [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
 - [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
 
@@ -30,7 +30,7 @@ When forming the risk matrix, consider some of the following examples and how th
 | Multiple Spaces&mdash;unexpected behavior in non-default Kibana Space. | Low | High | Integration tests will verify that all features are still supported in non-default Kibana Space and when user switches between spaces. |
 | Multiple nodes&mdash;Elasticsearch polling might have race conditions when multiple Kibana nodes are polling for the same tasks. | High | Low | Tasks are idempotent, so executing them multiple times will not result in logical error, but will degrade performance. To test for this case we add plenty of unit tests around this logic and document manual testing procedure. |
 | Code should gracefully handle cases when feature X or plugin Y are disabled. | Medium | High | Unit tests will verify that any feature flag or plugin combination still results in our service operational. |
-| [See more potential risk examples](https://github.com/elastic/kibana/blob/master/RISK_MATRIX.mdx) |
+| [See more potential risk examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx) |
 
 
 ### For maintainers
diff --git a/.github/workflows/add-to-apm-project.yml b/.github/workflows/add-to-apm-project.yml
index 26ff71fbdca8c..dee908e9fb762 100644
--- a/.github/workflows/add-to-apm-project.yml
+++ b/.github/workflows/add-to-apm-project.yml
@@ -6,11 +6,11 @@ on:
 jobs:
   add_to_project:
     runs-on: ubuntu-latest
+    if: |
+      github.event.label.name == 'Team:apm'
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project
-        if: |
-          github.event.label.name == 'Team:apm'
         with:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
@@ -26,3 +26,22 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAGc3Zs0VSg"
           GITHUB_TOKEN: ${{ secrets.APM_TECH_KIBANA_USER_TOKEN }}
+      - uses: octokit/graphql-action@v2.x
+        id: label_team
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation label_team($projectid:String!,$itemid:String!,$fieldid:String!,$value:String!) {
+              updateProjectNextItemField(input: { projectId:$projectid itemId:$itemid fieldId:$fieldid value:$value }) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          itemid: ${{ fromJSON(steps.add_to_project.outputs.data).addProjectNextItem.projectNextItem.id }}
+          fieldid: "MDE2OlByb2plY3ROZXh0RmllbGQ0NDE0Ng=="
+          value: "c33f5c54"
+        env:
+          PROJECT_ID: "PN_kwDOAGc3Zs0VSg"
+          GITHUB_TOKEN: ${{ secrets.APM_TECH_KIBANA_USER_TOKEN }}
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index e6fdda9f1cb23..bcb59caa40887 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -1,7 +1,7 @@
 on:
   pull_request_target:
     branches:
-      - master
+      - main
     types:
       - labeled
       - closed
diff --git a/.github/workflows/fix-version-gaps.yml b/.github/workflows/fix-version-gaps.yml
index ea832ff22a68a..6c1f140e6d72e 100644
--- a/.github/workflows/fix-version-gaps.yml
+++ b/.github/workflows/fix-version-gaps.yml
@@ -1,7 +1,7 @@
 on:
   pull_request:
     branches:
-      - master
+      - main
     types:
       - closed
 
diff --git a/STYLEGUIDE.mdx b/STYLEGUIDE.mdx
index 56117d0fd7e59..64278c56ffda5 100644
--- a/STYLEGUIDE.mdx
+++ b/STYLEGUIDE.mdx
@@ -210,7 +210,7 @@ less likely to introduce bugs in the future due to insufficient types.
 
 If you’re not having `any` in your plugin or are starting a new plugin, you should enable the
 [`@typescript-eslint/no-explicit-any`](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-explicit-any.md)
-linting rule for your plugin via the [`.eslintrc.js`](https://github.com/elastic/kibana/blob/master/.eslintrc.js) config.
+linting rule for your plugin via the [`.eslintrc.js`](https://github.com/elastic/kibana/blob/main/.eslintrc.js) config.
 
 ### Avoid non-null assertions
 
@@ -229,7 +229,7 @@ assertion would now wrongly disable proper type checking for us.
 
 If you’re not using non-null assertions in your plugin or are starting a new plugin, consider enabling the
 [`@typescript-eslint/no-non-null-assertion`](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-non-null-assertion.md)
-linting rule for you plugin in the [`.eslintrc.js`](https://github.com/elastic/kibana/blob/master/.eslintrc.js) config.
+linting rule for you plugin in the [`.eslintrc.js`](https://github.com/elastic/kibana/blob/main/.eslintrc.js) config.
 
 ### Return/throw early from functions
 
@@ -623,7 +623,7 @@ by your code until the circular dependencies on these have been solved.
 
 When writing a new component, create a sibling SASS file of the same name and import directly into the **top** of the JS/TS component file. Doing so ensures the styles are never separated or lost on import and allows for better modularization (smaller individual plugin asset footprint).
 
-All SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`globals_[theme].scss` file](src/core/public/core_app/styles/_globals_v7light.scss).
+All SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`globals_[theme].scss` file](src/core/public/core_app/styles/_globals_v8light.scss).
 
 While the styles for this component will only be loaded if the component exists on the page,
 the styles **will** be global and so it is recommended to use a three letter prefix on your
diff --git a/dev_docs/api_welcome.mdx b/dev_docs/api_welcome.mdx
index 4dd0a1484c850..cca911cc6cdd0 100644
--- a/dev_docs/api_welcome.mdx
+++ b/dev_docs/api_welcome.mdx
@@ -12,7 +12,7 @@ documentation for every plugin that exposes a <DocLink id="kibPlatformIntro" sec
 
 <DocCallOut color="warning" title="Experimental">
 This documentation is being automatically generated using an
- [_experimental_ system](https://github.com/elastic/kibana/blob/master/rfcs/text/0014_api_documentation.md). That means
+ [_experimental_ system](https://github.com/elastic/kibana/blob/main/rfcs/text/0014_api_documentation.md). That means
  it may be removed or modified at any time. If you have any questions, feedback or concerns, please create an issue using
   the label `APIDocs`, or reach out to the Kibana Tech Leads
  who are temporarily owning and maintaining this system.
@@ -46,7 +46,7 @@ the instructions <DocLink id="docsSetup" section="configure-the-nav-for-your-con
 configure the navigation menu.  The nav file you need to
  edit is: [https://github.com/elastic/elastic-docs/blob/master/config/nav-kibana-dev.ts](https://github.com/elastic/elastic-docs/blob/master/config/nav-kibana-dev.ts)
 
-Your API docs will exist in the top level [`api_docs` folder](https://github.com/elastic/kibana/tree/master/api_docs) and will use a doc id of the pattern `kib${PluginName}PluginApi`.
+Your API docs will exist in the top level [`api_docs` folder](https://github.com/elastic/kibana/tree/main/api_docs) and will use a doc id of the pattern `kib${PluginName}PluginApi`.
 
 ### Why is a referenced API item not showing up as clickable?
 
@@ -70,7 +70,7 @@ In the short term, the best thing you can do is avoid deeply nested API items. U
 adding `serviceFolders` in your kibana.json. This will automatically split your docs up based on which APIs are defined within the service folders.
 They will get built into a doc with an id of
 `kib${PluginName}${ServiceName}PluginApi`. The data plugin does this, so you
- can [check that out as an example](https://github.com/elastic/kibana/blob/master/src/plugins/data/kibana.json#L13).
+ can [check that out as an example](https://github.com/elastic/kibana/blob/main/src/plugins/data/kibana.json#L13).
 
  If that isn't the case and you are still experiencing performance issues, please file an issue!
 
diff --git a/dev_docs/contributing/best_practices.mdx b/dev_docs/contributing/best_practices.mdx
index 7b72661c3dfd3..d0ae34155d7eb 100644
--- a/dev_docs/contributing/best_practices.mdx
+++ b/dev_docs/contributing/best_practices.mdx
@@ -29,7 +29,7 @@ Refer to [divio documentation](https://documentation.divio.com/) for guidance on
 
 #### Location
 
-If the information spans multiple plugins, consider adding it to the [dev_docs](https://github.com/elastic/kibana/tree/master/dev_docs) folder. If it is plugin specific, consider adding it inside the plugin folder. Write it in an mdx file if you would like it to show up in our new (beta) documentation system.
+If the information spans multiple plugins, consider adding it to the [dev_docs](https://github.com/elastic/kibana/tree/main/dev_docs) folder. If it is plugin specific, consider adding it inside the plugin folder. Write it in an mdx file if you would like it to show up in our new (beta) documentation system.
 
 <DocCallOut title="internal only">
 
@@ -139,7 +139,7 @@ export type foo: string | AnInterface;
 
 ### Example plugins
 
-Running Kibana with `yarn start --run-examples` will include all [example plugins](https://github.com/elastic/kibana/tree/master/examples). These are tested examples of platform services in use. We strongly encourage anyone providing a platform level service or <DocLink id="kibBuildingBlocks" text="building block"/> to include a tutorial that links to a tested example plugin. This is better than relying on copied code snippets, which can quickly get out of date.
+Running Kibana with `yarn start --run-examples` will include all [example plugins](https://github.com/elastic/kibana/tree/main/examples). These are tested examples of platform services in use. We strongly encourage anyone providing a platform level service or <DocLink id="kibBuildingBlocks" text="building block"/> to include a tutorial that links to a tested example plugin. This is better than relying on copied code snippets, which can quickly get out of date.
 
 ## Performance
 
@@ -165,7 +165,7 @@ all of our apps are accessible.
 
 ## Localization
 
-Kibana is translated into other languages. Use our i18n utilities to ensure your public facing strings will be translated to ensure all Kibana apps are localized. Read and adhere to our [i18n guidelines](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/GUIDELINE.md)
+Kibana is translated into other languages. Use our i18n utilities to ensure your public facing strings will be translated to ensure all Kibana apps are localized. Read and adhere to our [i18n guidelines](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/GUIDELINE.md)
 
 <DocCallOut title="Internal only">
   Elasticians, check out the #kibana-localization channel to ask questions and receive guidance.
@@ -173,7 +173,7 @@ Kibana is translated into other languages. Use our i18n utilities to ensure your
 
 ## Styleguide
 
-We use es-lint rules when possible, but please review our [styleguide](https://github.com/elastic/kibana/blob/master/STYLEGUIDE.mdx), which includes recommendations that can't be linted on.
+We use es-lint rules when possible, but please review our [styleguide](https://github.com/elastic/kibana/blob/main/STYLEGUIDE.mdx), which includes recommendations that can't be linted on.
 
 Es-lint overrides on a per-plugin level are discouraged.
 
@@ -231,7 +231,7 @@ Consider how you want to handle the PR review. Reviewing each PR going into the
 
 **3. Use an example plugin**
 
-If you are building a service for developers, create an [example plugin](https://github.com/elastic/kibana/tree/master/examples) to showcase and test intended usage. This is a great way for reviewers and PMs to play around with a feature through the UI, before the production UI is ready. This can also help developers consuming your services get hands on.
+If you are building a service for developers, create an [example plugin](https://github.com/elastic/kibana/tree/main/examples) to showcase and test intended usage. This is a great way for reviewers and PMs to play around with a feature through the UI, before the production UI is ready. This can also help developers consuming your services get hands on.
 
 ## Embrace the monorepo
 
@@ -241,7 +241,7 @@ When experimenting with code, it's completely fine to create a separate GitHub r
 
 There are some exceptions where a separate repo makes sense. However, they are exceptions to the rule. A separate repo has proven beneficial when there's a dedicated team collaborating on a package which has multiple consumers, for example [EUI](https://github.com/elastic/eui).
 
-It may be tempting to get caught up in the dream of writing the next package which is published to npm and downloaded millions of times a week. Knowing the quality of developers that are working on Kibana, this is a real possibility. However, knowing which packages will see mass adoption is impossible to predict. Instead of jumping directly to writing code in a separate repo and accepting all of the complications that come along with it, prefer keeping code inside the Kibana repo. A [Kibana package](https://github.com/elastic/kibana/tree/master/packages) can be used to publish a package to npm, while still keeping the code inside the Kibana repo. Move code to an external repo only when there is a good reason, for example to enable external contributions.
+It may be tempting to get caught up in the dream of writing the next package which is published to npm and downloaded millions of times a week. Knowing the quality of developers that are working on Kibana, this is a real possibility. However, knowing which packages will see mass adoption is impossible to predict. Instead of jumping directly to writing code in a separate repo and accepting all of the complications that come along with it, prefer keeping code inside the Kibana repo. A [Kibana package](https://github.com/elastic/kibana/tree/main/packages) can be used to publish a package to npm, while still keeping the code inside the Kibana repo. Move code to an external repo only when there is a good reason, for example to enable external contributions.
 
 ## Security best practices
 
diff --git a/dev_docs/contributing/code_walkthrough.mdx b/dev_docs/contributing/code_walkthrough.mdx
index 47eb05a95c424..62965add07578 100644
--- a/dev_docs/contributing/code_walkthrough.mdx
+++ b/dev_docs/contributing/code_walkthrough.mdx
@@ -11,59 +11,59 @@ A high-level walk through of the folder structure of our [repository](https://gi
 
 Tip: Look for a `README.md` in a folder to learn about its contents.
 
-## [.buildkite](https://github.com/elastic/kibana/tree/master/.buildkite)
+## [.buildkite](https://github.com/elastic/kibana/tree/main/.buildkite)
 
 Managed by the operations team to set up a new buildkite ci system. Can be ignored by folks outside the Operations team.
 
-## [.ci](https://github.com/elastic/kibana/tree/master/.ci) 
+## [.ci](https://github.com/elastic/kibana/tree/main/.ci) 
 
 Managed by the operations team to contain Jenkins settings. Can be ignored by folks outside the Operations team.
 
-## [.github](https://github.com/elastic/kibana/tree/master/.github)
+## [.github](https://github.com/elastic/kibana/tree/main/.github)
 
-Contains GitHub configuration settings. This file contains issue templates, and the [CODEOWNERS](https://github.com/elastic/kibana/blob/master/.github/CODEOWNERS) file. It's important for teams to keep the CODEOWNERS file up-to-date so the right team is pinged for a code owner review on PRs that edit certain files. Note that the `CODEOWNERS` file only exists on the main/master branch, and is not backported to other branches in the repo.
+Contains GitHub configuration settings. This file contains issue templates, and the [CODEOWNERS](https://github.com/elastic/kibana/blob/main/.github/CODEOWNERS) file. It's important for teams to keep the CODEOWNERS file up-to-date so the right team is pinged for a code owner review on PRs that edit certain files. Note that the `CODEOWNERS` file only exists on the main/master branch, and is not backported to other branches in the repo.
 
-## [api_docs](https://github.com/elastic/kibana/tree/master/api_docs)
+## [api_docs](https://github.com/elastic/kibana/tree/main/api_docs)
 
 Every file in here is auto-generated by the <DocLink id="kibDevDocsApiWelcome" text="API Docs system"/> and used to render our API documentation. If you edit a public plugin or package API and run `node scripts/build_api_docs` you will see files changed in this folder. Do not edit the contents of this folder directly!
 
 Note that currently you may see _a lot_ of changes because that command is not run on every PR and so the content in this folder is often outdated.
 
-## [config](https://github.com/elastic/kibana/tree/master/config)
+## [config](https://github.com/elastic/kibana/tree/main/config)
 
 This contains the base configuration file, `kibana.yml`. If you want to tweak any settings, create a `kibana.dev.yml` in here which will get picked up during development, and not checked into GitHub.
 
-## [docs](https://github.com/elastic/kibana/tree/master/docs)
+## [docs](https://github.com/elastic/kibana/tree/main/docs)
 
-Every folder in here _except_ the [development one](https://github.com/elastic/kibana/tree/master/docs/development) contains manually generated asciidocs that end up hosted in our [Elastic guide](https://www.elastic.co/guide/).
+Every folder in here _except_ the [development one](https://github.com/elastic/kibana/tree/main/docs/development) contains manually generated asciidocs that end up hosted in our [Elastic guide](https://www.elastic.co/guide/).
 
 The `development` folder contains markdown that is auto-generated with our legacy API docs tool. We are aiming to remove it shortly after 8.0FF.
 
-## [dev_docs](https://github.com/elastic/kibana/tree/master/dev_docs)
+## [dev_docs](https://github.com/elastic/kibana/tree/main/dev_docs)
 
 This is where a lot of manually written content for our Developer Guide resides. Developers may also keep the information closer to what it's describing, but it's a good spot for high-level information, or information that describes how multiple plugins work together.
 
-## [examples](https://github.com/elastic/kibana/tree/master/examples)
+## [examples](https://github.com/elastic/kibana/tree/main/examples)
 
 These are our tested example plugins that also get built and hosted [here](https://demo.kibana.dev/8.0/app/developerExamples). If a plugin is written for testing purposes only, it won't go in here. These example plugins should be written with the intention of helping developers understand how to use our services.
 
-## [legacy_rfcs](https://github.com/elastic/kibana/tree/master/legacy_rfcs)
+## [legacy_rfcs](https://github.com/elastic/kibana/tree/main/legacy_rfcs)
 
 We used to write RFCs in `md` format and keep them in the repository, but we have since moved to Google Docs. We kept the folder around, since some folks still read these old docs. If you are an internal contributor you can visit <DocLink id="ktRFCProcess" text="this document"/> to read about our current RFC process.
 
-## [licenses](https://github.com/elastic/kibana/tree/master/licenses)
+## [licenses](https://github.com/elastic/kibana/tree/main/licenses)
 
 Contains our two license header texts, one for the Elastic license and one for the Elastic+SSPL license. All code files inside x-pack should have the Elastic license text at the top, all code files outside x-pack should contain the other. If you have your environment set up to auto-fix on save, eslint should take care of adding it for you. If you don't have it, ci will fail. Can be ignored for the most part, this rarely changes.
 
-## [packages](https://github.com/elastic/kibana/tree/master/packages)
+## [packages](https://github.com/elastic/kibana/tree/main/packages)
 
-The packages folder contains a mixture of build-time related code (like the [code needed to build the api docs](https://github.com/elastic/kibana/tree/master/packages/kbn-docs-utils)), as well as static code that some plugins rely on (like the [kbn-monaco package](https://github.com/elastic/kibana/tree/master/packages/kbn-monaco)). <DocLink id="kibPlatformIntro" section="1000-foot-view" text="This document"/> covers how packages differ from plugins.
+The packages folder contains a mixture of build-time related code (like the [code needed to build the api docs](https://github.com/elastic/kibana/tree/main/packages/kbn-docs-utils)), as well as static code that some plugins rely on (like the [kbn-monaco package](https://github.com/elastic/kibana/tree/main/packages/kbn-monaco)). <DocLink id="kibPlatformIntro" section="1000-foot-view" text="This document"/> covers how packages differ from plugins.
 
-## [plugins](https://github.com/elastic/kibana/tree/master/plugins)
+## [plugins](https://github.com/elastic/kibana/tree/main/plugins)
 
 This is an empty folder in GitHub. It's where third party developers should put their plugin folders. Internal developers can ignore this folder.
 
-## [scripts](https://github.com/elastic/kibana/tree/master/scripts)
+## [scripts](https://github.com/elastic/kibana/tree/main/scripts)
 
 Contains a bunch of developer scripts. These are usually very small files with just two lines that kick off a command, the logic of which resides elsewhere (sometimes `src/dev`, sometimes inside `packages`).
 Example:
@@ -72,65 +72,65 @@ require('../src/setup_node_env');
 require('@kbn/es-archiver').runCli();
 ```
 
-## [src](https://github.com/elastic/kibana/tree/master/src)
+## [src](https://github.com/elastic/kibana/tree/main/src)
 
 This folder and the packages folder contain the most code and where developers usually find themselves. I'll touch on a few of the subfolder, the rest can generally be ignored, or are build/ops related code.
 
-### [src/cli*](https://github.com/elastic/kibana/tree/master/src/cli)
+### [src/cli*](https://github.com/elastic/kibana/tree/main/src/cli)
 
 Maintained primarily by the Operations team, this folder contains code that initializes the Kibana runtime and a bit of work to handle authorization for interactive setup mode.  Most devs should be able to ignore this code.
 
-### [src/core](https://github.com/elastic/kibana/tree/master/src/core)
+### [src/core](https://github.com/elastic/kibana/tree/main/src/core)
 
 This code primarily belongs to the Core team and contains the plugin infrastructure, as well as a bunch of fundamental services like migrations, saved objects, and some UI utilities (toasts, flyouts, etc.).
 
-### [src/dev](https://github.com/elastic/kibana/tree/master/src/dev)
+### [src/dev](https://github.com/elastic/kibana/tree/main/src/dev)
 
 Maintained by the Operations team, this code contains build and development tooling related code. This folder existed before `packages`, so contains mostly older code that hasn't been migrated to packages. Prefer creating a `package` if possible. Can be ignored for the most part if you are not on the Ops team. Prefer 
 
-### [src/plugins](https://github.com/elastic/kibana/tree/master/src/plugins)
+### [src/plugins](https://github.com/elastic/kibana/tree/main/src/plugins)
 
 Contains all of our Basic-licensed plugins. Most folders in this directory will contain `README.md` files explaining what they do. If there are none, you can look at the `owner.gitHub` field inside all `kibana.json`s that will tell you which team to get in touch with for questions.
 
 Note that as plugins can be nested, each folder in this directory may contain multiple plugins.
 
-## [test](https://github.com/elastic/kibana/tree/master/test)
+## [test](https://github.com/elastic/kibana/tree/main/test)
 
 Contains functional tests and related FTR (functional test runner) code for the plugins inside `src/plugins`, although there is a push to move the tests to reside inside the plugins themselves.
 
-## [typings](https://github.com/elastic/kibana/tree/master/typings)
+## [typings](https://github.com/elastic/kibana/tree/main/typings)
 
 Maintained by Ops and Core, this contains global typings for dependencies that do not provide their own types, or don't have types available via [DefinitelyTyped](https://definitelytyped.org). This directory is intended to be minimal; types should only be added here as a last resort.
 
-## [vars](https://github.com/elastic/kibana/tree/master/vars)
+## [vars](https://github.com/elastic/kibana/tree/main/vars)
 
 A bunch of groovy scripts maintained by the Operations team.
 
-## [x-pack](https://github.com/elastic/kibana/tree/master/x-pack)
+## [x-pack](https://github.com/elastic/kibana/tree/main/x-pack)
 
 Contains all code and infrasturcture that powers our gold+ (non-basic) features that are provided under a more restrictive license.
 
-### [x-pack/build_chromium](https://github.com/elastic/kibana/tree/master/x-pack/build_chromium)
+### [x-pack/build_chromium](https://github.com/elastic/kibana/tree/main/x-pack/build_chromium)
 
 Maintained by the App Services UX team, this contains Reporting-related code for building Chromium in order to take server side screenshots.
 
-### [x-pack/dev-tools](https://github.com/elastic/kibana/tree/master/x-pack/dev-tools)
+### [x-pack/dev-tools](https://github.com/elastic/kibana/tree/main/x-pack/dev-tools)
 
 Maintained by the Operations team.
 
-### [x-pack/examples](https://github.com/elastic/kibana/tree/master/x-pack/examples)
+### [x-pack/examples](https://github.com/elastic/kibana/tree/main/x-pack/examples)
 
 Contains all example plugins that rely on gold+ features.
 
-### [x-pack/plugins](https://github.com/elastic/kibana/tree/master/x-pack/plugins)
+### [x-pack/plugins](https://github.com/elastic/kibana/tree/main/x-pack/plugins)
 
 Contains code for all the plugins that power our gold+ features.
 
-### [x-pack/scripts](https://github.com/elastic/kibana/tree/master/x-pack/scripts)
+### [x-pack/scripts](https://github.com/elastic/kibana/tree/main/x-pack/scripts)
 
 Maintained by the Ops team, this folder contains some scripts for running x-pack utilities, like the functional test runner that runs with a license higher than Basic.
 
-### [x-pack/test](https://github.com/elastic/kibana/tree/master/x-pack/test)
+### [x-pack/test](https://github.com/elastic/kibana/tree/main/x-pack/test)
 
 Functional tests for our gold+ features.
 
diff --git a/dev_docs/contributing/standards.mdx b/dev_docs/contributing/standards.mdx
index 5f61be80ee207..172a83935b966 100644
--- a/dev_docs/contributing/standards.mdx
+++ b/dev_docs/contributing/standards.mdx
@@ -69,6 +69,6 @@ Every team should be collecting telemetry metrics on it’s public API usage. Th
 
 ### Documentation
 
-Every public API should be documented inside the [docs/api](https://github.com/elastic/kibana/tree/master/docs/api) folder in asciidoc (this content will eventually be migrated to mdx to support the new docs system). If a public REST API is undocumented, you should either document it, or make it internal.
+Every public API should be documented inside the [docs/api](https://github.com/elastic/kibana/tree/main/docs/api) folder in asciidoc (this content will eventually be migrated to mdx to support the new docs system). If a public REST API is undocumented, you should either document it, or make it internal.
 
 Every public API should have a release tag specified using the appropriate documentation release tag above. If you do this, the docs system will provide a pop up explaining the conditions. If an API is not marked, it should be considered experimental.
diff --git a/dev_docs/getting_started/hello_world_plugin.mdx b/dev_docs/getting_started/hello_world_plugin.mdx
index b95d0cac201fc..be4fcf5671a42 100644
--- a/dev_docs/getting_started/hello_world_plugin.mdx
+++ b/dev_docs/getting_started/hello_world_plugin.mdx
@@ -9,7 +9,7 @@ tags: ['kibana', 'dev', 'contributor', 'tutorials']
 
 This tutorial walks you through two ways to create a plugin that registers an application that says "Hello World!".
 
-You can view the tested example plugin at [examples/hello_world](https://github.com/elastic/kibana/tree/master/examples/hello_world).
+You can view the tested example plugin at [examples/hello_world](https://github.com/elastic/kibana/tree/main/examples/hello_world).
 
 ## 1. Set up your development environment
 
diff --git a/dev_docs/key_concepts/anatomy_of_a_plugin.mdx b/dev_docs/key_concepts/anatomy_of_a_plugin.mdx
index ca9119f4d21b3..4c082fc3bf1db 100644
--- a/dev_docs/key_concepts/anatomy_of_a_plugin.mdx
+++ b/dev_docs/key_concepts/anatomy_of_a_plugin.mdx
@@ -76,7 +76,7 @@ plugins/
 - preboot plugins are bootstrapped to prepare the environment before Kibana starts.
 - standard plugins define Kibana functionality while Kibana is running.
 
-`owner` - [Required] Help users of your plugin know who manages this plugin and how to get in touch. For internal developers, `Owner.name` should be the name of the team that manages this plugin. This should match the team that owns this code in the [CODEOWNERS](https://github.com/elastic/kibana/blob/master/.github/CODEOWNERS) file (however, this is not currently enforced). Internal teams should also use a [GitHub team alias](https://github.com/orgs/elastic/teams) for `owner.githubTeam`. This value is used to create a link to `https://github.com/orgs/elastic/teams/${githubTeam}`, so leave the `elastic/` prefix should be left out. While many teams can contribute to a plugin, only a single team should be the primary owner.
+`owner` - [Required] Help users of your plugin know who manages this plugin and how to get in touch. For internal developers, `Owner.name` should be the name of the team that manages this plugin. This should match the team that owns this code in the [CODEOWNERS](https://github.com/elastic/kibana/blob/main/.github/CODEOWNERS) file (however, this is not currently enforced). Internal teams should also use a [GitHub team alias](https://github.com/orgs/elastic/teams) for `owner.githubTeam`. This value is used to create a link to `https://github.com/orgs/elastic/teams/${githubTeam}`, so leave the `elastic/` prefix should be left out. While many teams can contribute to a plugin, only a single team should be the primary owner.
 
 `description` - [Required] Give your plugin a description to help other developers understand what it does. This is required for internal plugins.
 
diff --git a/dev_docs/key_concepts/kibana_platform_plugin_intro.mdx b/dev_docs/key_concepts/kibana_platform_plugin_intro.mdx
index 737b9d8708f29..195e5c1f6f211 100644
--- a/dev_docs/key_concepts/kibana_platform_plugin_intro.mdx
+++ b/dev_docs/key_concepts/kibana_platform_plugin_intro.mdx
@@ -33,7 +33,7 @@ At a super high-level, Kibana is composed of **plugins**, **core**, and **Kibana
 
 <DocAccordion buttonContent="(Internal only) FAQ: Should I put my code in a plugin or a package?" color="warning">
 <DocCallOut color="warning">
-When the [Bazel migration](https://github.com/elastic/kibana/blob/master/legacy_rfcs/text/0015_bazel.md) is complete, all code, including plugins, will be a package. With that, packages won't be required to be in the `packages/` directory and can be located somewhere that makes more sense structurally.
+When the [Bazel migration](https://github.com/elastic/kibana/blob/main/legacy_rfcs/text/0015_bazel.md) is complete, all code, including plugins, will be a package. With that, packages won't be required to be in the `packages/` directory and can be located somewhere that makes more sense structurally.
 
 In the meantime, the following can be used to determine whether it makes sense to add code to a package inside the `packages` folder, or a plugin inside `src/plugins` or `x-pack/plugins`. 
 
@@ -49,7 +49,7 @@ Downsides to packages:
 
 1. <b>It's not <DocLink id="kibDevPrinciples" text="organized by domain"/></b>. The packages folder is far away from the plugins folder. Having your stateless code in a plugin and the rest in a package may make it hard to find, leading to duplication. The Operations team hopes to fix this by supporting packages and plugins existing in the same folder. You can track this work by following [this issue](https://github.com/elastic/kibana/issues/112886).
 
-2. <b>Development overhead</b>. Developers have to run `yarn kbn watch` to have changes rebuilt automatically. [Phase II](https://github.com/elastic/kibana/blob/master/legacy_rfcs/text/0015_bazel.md#phase-ii---docs-developer-experience) of the Bazel migration work will bring the development experience on par with plugin development. This work can be tracked [here](https://github.com/elastic/kibana/issues/104519). 
+2. <b>Development overhead</b>. Developers have to run `yarn kbn watch` to have changes rebuilt automatically. [Phase II](https://github.com/elastic/kibana/blob/main/legacy_rfcs/text/0015_bazel.md#phase-ii---docs-developer-experience) of the Bazel migration work will bring the development experience on par with plugin development. This work can be tracked [here](https://github.com/elastic/kibana/issues/104519). 
 
 3. <b>Development performance</b>. Rebuild time is typically longer than it would be for the same code in a plugin. The reasons are captured in [this issue](https://github.com/elastic/kibana/issues/107648). The ops team is actively working to reduce this performance increase.
 
diff --git a/dev_docs/key_concepts/navigation.mdx b/dev_docs/key_concepts/navigation.mdx
index 27ba3db111411..b96bfede8fe36 100644
--- a/dev_docs/key_concepts/navigation.mdx
+++ b/dev_docs/key_concepts/navigation.mdx
@@ -30,7 +30,7 @@ Assuming you want to link from your app to *Discover*. When building such URL th
 
 ### Prepending a proper `basePath`
 
-To prepend Kibana's `basePath` use the [core.http.basePath.prepend](https://github.com/elastic/kibana/blob/master/docs/development/core/public/kibana-plugin-core-public.ibasepath.prepend.md) helper:
+To prepend Kibana's `basePath` use the [core.http.basePath.prepend](https://github.com/elastic/kibana/blob/main/docs/development/core/public/kibana-plugin-core-public.ibasepath.prepend.md) helper:
 
 ```tsx
 const discoverUrl = core.http.basePath.prepend(`/discover`);
@@ -50,7 +50,7 @@ console.log(discoverUrl); // http://localhost:5601/bpr/s/space/app/discover
 const discoverUrlWithSomeState = core.http.basePath.prepend(`/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'2020-09-10T11:39:50.203Z',to:'2020-09-10T11:40:20.249Z'))&_a=(columns:!(_source),filters:!(),index:'90943e30-9a47-11e8-b64d-95841ca0b247',interval:auto,query:(language:kuery,query:''),sort:!())`);
 ```
 
-Instead, each app should expose [a locator](https://github.com/elastic/kibana/blob/master/src/plugins/share/common/url_service/locators/README.md).
+Instead, each app should expose [a locator](https://github.com/elastic/kibana/blob/main/src/plugins/share/common/url_service/locators/README.md).
 Other apps should use those locators for navigation or URL creation.
 
 ```tsx
@@ -60,7 +60,7 @@ const discoverUrl = await plugins.discover.locator.getUrl({filters, timeRange});
 await plugins.discover.locator.navigate({filters, timeRange});
 ```
 
-To get a better idea, take a look at *Discover* locator [implementation](https://github.com/elastic/kibana/blob/master/src/plugins/discover/public/locator.ts).
+To get a better idea, take a look at *Discover* locator [implementation](https://github.com/elastic/kibana/blob/main/src/plugins/discover/public/locator.ts).
 It allows specifying various **Discover** app state pieces like: index pattern, filters, query, time range and more.
 
 There are two ways to access locators of other apps:
@@ -86,8 +86,8 @@ window.location.href = urlToADashboard;
 
 To navigate between different Kibana apps without a page reload there are APIs in `core`:
 
-* [core.application.navigateToApp](https://github.com/elastic/kibana/blob/master/docs/development/core/public/kibana-plugin-core-public.applicationstart.navigatetoapp.md)
-* [core.application.navigateToUrl](https://github.com/elastic/kibana/blob/master/docs/development/core/public/kibana-plugin-core-public.applicationstart.navigatetourl.md)
+* [core.application.navigateToApp](https://github.com/elastic/kibana/blob/main/docs/development/core/public/kibana-plugin-core-public.applicationstart.navigatetoapp.md)
+* [core.application.navigateToUrl](https://github.com/elastic/kibana/blob/main/docs/development/core/public/kibana-plugin-core-public.applicationstart.navigatetourl.md)
 
 *Rendering a link to a different app on its own would also cause a full page reload:*
 
@@ -112,7 +112,7 @@ const MySPALink = () =>
 ```
 
 As it would be too much boilerplate to do this for each link in your app, there is a handy wrapper that helps with it:
-[RedirectAppLinks](https://github.com/elastic/kibana/blob/master/src/plugins/kibana_react/public/app_links/redirect_app_link.tsx#L49).
+[RedirectAppLinks](https://github.com/elastic/kibana/blob/main/src/plugins/kibana_react/public/app_links/redirect_app_link.tsx#L49).
 
 ```jsx
 const MyApp = () =>
@@ -134,9 +134,9 @@ Common rules to follow in this scenario:
 
 This is required to make sure `core` is aware of navigations triggered inside your app, so it could act accordingly when needed.
 
-* `Core`'s [ScopedHistory](https://github.com/elastic/kibana/blob/master/docs/development/core/public/kibana-plugin-core-public.scopedhistory.md) instance.
-* [Example usage](https://github.com/elastic/kibana/blob/master/docs/development/core/public/kibana-plugin-core-public.appmountparameters.history.md)
-* [Example plugin](https://github.com/elastic/kibana/blob/master/test/plugin_functional/plugins/core_plugin_a/public/application.tsx#L120)
+* `Core`'s [ScopedHistory](https://github.com/elastic/kibana/blob/main/docs/development/core/public/kibana-plugin-core-public.scopedhistory.md) instance.
+* [Example usage](https://github.com/elastic/kibana/blob/main/docs/development/core/public/kibana-plugin-core-public.appmountparameters.history.md)
+* [Example plugin](https://github.com/elastic/kibana/blob/main/test/plugin_functional/plugins/core_plugin_a/public/application.tsx#L120)
 
 Relative links will be resolved relative to your app's route (e.g.: `http://localhost5601/app/{your-app-id}`)
 and setting up internal links in your app in SPA friendly way would look something like:
@@ -152,7 +152,7 @@ const MyInternalLink = () => <Link to="/my-other-page"></Link>
 Try to avoid using `window.location` and `window.history` directly.
 
 <DocCallOut>
-  Instead, use [ScopedHistory](https://github.com/elastic/kibana/blob/master/docs/development/core/public/kibana-plugin-core-public.scopedhistory.md) instance provided by `core`.
+  Instead, use [ScopedHistory](https://github.com/elastic/kibana/blob/main/docs/development/core/public/kibana-plugin-core-public.scopedhistory.md) instance provided by `core`.
 </DocCallOut>
 
 - This way `core` will know about location changes triggered within your app, and it would act accordingly.
@@ -190,7 +190,7 @@ There are utils to help you to implement such kind of state syncing.
 - Adding a query param flag or simple key/value to the URL.
 
 <DocCallOut>
-  Follow [these docs](https://github.com/elastic/kibana/blob/master/src/plugins/kibana_utils/docs/state_sync#state-syncing-utilities) to learn more.
+  Follow [these docs](https://github.com/elastic/kibana/blob/main/src/plugins/kibana_utils/docs/state_sync#state-syncing-utilities) to learn more.
 </DocCallOut>
 
 ## Preserving state between navigations
@@ -212,7 +212,7 @@ you'd notice that state is stored inside that link, and it also gets updated whe
 ![image](../assets/state_inside_the_link.png)
 
 This is where separation into `_a` and `_g` query params comes into play. What is considered a *global* state gets constantly updated in those navigation links. In the example above it was a time filter.
-This is backed by [KbnUrlTracker](https://github.com/elastic/kibana/blob/master/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts#L57) util. You can use it to achieve similar behavior.
+This is backed by [KbnUrlTracker](https://github.com/elastic/kibana/blob/main/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts#L57) util. You can use it to achieve similar behavior.
 
 NOTE: After migrating to KP navigation works without page reloads and all plugins are loaded simultaneously.
 Hence, likely there are simpler ways to preserve state of your application, unless you want to do it through URL.
diff --git a/dev_docs/key_concepts/persistable_state.mdx b/dev_docs/key_concepts/persistable_state.mdx
index 189259cf1085b..25d3f37a86be4 100644
--- a/dev_docs/key_concepts/persistable_state.mdx
+++ b/dev_docs/key_concepts/persistable_state.mdx
@@ -49,7 +49,7 @@ If the state your plugin is storing can be provided by other plugins (your plugi
 Any plugin that stores any persistable state as part of their saved object should make sure that its saved object migration
 and reference extraction and injection methods correctly use the matching `PersistableStateService` implementation for the state they are storing.
 
-Take a look at [example saved object](https://github.com/elastic/kibana/blob/master/examples/embeddable_examples/server/searchable_list_saved_object.ts#L32) which stores an embeddable state. Note how the `migrations`, `extractReferences` and `injectReferences` are defined.
+Take a look at [example saved object](https://github.com/elastic/kibana/blob/main/examples/embeddable_examples/server/searchable_list_saved_object.ts#L32) which stores an embeddable state. Note how the `migrations`, `extractReferences` and `injectReferences` are defined.
 
 ## Storing persistable state as part of URL
 
@@ -71,7 +71,7 @@ To support persisting your state in saved objects owned by another plugin, the <
   text="Learn how to define Saved Object references"
 />
 
-[See example embeddable providing extract/inject functions](https://github.com/elastic/kibana/blob/master/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts)
+[See example embeddable providing extract/inject functions](https://github.com/elastic/kibana/blob/main/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts)
 
 ### Migrations and Backward compatibility
 
@@ -79,9 +79,9 @@ As your plugin evolves, you may need to change your state in a breaking way. If
 
 <DocLink id="kibDevTutorialSavedObject" section="migrations" text="How to write a migration" />.
 
-[See an example saved object storing embeddable state implementing saved object migration function](https://github.com/elastic/kibana/blob/master/examples/embeddable_examples/server/searchable_list_saved_object.ts)
+[See an example saved object storing embeddable state implementing saved object migration function](https://github.com/elastic/kibana/blob/main/examples/embeddable_examples/server/searchable_list_saved_object.ts)
 
-[See example embeddable providing migration functions](https://github.com/elastic/kibana/blob/master/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts)
+[See example embeddable providing migration functions](https://github.com/elastic/kibana/blob/main/examples/embeddable_examples/public/migrations/migrations_embeddable_factory.ts)
 
 ## Telemetry
 
diff --git a/dev_docs/tutorials/endpoints.mdx b/dev_docs/tutorials/endpoints.mdx
index 92ead4d714626..1d6fc0edf1e64 100644
--- a/dev_docs/tutorials/endpoints.mdx
+++ b/dev_docs/tutorials/endpoints.mdx
@@ -17,7 +17,7 @@ The service allows plugins to:
 - to implement custom authentication and authorization strategy.
 
 <DocCallOut>
-  See [the server-side HTTP service API docs](https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.md)
+  See [the server-side HTTP service API docs](https://github.com/elastic/kibana/blob/main/docs/development/core/server/kibana-plugin-core-server.httpservicesetup.md)
 </DocCallOut>
 
 **Registering a basic GET endpoint**
@@ -55,7 +55,7 @@ export class MyPlugin implements Plugin {
 ```
 
 <DocCallOut>
-  See [the routing example plugin](https://github.com/elastic/kibana/blob/master/examples/routing_example) for more route registration examples.
+  See [the routing example plugin](https://github.com/elastic/kibana/blob/main/examples/routing_example) for more route registration examples.
 </DocCallOut>
 
 ## Consuming the endpoint from the client-side
@@ -79,9 +79,9 @@ async function fetchData(http: HttpStart, id: string) {
 ```
 
 <DocCallOut>
-  See [the client-side HTTP service API docs](https://github.com/elastic/kibana/blob/master/docs/development/core/public/kibana-plugin-core-public.httpsetup.md)
+  See [the client-side HTTP service API docs](https://github.com/elastic/kibana/blob/main/docs/development/core/public/kibana-plugin-core-public.httpsetup.md)
 </DocCallOut>
 
 <DocCallOut>
-  See [the routing example plugin](https://github.com/elastic/kibana/blob/master/examples/routing_example) for more endpoint consumption examples.
+  See [the routing example plugin](https://github.com/elastic/kibana/blob/main/examples/routing_example) for more endpoint consumption examples.
 </DocCallOut>
diff --git a/dev_docs/tutorials/expressions.mdx b/dev_docs/tutorials/expressions.mdx
index 4688da98b7b01..c4b37a125838e 100644
--- a/dev_docs/tutorials/expressions.mdx
+++ b/dev_docs/tutorials/expressions.mdx
@@ -57,7 +57,7 @@ const result = await executionContract.getData();
 ```
 
 <DocCallOut>
-  Check the full spec of execute function [here](https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.execution.md)
+  Check the full spec of execute function [here](https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.execution.md)
 </DocCallOut>
 
 In addition, on the browser side, there are two additional ways to run expressions and render the results.
@@ -71,7 +71,7 @@ This is the easiest way to get expressions rendered inside your application.
 ```
 
 <DocCallOut>
-  Check the full spec of ReactExpressionRenderer component props [here](https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md)
+  Check the full spec of ReactExpressionRenderer component props [here](https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md)
 </DocCallOut>
 
 #### Expression loader
@@ -83,7 +83,7 @@ const handler = loader(domElement, expression, params);
 ```
 
 <DocCallOut>
-  Check the full spec of expression loader params [here](https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md)
+  Check the full spec of expression loader params [here](https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md)
 </DocCallOut>
 
 ### Creating new expression functions
@@ -106,7 +106,7 @@ expressions.registerFunction(functionDefinition);
 ```
 
 <DocCallOut>
-  Check the full interface of ExpressionFuntionDefinition [here](https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.md)
+  Check the full interface of ExpressionFuntionDefinition [here](https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.md)
 </DocCallOut>
 
 ### Creating new expression renderers
@@ -128,5 +128,5 @@ expressions.registerRenderer(rendererDefinition);
 ```
 
 <DocCallOut>
-  Check the full interface of ExpressionRendererDefinition [here](https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderdefinition.md)
+  Check the full interface of ExpressionRendererDefinition [here](https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderdefinition.md)
 </DocCallOut>
diff --git a/dev_docs/tutorials/kibana_page_template.mdx b/dev_docs/tutorials/kibana_page_template.mdx
index bc0abc99d8921..f7169ea33cea7 100644
--- a/dev_docs/tutorials/kibana_page_template.mdx
+++ b/dev_docs/tutorials/kibana_page_template.mdx
@@ -124,7 +124,7 @@ Increases the consistency in messaging across all the solutions during the getti
 
 This is a built-in configuration that displays a very specific UI and requires very specific keys. It will also ignore all other configurations of the template including `pageHeader` and `children`, with the exception of continuing to show `solutionNav`.
 
-The `noDataConfig` is of type [`NoDataPagProps`](https://github.com/elastic/kibana/blob/master/src/plugins/kibana_react/public/page_template/no_data_page/no_data_page.tsx):
+The `noDataConfig` is of type [`NoDataPagProps`](https://github.com/elastic/kibana/blob/main/src/plugins/kibana_react/public/page_template/no_data_page/no_data_page.tsx):
 
 1. `solution: string`: Single name for the current solution, used to auto-generate the title, logo, and description *(required)*
 2. `docsLink: string`: Required to set the docs link for the whole solution *(required)*
diff --git a/dev_docs/tutorials/testing_plugins.mdx b/dev_docs/tutorials/testing_plugins.mdx
index 14089bc3fa315..b8f8029e7b16c 100644
--- a/dev_docs/tutorials/testing_plugins.mdx
+++ b/dev_docs/tutorials/testing_plugins.mdx
@@ -217,9 +217,9 @@ Cons:
 - brittle tests
 
 ###### Example
-You can reuse existing [api_integration](https://github.com/elastic/kibana/blob/master/test/api_integration/config.js) setup by registering a test file within a
-[test loader](https://github.com/elastic/kibana/blob/master/test/api_integration/apis/index.ts). More about the existing FTR setup in the
-[contribution guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#running-specific-kibana-tests)
+You can reuse existing [api_integration](https://github.com/elastic/kibana/blob/main/test/api_integration/config.js) setup by registering a test file within a
+[test loader](https://github.com/elastic/kibana/blob/main/test/api_integration/apis/index.ts). More about the existing FTR setup in the
+[contribution guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md#running-specific-kibana-tests)
 
 The tests cover:
 - authenticated / non-authenticated user access (when applicable)
@@ -409,7 +409,7 @@ While applications do get an opportunity to unmount and run cleanup logic, it is
 
 #### Example
 
-By following the [renderApp](https://github.com/elastic/kibana/blob/master/src/core/CONVENTIONS.md#applications) convention, you can greatly reduce the amount of logic in your application's mount function. This makes testing your application's actual rendering logic easier.
+By following the [renderApp](https://github.com/elastic/kibana/blob/main/src/core/CONVENTIONS.md#applications) convention, you can greatly reduce the amount of logic in your application's mount function. This makes testing your application's actual rendering logic easier.
 
 ```typescript jsx
 /** public/plugin.ts */
diff --git a/docs/developer/advanced/development-es-snapshots.asciidoc b/docs/developer/advanced/development-es-snapshots.asciidoc
index 4c801bf750979..38146e65b6326 100644
--- a/docs/developer/advanced/development-es-snapshots.asciidoc
+++ b/docs/developer/advanced/development-es-snapshots.asciidoc
@@ -81,7 +81,7 @@ Each day, a https://kibana-ci.elastic.co/job/elasticsearch+snapshots+trigger/[Je
 
 https://kibana-ci.elastic.co/job/elasticsearch+snapshots+build/[This Jenkins job] builds the {es} snapshots and uploads them to GCS.
 
-The Jenkins job pipeline definition is https://github.com/elastic/kibana/blob/master/.ci/es-snapshots/Jenkinsfile_build_es[in the {kib} repo].
+The Jenkins job pipeline definition is https://github.com/elastic/kibana/blob/main/.ci/es-snapshots/Jenkinsfile_build_es[in the {kib} repo].
 
 1. Checkout {es} repo for the given branch/version.
 2. Run `./gradlew -p distribution/archives assemble --parallel` to create all of the {es} distributions.
@@ -97,7 +97,7 @@ The Jenkins job pipeline definition is https://github.com/elastic/kibana/blob/ma
 
 https://kibana-ci.elastic.co/job/elasticsearch+snapshots+verify/[This Jenkins job] tests the latest {es} snapshot with the full {kib} CI pipeline, and promotes if it there are no test failures.
 
-The Jenkins job pipeline definition is https://github.com/elastic/kibana/blob/master/.ci/es-snapshots/Jenkinsfile_verify_es[in the {kib} repo].
+The Jenkins job pipeline definition is https://github.com/elastic/kibana/blob/main/.ci/es-snapshots/Jenkinsfile_verify_es[in the {kib} repo].
 
 1. Checkout {kib} and set up CI environment as normal.
 2. Set the `ES_SNAPSHOT_MANIFEST` env var to point to the latest snapshot manifest.
diff --git a/docs/developer/advanced/sharing-saved-objects.asciidoc b/docs/developer/advanced/sharing-saved-objects.asciidoc
index 8a0373363e473..9a009e6ad49b7 100644
--- a/docs/developer/advanced/sharing-saved-objects.asciidoc
+++ b/docs/developer/advanced/sharing-saved-objects.asciidoc
@@ -157,7 +157,7 @@ const savedObject = resolveResult.saved_object;
 TIP: See an example of this in https://github.com/elastic/kibana/pull/107256#user-content-example-steps[step 2 of the POC]!
 
 The
-https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveresponse.md[SavedObjectsResolveResponse
+https://github.com/elastic/kibana/blob/main/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveresponse.md[SavedObjectsResolveResponse
 interface] has three fields, summarized below:
 
 * `saved_object` - The saved object that was found.
diff --git a/docs/developer/architecture/add-data-tutorials.asciidoc b/docs/developer/architecture/add-data-tutorials.asciidoc
index 8b6f7d5448364..3f1b42c008ee7 100644
--- a/docs/developer/architecture/add-data-tutorials.asciidoc
+++ b/docs/developer/architecture/add-data-tutorials.asciidoc
@@ -11,7 +11,7 @@ Each tutorial contains three sets of instructions:
 
 [discrete]
 === Creating a new tutorial
-1. Create a new directory in the link:https://github.com/elastic/kibana/tree/master/src/plugins/home/server/tutorials[tutorials directory].
+1. Create a new directory in the link:https://github.com/elastic/kibana/tree/main/src/plugins/home/server/tutorials[tutorials directory].
 2. In the new directory, create a file called `index.ts` that exports a function.
 The function must return a function object that conforms to the `TutorialSchema` interface link:{kib-repo}tree/{branch}/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts[tutorial schema].
 3. Register the tutorial in link:{kib-repo}tree/{branch}/src/plugins/home/server/tutorials/register.ts[register.ts] by adding it to the `builtInTutorials`.
diff --git a/docs/developer/contributing/development-documentation.asciidoc b/docs/developer/contributing/development-documentation.asciidoc
index 70dd756ca808e..7137d5bad051c 100644
--- a/docs/developer/contributing/development-documentation.asciidoc
+++ b/docs/developer/contributing/development-documentation.asciidoc
@@ -15,7 +15,7 @@ Documentation about specific services a plugin offers should be encapsulated in:
 === End user documentation
 
 Documentation about user facing features should be written in http://asciidoc.org/[asciidoc] at
-{kib-repo}/tree/master/docs[https://github.com/elastic/kibana/tree/master/docs]
+{kib-repo}/tree/master/docs[https://github.com/elastic/kibana/tree/main/docs]
 
 To build the docs, you must clone the https://github.com/elastic/docs[elastic/docs]
 repo as a sibling of your {kib} repo. Follow the instructions in that project's
@@ -38,4 +38,4 @@ REST APIs should be documented using the following recommended formats:
 === General developer documentation and guidelines
 
 General developer guildlines and documentation, like this right here, should be written in http://asciidoc.org/[asciidoc]
-at {kib-repo}/tree/master/docs/developer[https://github.com/elastic/kibana/tree/master/docs/developer]
+at {kib-repo}/tree/master/docs/developer[https://github.com/elastic/kibana/tree/main/docs/developer]
diff --git a/docs/developer/contributing/development-functional-tests.asciidoc b/docs/developer/contributing/development-functional-tests.asciidoc
index fb56acef0a0cc..cb614c5149f95 100644
--- a/docs/developer/contributing/development-functional-tests.asciidoc
+++ b/docs/developer/contributing/development-functional-tests.asciidoc
@@ -114,7 +114,7 @@ Use the `--help` flag for more options.
 [discrete]
 ==== Environment
 
-The tests are written in https://mochajs.org[mocha] using https://github.com/elastic/kibana/tree/master/packages/kbn-expect[@kbn/expect] for assertions.
+The tests are written in https://mochajs.org[mocha] using https://github.com/elastic/kibana/tree/main/packages/kbn-expect[@kbn/expect] for assertions.
 
 We use https://www.w3.org/TR/webdriver1/[WebDriver Protocol] to run tests in both Chrome and Firefox with the help of https://sites.google.com/a/chromium.org/chromedriver/[chromedriver] and https://firefox-source-docs.mozilla.org/testing/geckodriver/[geckodriver]. When the `FunctionalTestRunner` launches, remote service creates a new webdriver session, which starts the driver and a stripped-down browser instance. We use `browser` service and `webElementWrapper` class to wrap up https://seleniumhq.github.io/selenium/docs/api/javascript/module/selenium-webdriver/[Webdriver API].
 
@@ -204,7 +204,7 @@ Tests should normally setRoles() in the before() and restoreDefaults() in the af
 [discrete]
 ==== Anatomy of a test file
 
-This annotated example file shows the basic structure every test suite uses. It starts by importing https://github.com/elastic/kibana/tree/master/packages/kbn-expect[`@kbn/expect`] and defining its default export: an anonymous Test Provider. The test provider then destructures the Provider API for the `getService()` and `getPageObjects()` functions. It uses these functions to collect the dependencies of this suite. The rest of the test file will look pretty normal to mocha.js users. `describe()`, `it()`, `before()` and the lot are used to define suites that happen to automate a browser via services and objects of type `PageObject`.
+This annotated example file shows the basic structure every test suite uses. It starts by importing https://github.com/elastic/kibana/tree/main/packages/kbn-expect[`@kbn/expect`] and defining its default export: an anonymous Test Provider. The test provider then destructures the Provider API for the `getService()` and `getPageObjects()` functions. It uses these functions to collect the dependencies of this suite. The rest of the test file will look pretty normal to mocha.js users. `describe()`, `it()`, `before()` and the lot are used to define suites that happen to automate a browser via services and objects of type `PageObject`.
 
 ["source","js"]
 ----
diff --git a/docs/developer/contributing/development-unit-tests.asciidoc b/docs/developer/contributing/development-unit-tests.asciidoc
index 72edaf1241bc6..9f0896f8a673f 100644
--- a/docs/developer/contributing/development-unit-tests.asciidoc
+++ b/docs/developer/contributing/development-unit-tests.asciidoc
@@ -83,6 +83,6 @@ to proceed in this mode.
 === Unit Testing Plugins
 
 Even when using 
-https://github.com/elastic/kibana/tree/master/packages/kbn-plugin-generator[Kibana
+https://github.com/elastic/kibana/tree/main/packages/kbn-plugin-generator[Kibana
 plugin generator] we do not enforce a way for unit testing your plugin. Please setup and you use 
 the tools of your choice. If the plugin will live inside the Kibana repo `Jest` must be used.
\ No newline at end of file
diff --git a/docs/developer/contributing/interpreting-ci-failures.asciidoc b/docs/developer/contributing/interpreting-ci-failures.asciidoc
index 1401c96999810..ffbe448d79a44 100644
--- a/docs/developer/contributing/interpreting-ci-failures.asciidoc
+++ b/docs/developer/contributing/interpreting-ci-failures.asciidoc
@@ -43,8 +43,8 @@ image::images/test_results.png[Jenkisn build screenshot]
 Looking at the failure, we first look at the Error and stack trace. In the example below, this test failed to find an element within the timeout;
  `Error: retry.try timeout: TimeoutError: Waiting for element to be located By(css selector, [data-test-subj="createSpace"])`
 
-We know the test file from the stack trace was on line 50 of `test/accessibility/apps/spaces.ts` (this test and the stack trace context is kibana/x-pack/ so the file is https://github.com/elastic/kibana/blob/master/x-pack/test/accessibility/apps/spaces.ts#L50).
-The function to click on the element was called from a page object method in `test/functional/page_objects/space_selector_page.ts` https://github.com/elastic/kibana/blob/master/x-pack/test/functional/page_objects/space_selector_page.ts#L58
+We know the test file from the stack trace was on line 50 of `test/accessibility/apps/spaces.ts` (this test and the stack trace context is kibana/x-pack/ so the file is https://github.com/elastic/kibana/blob/main/x-pack/test/accessibility/apps/spaces.ts#L50).
+The function to click on the element was called from a page object method in `test/functional/page_objects/space_selector_page.ts` https://github.com/elastic/kibana/blob/main/x-pack/test/functional/page_objects/space_selector_page.ts#L58
 
 
     [00:03:36]             │ debg --- retry.try error: Waiting for element to be located By(css selector, [data-test-subj="createSpace"])
diff --git a/docs/developer/contributing/linting.asciidoc b/docs/developer/contributing/linting.asciidoc
index 144e23c228535..1cd56ab65b669 100644
--- a/docs/developer/contributing/linting.asciidoc
+++ b/docs/developer/contributing/linting.asciidoc
@@ -31,7 +31,7 @@ EditorConfig, which can be set up by installing a plugin in your editor
 that dynamically updates its configuration. Take a look at the
 http://editorconfig.org/#download[EditorConfig] site to find a plugin
 for your editor, and browse our
-https://github.com/elastic/kibana/blob/master/.editorconfig[`.editorconfig`]
+https://github.com/elastic/kibana/blob/main/.editorconfig[`.editorconfig`]
 file to see what config rules we set up.
 
 [discrete]
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index 3d1fcd51837a3..0f7ed781561c2 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -587,7 +587,7 @@ Documentation: https://www.elastic.co/guide/en/kibana/master/task-manager-produc
 
 |<<translations-plugin>>
 |Contains Elastic-supported translations. Owned by the Localizations team.
-For adding localizations and instrument a ui to support translated content, see https://github.com/elastic/kibana/tree/master/packages/kbn-i18n
+For adding localizations and instrument a ui to support translated content, see https://github.com/elastic/kibana/tree/main/packages/kbn-i18n
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/triggers_actions_ui/README.md[triggersActionsUi]
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md
index 59d98bf4d607b..007b453817c8d 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md
@@ -31,7 +31,7 @@ The saved object after the specified fields were incremented
 
 When supplying a field name like `stats.api.counter` the field name will be used as-is to create a document like: `{attributes: {'stats.api.counter': 1}}` It will not create a nested structure like: `{attributes: {stats: {api: {counter: 1}}}}`
 
-When using incrementCounter for collecting usage data, you need to ensure that usage collection happens on a best-effort basis and doesn't negatively affect your plugin or users. See https://github.com/elastic/kibana/blob/master/src/plugins/usage\_collection/README.mdx\#tracking-interactions-with-incrementcounter)
+When using incrementCounter for collecting usage data, you need to ensure that usage collection happens on a best-effort basis and doesn't negatively affect your plugin or users. See https://github.com/elastic/kibana/blob/main/src/plugins/usage\_collection/README.mdx\#tracking-interactions-with-incrementcounter)
 
 ## Example
 
diff --git a/docs/management/advanced-options.asciidoc b/docs/management/advanced-options.asciidoc
index f2da704760f3b..56b7eb09252ed 100644
--- a/docs/management/advanced-options.asciidoc
+++ b/docs/management/advanced-options.asciidoc
@@ -189,7 +189,7 @@ Set to `true` to enable a dark mode for the {kib} UI. You must refresh the page
 to apply the setting.
 
 [[theme-version]]`theme:version`::
-Specifies the {kib} theme. If you change the setting, refresh the page to apply the setting.
+Kibana only ships with the v8 theme now, so this setting can no longer be edited.
 
 [[timepicker-quickranges]]`timepicker:quickRanges`::
 The list of ranges to show in the Quick section of the time filter. This should
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index 9ccfeb6894713..c9a8210f82198 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -351,7 +351,7 @@ When `includeElasticMapsService` is turned off, only tile layer configured by <<
  | Specifies the URL of a self hosted <<elastic-maps-server,{hosted-ems}>>
 
 | [[tilemap-settings]] `map.tilemap.options.attribution:` {ess-icon}
- | The map attribution string.
+ | The map attribution string. Provide attributions in markdown and use '|' to delimit attributions, for example: `"[attribution 1](https://www.attribution1)|[attribution 2](https://www.attribution2)"`.
 *Default: `"© [Elastic Maps Service](https://www.elastic.co/elastic-maps-service)"`*
 
 | [[tilemap-max-zoom]] `map.tilemap.options.maxZoom:` {ess-icon}
diff --git a/examples/bfetch_explorer/public/plugin.tsx b/examples/bfetch_explorer/public/plugin.tsx
index f96a900063340..fd4687c5fb149 100644
--- a/examples/bfetch_explorer/public/plugin.tsx
+++ b/examples/bfetch_explorer/public/plugin.tsx
@@ -52,7 +52,7 @@ export class BfetchExplorerPlugin implements Plugin {
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/blob/master/src/plugins/bfetch/README.md',
+          href: 'https://github.com/elastic/kibana/blob/main/src/plugins/bfetch/README.md',
           iconType: 'logoGithub',
           size: 's',
           target: '_blank',
diff --git a/examples/developer_examples/README.md b/examples/developer_examples/README.md
index 1a57838c43d24..db847b342d46b 100644
--- a/examples/developer_examples/README.md
+++ b/examples/developer_examples/README.md
@@ -14,7 +14,7 @@ services. Add your a link to your example using the developerExamples `register`
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/tree/master/src/plugins/foo/README.md',
+          href: 'https://github.com/elastic/kibana/tree/main/src/plugins/foo/README.md',
           iconType: 'logoGithub',
           target: '_blank',
           size: 's',
diff --git a/examples/embeddable_explorer/public/plugin.tsx b/examples/embeddable_explorer/public/plugin.tsx
index 2154a69ce1a87..f6cdee1da126c 100644
--- a/examples/embeddable_explorer/public/plugin.tsx
+++ b/examples/embeddable_explorer/public/plugin.tsx
@@ -63,7 +63,7 @@ export class EmbeddableExplorerPlugin implements Plugin<void, void, {}, StartDep
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/tree/master/src/plugins/embeddable/README.md',
+          href: 'https://github.com/elastic/kibana/tree/main/src/plugins/embeddable/README.md',
           iconType: 'logoGithub',
           target: '_blank',
           size: 's',
diff --git a/examples/expressions_explorer/public/app.tsx b/examples/expressions_explorer/public/app.tsx
index 1355679e0cc3a..260c529650bdb 100644
--- a/examples/expressions_explorer/public/app.tsx
+++ b/examples/expressions_explorer/public/app.tsx
@@ -46,7 +46,7 @@ const ExpressionsExplorer = ({ expressions, inspector, actions }: Props) => {
                 demonstrated. You can read more about it{' '}
                 <EuiLink
                   href={
-                    'https://github.com/elastic/kibana/blob/master/src/plugins/expressions/README.asciidoc'
+                    'https://github.com/elastic/kibana/blob/main/src/plugins/expressions/README.asciidoc'
                   }
                 >
                   here
diff --git a/examples/expressions_explorer/public/plugin.tsx b/examples/expressions_explorer/public/plugin.tsx
index 7eee563c43f27..329dcfbb11d45 100644
--- a/examples/expressions_explorer/public/plugin.tsx
+++ b/examples/expressions_explorer/public/plugin.tsx
@@ -72,7 +72,7 @@ export class ExpressionsExplorerPlugin implements Plugin<void, void, SetupDeps,
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/blob/master/src/plugins/expressions/README.md',
+          href: 'https://github.com/elastic/kibana/blob/main/src/plugins/expressions/README.md',
           iconType: 'logoGithub',
           size: 's',
           target: '_blank',
diff --git a/examples/index_pattern_field_editor_example/public/plugin.tsx b/examples/index_pattern_field_editor_example/public/plugin.tsx
index 8ed158e9923eb..ffd93c8a0735f 100644
--- a/examples/index_pattern_field_editor_example/public/plugin.tsx
+++ b/examples/index_pattern_field_editor_example/public/plugin.tsx
@@ -40,7 +40,7 @@ export class IndexPatternFieldEditorPlugin implements Plugin<void, void, SetupDe
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/blob/master/src/plugins/index_pattern_field_editor/README.md',
+          href: 'https://github.com/elastic/kibana/blob/main/src/plugins/index_pattern_field_editor/README.md',
           iconType: 'logoGithub',
           size: 's',
           target: '_blank',
diff --git a/examples/locator_explorer/public/plugin.tsx b/examples/locator_explorer/public/plugin.tsx
index 45b1d2d7939ea..240a1a34caef9 100644
--- a/examples/locator_explorer/public/plugin.tsx
+++ b/examples/locator_explorer/public/plugin.tsx
@@ -47,7 +47,7 @@ export class LocatorExplorerPlugin implements Plugin<void, void, SetupDeps, Star
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/blob/master/src/plugins/share/common/url_service/locators/README.md',
+          href: 'https://github.com/elastic/kibana/blob/main/src/plugins/share/common/url_service/locators/README.md',
           iconType: 'logoGithub',
           size: 's',
           target: '_blank',
diff --git a/examples/routing_example/public/app.tsx b/examples/routing_example/public/app.tsx
index e9794c86efbc9..e8b7b44a0a097 100644
--- a/examples/routing_example/public/app.tsx
+++ b/examples/routing_example/public/app.tsx
@@ -47,21 +47,21 @@ function RoutingExplorer({
               listItems={[
                 {
                   label: 'IRouter API docs',
-                  href: 'https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.irouter.md',
+                  href: 'https://github.com/elastic/kibana/blob/main/docs/development/core/server/kibana-plugin-core-server.irouter.md',
                   iconType: 'logoGithub',
                   target: '_blank',
                   size: 's',
                 },
                 {
                   label: 'HttpHandler (core.http.fetch) API docs',
-                  href: 'https://github.com/elastic/kibana/blob/master/docs/development/core/public/kibana-plugin-core-public.httphandler.md',
+                  href: 'https://github.com/elastic/kibana/blob/main/docs/development/core/public/kibana-plugin-core-public.httphandler.md',
                   iconType: 'logoGithub',
                   target: '_blank',
                   size: 's',
                 },
                 {
                   label: 'Conventions',
-                  href: 'https://github.com/elastic/kibana/tree/master/STYLEGUIDE.mdx#api-endpoints',
+                  href: 'https://github.com/elastic/kibana/tree/main/STYLEGUIDE.mdx#api-endpoints',
                   iconType: 'logoGithub',
                   target: '_blank',
                   size: 's',
diff --git a/examples/routing_example/public/plugin.tsx b/examples/routing_example/public/plugin.tsx
index 00a92227e067c..d47d31f7631de 100644
--- a/examples/routing_example/public/plugin.tsx
+++ b/examples/routing_example/public/plugin.tsx
@@ -41,14 +41,14 @@ export class RoutingExamplePlugin implements Plugin<{}, {}, SetupDeps, {}> {
       links: [
         {
           label: 'IRouter',
-          href: 'https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.irouter.md',
+          href: 'https://github.com/elastic/kibana/blob/main/docs/development/core/server/kibana-plugin-core-server.irouter.md',
           iconType: 'logoGithub',
           target: '_blank',
           size: 's',
         },
         {
           label: 'HttpHandler (core.http.fetch)',
-          href: 'https://github.com/elastic/kibana/blob/master/docs/development/core/public/kibana-plugin-core-public.httphandler.md',
+          href: 'https://github.com/elastic/kibana/blob/main/docs/development/core/public/kibana-plugin-core-public.httphandler.md',
           iconType: 'logoGithub',
           target: '_blank',
           size: 's',
diff --git a/examples/screenshot_mode_example/README.md b/examples/screenshot_mode_example/README.md
index ebae7480ca5fe..0e37f9bab78cc 100755
--- a/examples/screenshot_mode_example/README.md
+++ b/examples/screenshot_mode_example/README.md
@@ -6,4 +6,4 @@ A Kibana plugin
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/examples/search_examples/README.md b/examples/search_examples/README.md
index bcc17bf7f3333..0ffd4b6cf96c6 100644
--- a/examples/search_examples/README.md
+++ b/examples/search_examples/README.md
@@ -6,4 +6,4 @@
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/examples/search_examples/public/application.tsx b/examples/search_examples/public/application.tsx
index 1920cdbe5c697..4e5212b6f76a2 100644
--- a/examples/search_examples/public/application.tsx
+++ b/examples/search_examples/public/application.tsx
@@ -27,7 +27,7 @@ const LINKS: ExampleLink[] = [
     title: 'Search Sessions',
   },
   {
-    path: 'https://github.com/elastic/kibana/blob/master/src/plugins/data/README.mdx',
+    path: 'https://github.com/elastic/kibana/blob/main/src/plugins/data/README.mdx',
     title: 'README (GitHub)',
   },
 ];
diff --git a/examples/search_examples/public/plugin.ts b/examples/search_examples/public/plugin.ts
index 95ea688f49cc2..368231018e1a9 100644
--- a/examples/search_examples/public/plugin.ts
+++ b/examples/search_examples/public/plugin.ts
@@ -59,7 +59,7 @@ export class SearchExamplesPlugin
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/tree/master/src/plugins/data/README.mdx',
+          href: 'https://github.com/elastic/kibana/tree/main/src/plugins/data/README.mdx',
           iconType: 'logoGithub',
           target: '_blank',
           size: 's',
diff --git a/examples/state_containers_examples/public/plugin.ts b/examples/state_containers_examples/public/plugin.ts
index ac65d42ae4050..bfc20fd2b48d2 100644
--- a/examples/state_containers_examples/public/plugin.ts
+++ b/examples/state_containers_examples/public/plugin.ts
@@ -88,14 +88,14 @@ export class StateContainersExamplesPlugin implements Plugin {
       links: [
         {
           label: 'State containers README',
-          href: 'https://github.com/elastic/kibana/tree/master/src/plugins/kibana_utils/docs/state_containers',
+          href: 'https://github.com/elastic/kibana/tree/main/src/plugins/kibana_utils/docs/state_containers',
           iconType: 'logoGithub',
           size: 's',
           target: '_blank',
         },
         {
           label: 'State sync utils README',
-          href: 'https://github.com/elastic/kibana/tree/master/src/plugins/kibana_utils/docs/state_sync',
+          href: 'https://github.com/elastic/kibana/tree/main/src/plugins/kibana_utils/docs/state_sync',
           iconType: 'logoGithub',
           size: 's',
           target: '_blank',
diff --git a/examples/ui_actions_explorer/public/plugin.tsx b/examples/ui_actions_explorer/public/plugin.tsx
index d3a87c5b64fd6..2b4365e987ac8 100644
--- a/examples/ui_actions_explorer/public/plugin.tsx
+++ b/examples/ui_actions_explorer/public/plugin.tsx
@@ -85,7 +85,7 @@ export class UiActionsExplorerPlugin implements Plugin<void, void, {}, StartDeps
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/blob/master/src/plugins/ui_actions/README.md',
+          href: 'https://github.com/elastic/kibana/blob/main/src/plugins/ui_actions/README.md',
           iconType: 'logoGithub',
           size: 's',
           target: '_blank',
diff --git a/legacy_rfcs/text/0005_route_handler.md b/legacy_rfcs/text/0005_route_handler.md
index 291da688bc5a6..909cabb536ec8 100644
--- a/legacy_rfcs/text/0005_route_handler.md
+++ b/legacy_rfcs/text/0005_route_handler.md
@@ -32,8 +32,8 @@ type RequestHandler = (
 ) => KibanaResponse | Promise<KibanaResponse>;
 ```
 and accepts next Kibana specific parameters as arguments:
-- context: [Context](https://github.com/elastic/kibana/blob/master/rfcs/text/0003_handler_interface.md#handler-context). A handler context contains core service and plugin functionality already scoped to the incoming request.
-- request: [KibanaRequest](https://github.com/elastic/kibana/blob/master/src/core/server/http/router/request.ts). An immutable representation of the incoming request details, such as body, parameters, query, url and route information. Note: you **must** to specify route schema during route declaration to have access to `body, parameters, query` in the request object. You  cannot extend KibanaRequest with arbitrary data nor remove any properties from it.
+- context: [Context](https://github.com/elastic/kibana/blob/main/rfcs/text/0003_handler_interface.md#handler-context). A handler context contains core service and plugin functionality already scoped to the incoming request.
+- request: [KibanaRequest](https://github.com/elastic/kibana/blob/main/src/core/server/http/router/request.ts). An immutable representation of the incoming request details, such as body, parameters, query, url and route information. Note: you **must** to specify route schema during route declaration to have access to `body, parameters, query` in the request object. You  cannot extend KibanaRequest with arbitrary data nor remove any properties from it.
 ```typescript
 interface KibanaRequest {
   url: url.Url;
@@ -51,7 +51,7 @@ interface KibanaRequest {
   }
 }
 ```
--  t: [KibanaResponseToolkit](https://github.com/elastic/kibana/blob/master/src/core/server/http/router/response.ts#L27)
+-  t: [KibanaResponseToolkit](https://github.com/elastic/kibana/blob/main/src/core/server/http/router/response.ts#L27)
 Provides a set of pre-configured methods to respond to an incoming request. It is expected that handler **always** returns a result of one of `KibanaResponseToolkit` methods as an output:
 ```typescript
 interface KibanaResponseToolkit {
diff --git a/legacy_rfcs/text/0006_management_section_service.md b/legacy_rfcs/text/0006_management_section_service.md
index 1a52e85a4ff16..c2a62c3686680 100644
--- a/legacy_rfcs/text/0006_management_section_service.md
+++ b/legacy_rfcs/text/0006_management_section_service.md
@@ -30,7 +30,7 @@ This means that we will basically need to rebuild the service anyway in order to
 - Flexibility to potentially support alternate layouts in the future (see mockups in [reference section](#reference) below)
 
 # Basic example
-This API is influenced heavily by the [application service mounting RFC](https://github.com/elastic/kibana/blob/master/rfcs/text/0004_application_service_mounting.md). The intent is to make the experience consistent with that service; the Management section is basically one big app with a bunch of registered "subapps".
+This API is influenced heavily by the [application service mounting RFC](https://github.com/elastic/kibana/blob/main/rfcs/text/0004_application_service_mounting.md). The intent is to make the experience consistent with that service; the Management section is basically one big app with a bunch of registered "subapps".
 
 ```ts
 // my_plugin/public/plugin.ts
diff --git a/legacy_rfcs/text/0014_api_documentation.md b/legacy_rfcs/text/0014_api_documentation.md
index b70636c63aad3..0f934c2f09faf 100644
--- a/legacy_rfcs/text/0014_api_documentation.md
+++ b/legacy_rfcs/text/0014_api_documentation.md
@@ -14,7 +14,7 @@ plugin APIs.
 
 # Technology: ts-morph vs api-extractor
 
-[Api-extractor](https://api-extractor.com/) is a utility built from microsoft that parses typescript code into json files that can then be used in a custom [api-documenter](https://api-extractor.com/pages/setup/generating_docs/) in order to build documentation. This is what we [have now](https://github.com/elastic/kibana/tree/master/docs/development), except we use the default api-documenter. 
+[Api-extractor](https://api-extractor.com/) is a utility built from microsoft that parses typescript code into json files that can then be used in a custom [api-documenter](https://api-extractor.com/pages/setup/generating_docs/) in order to build documentation. This is what we [have now](https://github.com/elastic/kibana/tree/main/docs/development), except we use the default api-documenter. 
 
 ## Limitations with the current implementation using api-extractor & api-documenter
 
diff --git a/legacy_rfcs/text/0015_bazel.md b/legacy_rfcs/text/0015_bazel.md
index 1bdd80e2cbaaf..82c93c3c7e9c1 100644
--- a/legacy_rfcs/text/0015_bazel.md
+++ b/legacy_rfcs/text/0015_bazel.md
@@ -32,7 +32,7 @@ Yarn Package Manager handles the installation of NPM dependencies, and the migra
 
 ### Building packages
 
-The building of [packages](https://github.com/elastic/kibana/tree/master/packages) happens during the bootstrap process initiated by running `yarn kbn bootstrap` and without any cache takes about a minute. Currently, we maintain a single cache item per package, so drastic changes like switching branches frequently results in the worst-case scenario of no-cache being usable.
+The building of [packages](https://github.com/elastic/kibana/tree/main/packages) happens during the bootstrap process initiated by running `yarn kbn bootstrap` and without any cache takes about a minute. Currently, we maintain a single cache item per package, so drastic changes like switching branches frequently results in the worst-case scenario of no-cache being usable.
 
 ### Building TypeScript project references
 
@@ -40,7 +40,7 @@ The size of the project and the amount of TypeScript has created scaling issues,
 
 ### Building client-side plugins
 
-The [@kbn/optimizer](https://github.com/elastic/kibana/tree/master/packages/kbn-optimizer) package is responsible for building client-side plugins and is initiated during `yarn start`. Without any cache, it takes between three and four minutes, but is highly dependent on the amount of CPU cores available. The caching works similar to packages and requires a rebuild if any files change. Under the hood, this package is managing a set number of workers to run individual Webpack instances. When we first introduced Webpack back in [June of 2015](https://github.com/elastic/kibana/pull/4335), it was responsible for bundling all client-side code within a single process. As the Kibana project continued to grow over time, this Webpack process continued to impact the developer experience. A common theme to address these issues was through reducing the responsibilities of Webpack by separating [SCSS](https://github.com/elastic/kibana/pull/19643) and [vendor code](https://github.com/elastic/kibana/pull/22618). Knowing we would need to continue to scale, one of the new platform’s core objectives was to be able to build each plugin independently. This work paved the way for what we are proposing here and led to the [creation of @kbn/optimizer](https://github.com/elastic/kibana/pull/53976), which improved performance by separating and parallelizing Webpack builds. 
+The [@kbn/optimizer](https://github.com/elastic/kibana/tree/main/packages/kbn-optimizer) package is responsible for building client-side plugins and is initiated during `yarn start`. Without any cache, it takes between three and four minutes, but is highly dependent on the amount of CPU cores available. The caching works similar to packages and requires a rebuild if any files change. Under the hood, this package is managing a set number of workers to run individual Webpack instances. When we first introduced Webpack back in [June of 2015](https://github.com/elastic/kibana/pull/4335), it was responsible for bundling all client-side code within a single process. As the Kibana project continued to grow over time, this Webpack process continued to impact the developer experience. A common theme to address these issues was through reducing the responsibilities of Webpack by separating [SCSS](https://github.com/elastic/kibana/pull/19643) and [vendor code](https://github.com/elastic/kibana/pull/22618). Knowing we would need to continue to scale, one of the new platform’s core objectives was to be able to build each plugin independently. This work paved the way for what we are proposing here and led to the [creation of @kbn/optimizer](https://github.com/elastic/kibana/pull/53976), which improved performance by separating and parallelizing Webpack builds. 
 
 ### Compiling server-side code
 
@@ -76,7 +76,7 @@ A Bazel [macro](https://docs.bazel.build/versions/master/skylark/macros.html) wi
 
 A Bazel [macro](https://docs.bazel.build/versions/master/skylark/macros.html) will be created to centralize the usage of Webpack. The macro will, at minimum, accept a configuration file and supply a base `webpack.config.js` file. Currently, all plugins share the same Webpack configuration. Allowing a plugin to provide additional configuration will allow plugins the ability to add loaders without affecting the performance of others.
 
-While running Kibana from source in development, the proxy server will ensure that client-side code for plugins is compiled and available. This is currently handled by the [basePathProxy](https://github.com/elastic/kibana/blob/master/src/core/server/http/base_path_proxy_server.ts), where server restarts and optimizer builds are observed and cause the proxy to pause requests. With Bazel, we will utilize [iBazel](https://github.com/bazelbuild/bazel-watche) to watch for file changes and re-build the plugin targets when necessary. The watcher will emit [events](https://github.com/bazelbuild/bazel-watcher#remote-events) that we will use to block requests and provide feedback to the logs.
+While running Kibana from source in development, the proxy server will ensure that client-side code for plugins is compiled and available. This is currently handled by the [basePathProxy](https://github.com/elastic/kibana/blob/main/src/core/server/http/base_path_proxy_server.ts), where server restarts and optimizer builds are observed and cause the proxy to pause requests. With Bazel, we will utilize [iBazel](https://github.com/bazelbuild/bazel-watche) to watch for file changes and re-build the plugin targets when necessary. The watcher will emit [events](https://github.com/bazelbuild/bazel-watcher#remote-events) that we will use to block requests and provide feedback to the logs.
 
 While there are a few proofs of concepts for a Webpack 5 Bazel rule, none currently exist which are deemed production-ready. In the meantime, we can use the Webpack CLI directly. One of the main advantages being explored in these rules will be the support for using the Bazel worker to provide incremental builds similar to what `@kbn/optimizer` is doing today.
 
@@ -85,7 +85,7 @@ We are aware there are quite a few alternatives to Webpack, but our plan is to c
 
 ### Unit Testing
 
-A Bazel macro will be created to centralize the usage of Jest unit testing. The macro will, at minimum, accept a Jest configuration file, add the [Jest preset](https://github.com/elastic/kibana/blob/master/packages/kbn-test/jest-preset.js) and its dependencies as sources, then use the Jest CLI to execute tests. 
+A Bazel macro will be created to centralize the usage of Jest unit testing. The macro will, at minimum, accept a Jest configuration file, add the [Jest preset](https://github.com/elastic/kibana/blob/main/packages/kbn-test/jest-preset.js) and its dependencies as sources, then use the Jest CLI to execute tests. 
 
 Developers currently use `yarn test:jest` to efficiently run tests in a given directory without remembering the command or path. This command will continue to work as it does today, but will begin running tests through Bazel for packages or plugins which have been migrated.
 
diff --git a/package.json b/package.json
index 90db9d7fdcca7..5b8a80d9e39b7 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   ],
   "private": true,
   "version": "8.1.0",
-  "branch": "master",
+  "branch": "main",
   "types": "./kibana.d.ts",
   "tsdocMetadata": "./build/tsdoc-metadata.json",
   "build": {
@@ -193,7 +193,7 @@
     "brace": "0.11.1",
     "broadcast-channel": "^4.2.0",
     "chalk": "^4.1.0",
-    "cheerio": "^1.0.0-rc.9",
+    "cheerio": "^1.0.0-rc.10",
     "chokidar": "^3.4.3",
     "chroma-js": "^1.4.1",
     "classnames": "2.2.6",
diff --git a/packages/elastic-eslint-config-kibana/package.json b/packages/elastic-eslint-config-kibana/package.json
index 5fb485b86fd38..a5007de28584c 100644
--- a/packages/elastic-eslint-config-kibana/package.json
+++ b/packages/elastic-eslint-config-kibana/package.json
@@ -14,7 +14,7 @@
   "author": "Spencer Alger <email@spalger.com>",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/elastic/kibana/tree/master/packages/elastic-eslint-config-kibana"
+    "url": "https://github.com/elastic/kibana/tree/main/packages/elastic-eslint-config-kibana"
   },
-  "homepage": "https://github.com/elastic/kibana/tree/master/packages/elastic-eslint-config-kibana"
+  "homepage": "https://github.com/elastic/kibana/tree/main/packages/elastic-eslint-config-kibana"
 }
\ No newline at end of file
diff --git a/packages/elastic-safer-lodash-set/LICENSE b/packages/elastic-safer-lodash-set/LICENSE
index 049225c0b6647..ca79374b42cec 100644
--- a/packages/elastic-safer-lodash-set/LICENSE
+++ b/packages/elastic-safer-lodash-set/LICENSE
@@ -12,7 +12,7 @@ individuals. For exact contribution history, see the revision history
 available at the following locations:
  - https://github.com/lodash/lodash
  - https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/lodash
- - https://github.com/elastic/kibana/tree/master/packages/elastic-safer-lodash-set
+ - https://github.com/elastic/kibana/tree/main/packages/elastic-safer-lodash-set
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/packages/elastic-safer-lodash-set/package.json b/packages/elastic-safer-lodash-set/package.json
index bb27fd336d975..72b908911000d 100644
--- a/packages/elastic-safer-lodash-set/package.json
+++ b/packages/elastic-safer-lodash-set/package.json
@@ -28,7 +28,7 @@
   "bugs": {
     "url": "https://github.com/elastic/kibana/issues"
   },
-  "homepage": "https://github.com/elastic/kibana/tree/master/packages/safer-lodash-set#readme",
+  "homepage": "https://github.com/elastic/kibana/tree/main/packages/safer-lodash-set#readme",
   "standard": {
     "ignore": [
       "/lodash/"
diff --git a/packages/kbn-babel-code-parser/package.json b/packages/kbn-babel-code-parser/package.json
index a4ad8d603a0cb..7018cb3f8815f 100755
--- a/packages/kbn-babel-code-parser/package.json
+++ b/packages/kbn-babel-code-parser/package.json
@@ -7,6 +7,6 @@
   "license": "SSPL-1.0 OR Elastic License 2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/elastic/kibana/tree/master/packages/kbn-babel-code-parser"
+    "url": "https://github.com/elastic/kibana/tree/main/packages/kbn-babel-code-parser"
   }
 }
diff --git a/packages/kbn-eslint-import-resolver-kibana/package.json b/packages/kbn-eslint-import-resolver-kibana/package.json
index 49700c67eec55..fcb3c2ffb84f6 100755
--- a/packages/kbn-eslint-import-resolver-kibana/package.json
+++ b/packages/kbn-eslint-import-resolver-kibana/package.json
@@ -10,6 +10,6 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/elastic/kibana/tree/master/packages/kbn-eslint-import-resolver-kibana"
+    "url": "https://github.com/elastic/kibana/tree/main/packages/kbn-eslint-import-resolver-kibana"
   }
 }
\ No newline at end of file
diff --git a/packages/kbn-optimizer/BUILD.bazel b/packages/kbn-optimizer/BUILD.bazel
index d56b6c6746139..485e5f1044aa3 100644
--- a/packages/kbn-optimizer/BUILD.bazel
+++ b/packages/kbn-optimizer/BUILD.bazel
@@ -32,6 +32,7 @@ NPM_MODULE_EXTRA_FILES = [
 
 RUNTIME_DEPS = [
   "//packages/kbn-config",
+  "//packages/kbn-config-schema",
   "//packages/kbn-dev-utils",
   "//packages/kbn-std",
   "//packages/kbn-ui-shared-deps-npm",
@@ -62,6 +63,7 @@ RUNTIME_DEPS = [
 
 TYPES_DEPS = [
   "//packages/kbn-config",
+  "//packages/kbn-config-schema",
   "//packages/kbn-dev-utils",
   "//packages/kbn-std",
   "//packages/kbn-ui-shared-deps-npm",
diff --git a/packages/kbn-optimizer/README.md b/packages/kbn-optimizer/README.md
index 3fdf915e84c21..337b729edf440 100644
--- a/packages/kbn-optimizer/README.md
+++ b/packages/kbn-optimizer/README.md
@@ -44,19 +44,16 @@ Any import in a bundle which resolves into another bundles "context" directory,
 
 ## Themes
 
-SASS imports in bundles are automatically converted to CSS for one or more themes. In development we build the `v7light` and `v7dark` themes by default to improve build performance. When producing distributable bundles the default shifts to `*` so that the distributable bundles will include all themes, preventing the bundles from needing to be rebuilt when users change the active theme in Kibana's advanced settings.
+SASS imports in bundles are automatically converted to CSS for one or more themes. In development we build the `v8light` and `v8dark` themes by default to improve build performance. When producing distributable bundles the default shifts to `*` so that the distributable bundles will include all themes, preventing the bundles from needing to be rebuilt when users change the active theme in Kibana's advanced settings.
 
 To customize the themes that are built for development you can specify the `KBN_OPTIMIZER_THEMES` environment variable to one or more theme tags, or use `*` to build styles for all themes. Unfortunately building more than one theme significantly impacts build performance, so try to be strategic about which themes you build.
 
-Currently supported theme tags: `v7light`, `v7dark`, `v8light`, `v8dark`
+Currently supported theme tags: `v8light`, `v8dark`
 
 Examples:
 ```sh
 # start Kibana with only a single theme
-KBN_OPTIMIZER_THEMES=v7light yarn start
-
-# start Kibana with dark themes for version 7 and 8
-KBN_OPTIMIZER_THEMES=v7dark,v8dark yarn start
+KBN_OPTIMIZER_THEMES=v8light yarn start
 
 # start Kibana with all the themes
 KBN_OPTIMIZER_THEMES=* yarn start
diff --git a/packages/kbn-optimizer/src/babel_runtime_helpers/find_babel_runtime_helpers_in_entry_bundles.ts b/packages/kbn-optimizer/src/babel_runtime_helpers/find_babel_runtime_helpers_in_entry_bundles.ts
new file mode 100644
index 0000000000000..beff36023343d
--- /dev/null
+++ b/packages/kbn-optimizer/src/babel_runtime_helpers/find_babel_runtime_helpers_in_entry_bundles.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 Path from 'path';
+
+import { run, REPO_ROOT } from '@kbn/dev-utils';
+
+import { OptimizerConfig } from '../optimizer';
+import { parseStats, inAnyEntryChunk } from './parse_stats';
+
+export async function runFindBabelHelpersInEntryBundlesCli() {
+  run(async ({ log }) => {
+    const config = OptimizerConfig.create({
+      includeCoreBundle: true,
+      repoRoot: REPO_ROOT,
+    });
+
+    const paths = config.bundles.map((b) => Path.resolve(b.outputDir, 'stats.json'));
+
+    log.info('analyzing', paths.length, 'stats files');
+    log.verbose(paths);
+
+    const imports = new Set();
+    for (const path of paths) {
+      const stats = parseStats(path);
+
+      for (const module of stats.modules) {
+        if (!inAnyEntryChunk(stats, module)) {
+          continue;
+        }
+
+        for (const { userRequest } of module.reasons) {
+          if (userRequest.startsWith('@babel/runtime/')) {
+            imports.add(userRequest);
+          }
+        }
+      }
+    }
+
+    log.success('found', imports.size, '@babel/register imports in entry bundles');
+    log.write(
+      Array.from(imports, (i) => `'${i}',`)
+        .sort()
+        .join('\n')
+    );
+  });
+}
diff --git a/packages/kbn-optimizer/src/babel_runtime_helpers/index.ts b/packages/kbn-optimizer/src/babel_runtime_helpers/index.ts
new file mode 100644
index 0000000000000..58a3ddf263a1d
--- /dev/null
+++ b/packages/kbn-optimizer/src/babel_runtime_helpers/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 * from './find_babel_runtime_helpers_in_entry_bundles';
diff --git a/packages/kbn-optimizer/src/babel_runtime_helpers/parse_stats.ts b/packages/kbn-optimizer/src/babel_runtime_helpers/parse_stats.ts
new file mode 100644
index 0000000000000..fac0b099b5195
--- /dev/null
+++ b/packages/kbn-optimizer/src/babel_runtime_helpers/parse_stats.ts
@@ -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 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 Fs from 'fs';
+
+import dedent from 'dedent';
+import { schema, Props, TypeOf } from '@kbn/config-schema';
+
+const partialObject = <P extends Props>(props: P) => {
+  return schema.object(props, {
+    unknowns: 'ignore',
+  });
+};
+
+export type Module = TypeOf<typeof moduleSchema>;
+const moduleSchema = partialObject({
+  identifier: schema.string(),
+  chunks: schema.arrayOf(schema.oneOf([schema.string(), schema.number()])),
+  reasons: schema.arrayOf(
+    partialObject({
+      userRequest: schema.string(),
+    })
+  ),
+});
+
+export type Chunk = TypeOf<typeof chunkSchema>;
+const chunkSchema = partialObject({
+  id: schema.oneOf([schema.string(), schema.number()]),
+  entry: schema.boolean(),
+  initial: schema.boolean(),
+});
+
+const statsSchema = partialObject({
+  chunks: schema.arrayOf(chunkSchema),
+  modules: schema.arrayOf(moduleSchema),
+});
+
+export interface Stats {
+  path: string;
+  modules: Module[];
+  chunks: Chunk[];
+}
+export function parseStats(path: string): Stats {
+  try {
+    return {
+      path,
+      ...statsSchema.validate(JSON.parse(Fs.readFileSync(path, 'utf-8'))),
+    };
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      throw new Error(dedent`
+        unable to find stats file at [${path}]. Make sure you run the following
+        before running this script:
+
+          node scripts/build_kibana_platform_plugins --dist --profile
+      `);
+    }
+
+    throw error;
+  }
+}
+
+export function inAnyEntryChunk(stats: Stats, module: Module): boolean {
+  return module.chunks.some((id) => {
+    const chunk = stats.chunks.find((c) => c.id === id);
+    if (!chunk) {
+      throw new Error(
+        `unable to find chunk ${id} for module ${module.identifier} in ${stats.path}`
+      );
+    }
+
+    return chunk.entry || chunk.initial;
+  });
+}
diff --git a/packages/kbn-optimizer/src/common/theme_tags.test.ts b/packages/kbn-optimizer/src/common/theme_tags.test.ts
index 126d1b1833873..bbc7f2831e83f 100644
--- a/packages/kbn-optimizer/src/common/theme_tags.test.ts
+++ b/packages/kbn-optimizer/src/common/theme_tags.test.ts
@@ -20,8 +20,6 @@ it('returns default tags when passed undefined', () => {
 it('returns all tags when passed *', () => {
   expect(parseThemeTags('*')).toMatchInlineSnapshot(`
     Array [
-      "v7dark",
-      "v7light",
       "v8dark",
       "v8light",
     ]
@@ -37,38 +35,37 @@ it('returns specific tag when passed a single value', () => {
 });
 
 it('returns specific tags when passed a comma separated list', () => {
-  expect(parseThemeTags('v8light, v7dark,v7light')).toMatchInlineSnapshot(`
+  expect(parseThemeTags('v8light,v8dark')).toMatchInlineSnapshot(`
     Array [
-      "v7dark",
-      "v7light",
+      "v8dark",
       "v8light",
     ]
   `);
 });
 
 it('returns specific tags when passed an array', () => {
-  expect(parseThemeTags(['v8light', 'v7light'])).toMatchInlineSnapshot(`
+  expect(parseThemeTags(['v8light', 'v8dark'])).toMatchInlineSnapshot(`
     Array [
-      "v7light",
+      "v8dark",
       "v8light",
     ]
   `);
 });
 
 it('throws when an invalid tag is in the array', () => {
-  expect(() => parseThemeTags(['v8light', 'v7light', 'bar'])).toThrowErrorMatchingInlineSnapshot(
-    `"Invalid theme tags [bar], options: [v7dark, v7light, v8dark, v8light]"`
+  expect(() => parseThemeTags(['v8light', 'v7light'])).toThrowErrorMatchingInlineSnapshot(
+    `"Invalid theme tags [v7light], options: [v8dark, v8light]"`
   );
 });
 
 it('throws when an invalid tags in comma separated list', () => {
-  expect(() => parseThemeTags('v8light ,v7light,bar,box ')).toThrowErrorMatchingInlineSnapshot(
-    `"Invalid theme tags [bar, box], options: [v7dark, v7light, v8dark, v8light]"`
+  expect(() => parseThemeTags('v8light ,v7light')).toThrowErrorMatchingInlineSnapshot(
+    `"Invalid theme tags [v7light], options: [v8dark, v8light]"`
   );
 });
 
 it('returns tags in alphabetical order', () => {
-  const tags = parseThemeTags(['v7light', 'v8light']);
+  const tags = parseThemeTags(['v8dark', 'v8light']);
   expect(tags).toEqual(tags.slice().sort((a, b) => a.localeCompare(b)));
 });
 
diff --git a/packages/kbn-optimizer/src/common/theme_tags.ts b/packages/kbn-optimizer/src/common/theme_tags.ts
index de95bbdcbcfea..15366c1d0fbba 100644
--- a/packages/kbn-optimizer/src/common/theme_tags.ts
+++ b/packages/kbn-optimizer/src/common/theme_tags.ts
@@ -16,9 +16,9 @@ const isArrayOfStrings = (input: unknown): input is string[] =>
   Array.isArray(input) && input.every((v) => typeof v === 'string');
 
 export type ThemeTags = readonly ThemeTag[];
-export type ThemeTag = 'v7light' | 'v7dark' | 'v8light' | 'v8dark';
+export type ThemeTag = 'v8light' | 'v8dark';
 export const DEFAULT_THEMES = tags('v8light', 'v8dark');
-export const ALL_THEMES = tags('v7light', 'v7dark', 'v8light', 'v8dark');
+export const ALL_THEMES = tags('v8light', 'v8dark');
 
 export function parseThemeTags(input?: any): ThemeTags {
   if (!input) {
diff --git a/packages/kbn-optimizer/src/index.ts b/packages/kbn-optimizer/src/index.ts
index d5e810d584d29..d759a4aa02455 100644
--- a/packages/kbn-optimizer/src/index.ts
+++ b/packages/kbn-optimizer/src/index.ts
@@ -14,3 +14,4 @@ export * from './node';
 export * from './limits';
 export * from './cli';
 export * from './report_optimizer_timings';
+export * from './babel_runtime_helpers';
diff --git a/packages/kbn-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap b/packages/kbn-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap
index 8067ee2ce6c0b..3ca65769a18e1 100644
--- a/packages/kbn-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap
+++ b/packages/kbn-optimizer/src/integration_tests/__snapshots__/basic_optimization.test.ts.snap
@@ -156,7 +156,7 @@ OptimizerConfig {
 }
 `;
 
-exports[`prepares assets for distribution: bar bundle 1`] = `"!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){\\"undefined\\"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:\\"Module\\"}),Object.defineProperty(e,\\"__esModule\\",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&\\"object\\"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,\\"default\\",{enumerable:!0,value:e}),2&n&&\\"string\\"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,\\"a\\",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p=\\"\\",t(t.s=3)}([function(e,n,t){\\"use strict\\";var r,o=function(){return void 0===r&&(r=Boolean(window&&document&&document.all&&!window.atob)),r},i=function(){var e={};return function(n){if(void 0===e[n]){var t=document.querySelector(n);if(window.HTMLIFrameElement&&t instanceof window.HTMLIFrameElement)try{t=t.contentDocument.head}catch(e){t=null}e[n]=t}return e[n]}}(),a=[];function c(e){for(var n=-1,t=0;t<a.length;t++)if(a[t].identifier===e){n=t;break}return n}function u(e,n){for(var t={},r=[],o=0;o<e.length;o++){var i=e[o],u=n.base?i[0]+n.base:i[0],s=t[u]||0,l=\\"\\".concat(u,\\" \\").concat(s);t[u]=s+1;var f=c(l),d={css:i[1],media:i[2],sourceMap:i[3]};-1!==f?(a[f].references++,a[f].updater(d)):a.push({identifier:l,updater:h(d,n),references:1}),r.push(l)}return r}function s(e){var n=document.createElement(\\"style\\"),r=e.attributes||{};if(void 0===r.nonce){var o=t.nc;o&&(r.nonce=o)}if(Object.keys(r).forEach((function(e){n.setAttribute(e,r[e])})),\\"function\\"==typeof e.insert)e.insert(n);else{var a=i(e.insert||\\"head\\");if(!a)throw new Error(\\"Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.\\");a.appendChild(n)}return n}var l,f=(l=[],function(e,n){return l[e]=n,l.filter(Boolean).join(\\"\\\\n\\")});function d(e,n,t,r){var o=t?\\"\\":r.media?\\"@media \\".concat(r.media,\\" {\\").concat(r.css,\\"}\\"):r.css;if(e.styleSheet)e.styleSheet.cssText=f(n,o);else{var i=document.createTextNode(o),a=e.childNodes;a[n]&&e.removeChild(a[n]),a.length?e.insertBefore(i,a[n]):e.appendChild(i)}}function p(e,n,t){var r=t.css,o=t.media,i=t.sourceMap;if(o?e.setAttribute(\\"media\\",o):e.removeAttribute(\\"media\\"),i&&btoa&&(r+=\\"\\\\n/*# sourceMappingURL=data:application/json;base64,\\".concat(btoa(unescape(encodeURIComponent(JSON.stringify(i)))),\\" */\\")),e.styleSheet)e.styleSheet.cssText=r;else{for(;e.firstChild;)e.removeChild(e.firstChild);e.appendChild(document.createTextNode(r))}}var v=null,b=0;function h(e,n){var t,r,o;if(n.singleton){var i=b++;t=v||(v=s(n)),r=d.bind(null,t,i,!1),o=d.bind(null,t,i,!0)}else t=s(n),r=p.bind(null,t,n),o=function(){!function(e){if(null===e.parentNode)return!1;e.parentNode.removeChild(e)}(t)};return r(e),function(n){if(n){if(n.css===e.css&&n.media===e.media&&n.sourceMap===e.sourceMap)return;r(e=n)}else o()}}e.exports=function(e,n){(n=n||{}).singleton||\\"boolean\\"==typeof n.singleton||(n.singleton=o());var t=u(e=e||[],n);return function(e){if(e=e||[],\\"[object Array]\\"===Object.prototype.toString.call(e)){for(var r=0;r<t.length;r++){var o=c(t[r]);a[o].references--}for(var i=u(e,n),s=0;s<t.length;s++){var l=c(t[s]);0===a[l].references&&(a[l].updater(),a.splice(l,1))}t=i}}}},function(e,n,t){\\"use strict\\";e.exports=function(e){var n=[];return n.toString=function(){return this.map((function(n){var t=function(e,n){var t=e[1]||\\"\\",r=e[3];if(!r)return t;if(n&&\\"function\\"==typeof btoa){var o=(a=r,c=btoa(unescape(encodeURIComponent(JSON.stringify(a)))),u=\\"sourceMappingURL=data:application/json;charset=utf-8;base64,\\".concat(c),\\"/*# \\".concat(u,\\" */\\")),i=r.sources.map((function(e){return\\"/*# sourceURL=\\".concat(r.sourceRoot||\\"\\").concat(e,\\" */\\")}));return[t].concat(i).concat([o]).join(\\"\\\\n\\")}var a,c,u;return[t].join(\\"\\\\n\\")}(n,e);return n[2]?\\"@media \\".concat(n[2],\\" {\\").concat(t,\\"}\\"):t})).join(\\"\\")},n.i=function(e,t,r){\\"string\\"==typeof e&&(e=[[null,e,\\"\\"]]);var o={};if(r)for(var i=0;i<this.length;i++){var a=this[i][0];null!=a&&(o[a]=!0)}for(var c=0;c<e.length;c++){var u=[].concat(e[c]);r&&o[u[0]]||(t&&(u[2]?u[2]=\\"\\".concat(t,\\" and \\").concat(u[2]):u[2]=t),n.push(u))}},n}},function(e,n,t){t.r(n);var r=__kbnBundles__.get(\\"plugin/foo/public\\");Object.defineProperties(n,Object.getOwnPropertyDescriptors(r))},function(e,n,t){t(4),__kbnBundles__.define(\\"plugin/bar/public\\",t,23)},function(e,n,t){t.p=window.__kbnPublicPath__.bar},function(e,n,t){switch(window.__kbnThemeTag__){case\\"v7dark\\":return t(6);case\\"v7light\\":return t(8);case\\"v8dark\\":return t(10);case\\"v8light\\":return t(12)}},function(e,n,t){var r=t(0),o=t(7);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"p{background-color:rebeccapurple}body{width:10}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){var r=t(0),o=t(9);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"p{background-color:rebeccapurple}body{width:11}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){var r=t(0),o=t(11);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"p{background-color:rebeccapurple}body{width:12}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){var r=t(0),o=t(13);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"p{background-color:rebeccapurple}body{width:13}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){switch(window.__kbnThemeTag__){case\\"v7dark\\":return t(15);case\\"v7light\\":return t(17);case\\"v8dark\\":return t(19);case\\"v8light\\":return t(21)}},function(e,n,t){var r=t(0),o=t(16);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"body{color:green}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){var r=t(0),o=t(18);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"body{color:green}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){var r=t(0),o=t(20);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"body{color:green}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){var r=t(0),o=t(22);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"body{color:green}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){\\"use strict\\";t.r(n),t.d(n,\\"barLibFn\\",(function(){return o})),t.d(n,\\"fooLibFn\\",(function(){return r.fooLibFn}));t(5),t(14);var r=t(2);function o(){return\\"bar\\"}}]);"`;
+exports[`prepares assets for distribution: bar bundle 1`] = `"!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){\\"undefined\\"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:\\"Module\\"}),Object.defineProperty(e,\\"__esModule\\",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&\\"object\\"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,\\"default\\",{enumerable:!0,value:e}),2&n&&\\"string\\"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,\\"a\\",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p=\\"\\",t(t.s=3)}([function(e,n,t){\\"use strict\\";var r,o=function(){return void 0===r&&(r=Boolean(window&&document&&document.all&&!window.atob)),r},i=function(){var e={};return function(n){if(void 0===e[n]){var t=document.querySelector(n);if(window.HTMLIFrameElement&&t instanceof window.HTMLIFrameElement)try{t=t.contentDocument.head}catch(e){t=null}e[n]=t}return e[n]}}(),a=[];function c(e){for(var n=-1,t=0;t<a.length;t++)if(a[t].identifier===e){n=t;break}return n}function u(e,n){for(var t={},r=[],o=0;o<e.length;o++){var i=e[o],u=n.base?i[0]+n.base:i[0],s=t[u]||0,f=\\"\\".concat(u,\\" \\").concat(s);t[u]=s+1;var l=c(f),d={css:i[1],media:i[2],sourceMap:i[3]};-1!==l?(a[l].references++,a[l].updater(d)):a.push({identifier:f,updater:h(d,n),references:1}),r.push(f)}return r}function s(e){var n=document.createElement(\\"style\\"),r=e.attributes||{};if(void 0===r.nonce){var o=t.nc;o&&(r.nonce=o)}if(Object.keys(r).forEach((function(e){n.setAttribute(e,r[e])})),\\"function\\"==typeof e.insert)e.insert(n);else{var a=i(e.insert||\\"head\\");if(!a)throw new Error(\\"Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.\\");a.appendChild(n)}return n}var f,l=(f=[],function(e,n){return f[e]=n,f.filter(Boolean).join(\\"\\\\n\\")});function d(e,n,t,r){var o=t?\\"\\":r.media?\\"@media \\".concat(r.media,\\" {\\").concat(r.css,\\"}\\"):r.css;if(e.styleSheet)e.styleSheet.cssText=l(n,o);else{var i=document.createTextNode(o),a=e.childNodes;a[n]&&e.removeChild(a[n]),a.length?e.insertBefore(i,a[n]):e.appendChild(i)}}function p(e,n,t){var r=t.css,o=t.media,i=t.sourceMap;if(o?e.setAttribute(\\"media\\",o):e.removeAttribute(\\"media\\"),i&&btoa&&(r+=\\"\\\\n/*# sourceMappingURL=data:application/json;base64,\\".concat(btoa(unescape(encodeURIComponent(JSON.stringify(i)))),\\" */\\")),e.styleSheet)e.styleSheet.cssText=r;else{for(;e.firstChild;)e.removeChild(e.firstChild);e.appendChild(document.createTextNode(r))}}var v=null,b=0;function h(e,n){var t,r,o;if(n.singleton){var i=b++;t=v||(v=s(n)),r=d.bind(null,t,i,!1),o=d.bind(null,t,i,!0)}else t=s(n),r=p.bind(null,t,n),o=function(){!function(e){if(null===e.parentNode)return!1;e.parentNode.removeChild(e)}(t)};return r(e),function(n){if(n){if(n.css===e.css&&n.media===e.media&&n.sourceMap===e.sourceMap)return;r(e=n)}else o()}}e.exports=function(e,n){(n=n||{}).singleton||\\"boolean\\"==typeof n.singleton||(n.singleton=o());var t=u(e=e||[],n);return function(e){if(e=e||[],\\"[object Array]\\"===Object.prototype.toString.call(e)){for(var r=0;r<t.length;r++){var o=c(t[r]);a[o].references--}for(var i=u(e,n),s=0;s<t.length;s++){var f=c(t[s]);0===a[f].references&&(a[f].updater(),a.splice(f,1))}t=i}}}},function(e,n,t){\\"use strict\\";e.exports=function(e){var n=[];return n.toString=function(){return this.map((function(n){var t=function(e,n){var t=e[1]||\\"\\",r=e[3];if(!r)return t;if(n&&\\"function\\"==typeof btoa){var o=(a=r,c=btoa(unescape(encodeURIComponent(JSON.stringify(a)))),u=\\"sourceMappingURL=data:application/json;charset=utf-8;base64,\\".concat(c),\\"/*# \\".concat(u,\\" */\\")),i=r.sources.map((function(e){return\\"/*# sourceURL=\\".concat(r.sourceRoot||\\"\\").concat(e,\\" */\\")}));return[t].concat(i).concat([o]).join(\\"\\\\n\\")}var a,c,u;return[t].join(\\"\\\\n\\")}(n,e);return n[2]?\\"@media \\".concat(n[2],\\" {\\").concat(t,\\"}\\"):t})).join(\\"\\")},n.i=function(e,t,r){\\"string\\"==typeof e&&(e=[[null,e,\\"\\"]]);var o={};if(r)for(var i=0;i<this.length;i++){var a=this[i][0];null!=a&&(o[a]=!0)}for(var c=0;c<e.length;c++){var u=[].concat(e[c]);r&&o[u[0]]||(t&&(u[2]?u[2]=\\"\\".concat(t,\\" and \\").concat(u[2]):u[2]=t),n.push(u))}},n}},function(e,n,t){t.r(n);var r=__kbnBundles__.get(\\"plugin/foo/public\\");Object.defineProperties(n,Object.getOwnPropertyDescriptors(r))},function(e,n,t){t(4),__kbnBundles__.define(\\"plugin/bar/public\\",t,15)},function(e,n,t){t.p=window.__kbnPublicPath__.bar},function(e,n,t){switch(window.__kbnThemeTag__){case\\"v8dark\\":return t(6);case\\"v8light\\":return t(8)}},function(e,n,t){var r=t(0),o=t(7);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"p{background-color:rebeccapurple}body{width:12}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){var r=t(0),o=t(9);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"p{background-color:rebeccapurple}body{width:13}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){switch(window.__kbnThemeTag__){case\\"v8dark\\":return t(11);case\\"v8light\\":return t(13)}},function(e,n,t){var r=t(0),o=t(12);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"body{color:green}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){var r=t(0),o=t(14);\\"string\\"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,\\"\\"]]);var i={insert:\\"head\\",singleton:!1};r(o,i);e.exports=o.locals||{}},function(e,n,t){(n=t(1)(!1)).push([e.i,\\"body{color:green}\\\\n\\",\\"\\"]),e.exports=n},function(e,n,t){\\"use strict\\";t.r(n),t.d(n,\\"barLibFn\\",(function(){return o})),t.d(n,\\"fooLibFn\\",(function(){return r.fooLibFn}));t(5),t(10);var r=t(2);function o(){return\\"bar\\"}}]);"`;
 
 exports[`prepares assets for distribution: baz bundle 1`] = `
 "/*! Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one or more contributor license agreements. 
diff --git a/packages/kbn-optimizer/src/worker/theme_loader.ts b/packages/kbn-optimizer/src/worker/theme_loader.ts
index 5da3b339ebefc..10a82eb148f63 100644
--- a/packages/kbn-optimizer/src/worker/theme_loader.ts
+++ b/packages/kbn-optimizer/src/worker/theme_loader.ts
@@ -10,7 +10,7 @@ import { stringifyRequest, getOptions } from 'loader-utils';
 import webpack from 'webpack';
 import { parseThemeTags, ALL_THEMES, ThemeTag } from '../common';
 
-const getVersion = (tag: ThemeTag) => (tag.includes('v7') ? 7 : 8);
+const getVersion = (tag: ThemeTag) => 8;
 const getIsDark = (tag: ThemeTag) => tag.includes('dark');
 const compare = (a: ThemeTag, b: ThemeTag) =>
   (getVersion(a) === getVersion(b) ? 1 : 0) + (getIsDark(a) === getIsDark(b) ? 1 : 0);
diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts
index 973b094e73f9e..58201152a2459 100644
--- a/packages/kbn-optimizer/src/worker/webpack.config.ts
+++ b/packages/kbn-optimizer/src/worker/webpack.config.ts
@@ -81,6 +81,10 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
       new BundleRefsPlugin(bundle, bundleRefs),
       new PopulateBundleCachePlugin(worker, bundle),
       new BundleMetricsPlugin(bundle),
+      new webpack.DllReferencePlugin({
+        context: worker.repoRoot,
+        manifest: require(UiSharedDepsNpm.dllManifestPath),
+      }),
       ...(worker.profileWebpack ? [new EmitStatsPlugin(bundle)] : []),
       ...(bundle.banner ? [new webpack.BannerPlugin({ banner: bundle.banner, raw: true })] : []),
     ],
@@ -269,10 +273,6 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
         test: /\.(js|css)$/,
         cache: false,
       }),
-      new webpack.DllReferencePlugin({
-        context: worker.repoRoot,
-        manifest: require(UiSharedDepsNpm.dllManifestPath),
-      }),
     ],
 
     optimization: {
diff --git a/packages/kbn-plugin-generator/template/README.md.ejs b/packages/kbn-plugin-generator/template/README.md.ejs
index 2cd19c904263e..5627b5d19c531 100755
--- a/packages/kbn-plugin-generator/template/README.md.ejs
+++ b/packages/kbn-plugin-generator/template/README.md.ejs
@@ -6,7 +6,7 @@ A Kibana plugin
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
 
 <% if (thirdPartyPlugin) { %>
 ## Scripts
diff --git a/packages/kbn-securitysolution-es-utils/src/get_bootstrap_index_exists/index.ts b/packages/kbn-securitysolution-es-utils/src/get_bootstrap_index_exists/index.ts
new file mode 100644
index 0000000000000..959e38b3f7ee4
--- /dev/null
+++ b/packages/kbn-securitysolution-es-utils/src/get_bootstrap_index_exists/index.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 { ElasticsearchClient } from '../elasticsearch_client';
+
+/**
+ * This function is similar to getIndexExists, but is limited to searching indices that match
+ * the index pattern used as concrete backing indices (e.g. .siem-signals-default-000001).
+ * This allows us to separate the indices that are actually .siem-signals indices from
+ * alerts as data indices that only share the .siem-signals alias.
+ *
+ * @param esClient Elasticsearch client to use to make the request
+ * @param index Index alias name to check for existence
+ */
+export const getBootstrapIndexExists = async (
+  esClient: ElasticsearchClient,
+  index: string
+): Promise<boolean> => {
+  try {
+    const { body } = await esClient.indices.getAlias({
+      index: `${index}-*`,
+      name: index,
+    });
+    return Object.keys(body).length > 0;
+  } catch (err) {
+    if (err.body != null && err.body.status === 404) {
+      return false;
+    } else {
+      throw err.body ? err.body : err;
+    }
+  }
+};
diff --git a/packages/kbn-securitysolution-es-utils/src/index.ts b/packages/kbn-securitysolution-es-utils/src/index.ts
index f4b081ac1b0a0..a32cf8968967c 100644
--- a/packages/kbn-securitysolution-es-utils/src/index.ts
+++ b/packages/kbn-securitysolution-es-utils/src/index.ts
@@ -13,6 +13,7 @@ export * from './delete_all_index';
 export * from './delete_policy';
 export * from './delete_template';
 export * from './encode_hit_version';
+export * from './get_bootstrap_index_exists';
 export * from './get_index_aliases';
 export * from './get_index_count';
 export * from './get_index_exists';
diff --git a/packages/kbn-spec-to-console/README.md b/packages/kbn-spec-to-console/README.md
index be0ada5e38850..20a5ee855f7f6 100644
--- a/packages/kbn-spec-to-console/README.md
+++ b/packages/kbn-spec-to-console/README.md
@@ -31,6 +31,6 @@ yarn spec_to_console -g "<ELASTICSEARCH-REPO-FOLDER>/rest-api-spec/src/main/reso
 * Ad hoc additions
 
 ### Updating the script
-When converting query params defined in the REST API specs to console autocompletion definitions, the script relies on a set of known conversion rules specified in [lib/convert/params.js](https://github.com/elastic/kibana/blob/master/packages/kbn-spec-to-console/lib/convert/params.js).
+When converting query params defined in the REST API specs to console autocompletion definitions, the script relies on a set of known conversion rules specified in [lib/convert/params.js](https://github.com/elastic/kibana/blob/main/packages/kbn-spec-to-console/lib/convert/params.js).
 For example, `"keep_on_completion":{"type":"boolean"}` from REST API specs is converted to `"keep_on_completion": "__flag__"` in console autocomplete definitions.
-When an unknown parameter type is encountered in REST API specs, the script will throw an `Unexpected type error` and the file [lib/convert/params.js](https://github.com/elastic/kibana/blob/master/packages/kbn-spec-to-console/lib/convert/params.js) needs to be updated by adding a new conversion rule. 
\ No newline at end of file
+When an unknown parameter type is encountered in REST API specs, the script will throw an `Unexpected type error` and the file [lib/convert/params.js](https://github.com/elastic/kibana/blob/main/packages/kbn-spec-to-console/lib/convert/params.js) needs to be updated by adding a new conversion rule. 
\ No newline at end of file
diff --git a/packages/kbn-storybook/src/lib/register.ts b/packages/kbn-storybook/src/lib/register.ts
index 1e49606323422..f102e43c8c042 100644
--- a/packages/kbn-storybook/src/lib/register.ts
+++ b/packages/kbn-storybook/src/lib/register.ts
@@ -16,7 +16,7 @@ addons.setConfig({
   theme: create({
     base: 'light',
     brandTitle: 'Kibana Storybook',
-    brandUrl: 'https://github.com/elastic/kibana/tree/master/packages/kbn-storybook',
+    brandUrl: 'https://github.com/elastic/kibana/tree/main/packages/kbn-storybook',
   }),
   showPanel: false,
   isFullscreen: false,
diff --git a/packages/kbn-storybook/src/lib/theme_switcher.tsx b/packages/kbn-storybook/src/lib/theme_switcher.tsx
index 24ddec1fdf51c..fd3e36b4cc306 100644
--- a/packages/kbn-storybook/src/lib/theme_switcher.tsx
+++ b/packages/kbn-storybook/src/lib/theme_switcher.tsx
@@ -25,14 +25,12 @@ export function ThemeSwitcher() {
     const links: Link[] = [
       {
         id: 'v8.light',
-        title: 'Amsterdam: Light',
+        title: 'Light',
       },
       {
         id: 'v8.dark',
-        title: 'Amsterdam: Dark',
+        title: 'Dark',
       },
-      { id: 'v7.light', title: 'Light' },
-      { id: 'v7.dark', title: 'Dark' },
     ].map((link) => ({
       ...link,
       onClick: (_event, item) => {
diff --git a/packages/kbn-storybook/src/webpack.config.ts b/packages/kbn-storybook/src/webpack.config.ts
index f77207b803355..27e887eda65ce 100644
--- a/packages/kbn-storybook/src/webpack.config.ts
+++ b/packages/kbn-storybook/src/webpack.config.ts
@@ -58,7 +58,7 @@ export default function ({ config: storybookConfig }: { config: Configuration })
                 additionalData(content: string, loaderContext: any) {
                   return `@import ${stringifyRequest(
                     loaderContext,
-                    resolve(REPO_ROOT, 'src/core/public/core_app/styles/_globals_v7light.scss')
+                    resolve(REPO_ROOT, 'src/core/public/core_app/styles/_globals_v8light.scss')
                   )};\n${content}`;
                 },
                 implementation: require('node-sass'),
diff --git a/packages/kbn-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts b/packages/kbn-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts
index 80fe8340e6a11..193bc668ce003 100644
--- a/packages/kbn-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts
+++ b/packages/kbn-test/src/failed_tests_reporter/run_failed_tests_reporter_cli.ts
@@ -51,9 +51,9 @@ export function runFailedTestsReporterCli() {
           branch = jobNameSplit.length >= 3 ? jobNameSplit[2] : process.env.GIT_BRANCH || '';
           isPr = !!process.env.ghprbPullId;
 
-          const isMasterOrVersion = branch === 'master' || branch.match(/^\d+\.(x|\d+)$/);
-          if (!isMasterOrVersion || isPr) {
-            log.info('Failure issues only created on master/version branch jobs');
+          const isMainOrVersion = branch === 'main' || branch.match(/^\d+\.(x|\d+)$/);
+          if (!isMainOrVersion || isPr) {
+            log.info('Failure issues only created on main/version branch jobs');
             updateGithub = false;
           }
         }
diff --git a/packages/kbn-ui-shared-deps-npm/src/index.js b/packages/kbn-ui-shared-deps-npm/src/index.js
index 435371049e46b..678e7c845e6a5 100644
--- a/packages/kbn-ui-shared-deps-npm/src/index.js
+++ b/packages/kbn-ui-shared-deps-npm/src/index.js
@@ -6,6 +6,10 @@
  * Side Public License, v 1.
  */
 
+/**
+ * @typedef {'v8'} ThemeVersion
+ */
+
 const Path = require('path');
 
 /**
@@ -25,23 +29,27 @@ exports.dllFilename = 'kbn-ui-shared-deps-npm.dll.js';
 
 /**
  * Filename of the light-theme css file in the distributable directory
+ * @param {ThemeVersion} themeVersion
  */
-exports.lightCssDistFilename = 'kbn-ui-shared-deps-npm.v7.light.css';
+exports.lightCssDistFilename = (themeVersion) => {
+  if (themeVersion !== 'v8') {
+    throw new Error(`unsupported theme version [${themeVersion}]`);
+  }
 
-/**
- * Filename of the light-theme css file in the distributable directory
- */
-exports.lightV8CssDistFilename = 'kbn-ui-shared-deps-npm.v8.light.css';
+  return 'kbn-ui-shared-deps-npm.v8.light.css';
+};
 
 /**
  * Filename of the dark-theme css file in the distributable directory
+ * @param {ThemeVersion} themeVersion
  */
-exports.darkCssDistFilename = 'kbn-ui-shared-deps-npm.v7.dark.css';
+exports.darkCssDistFilename = (themeVersion) => {
+  if (themeVersion !== 'v8') {
+    throw new Error(`unsupported theme version [${themeVersion}]`);
+  }
 
-/**
- * Filename of the dark-theme css file in the distributable directory
- */
-exports.darkV8CssDistFilename = 'kbn-ui-shared-deps-npm.v8.dark.css';
+  return 'kbn-ui-shared-deps-npm.v8.dark.css';
+};
 
 /**
  * Webpack loader for configuring the public path lookup from `window.__kbnPublicPath__`.
diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js
index 6b572dc3ea208..80043bd0857ee 100644
--- a/packages/kbn-ui-shared-deps-npm/webpack.config.js
+++ b/packages/kbn-ui-shared-deps-npm/webpack.config.js
@@ -38,14 +38,37 @@ module.exports = (_, argv) => {
         'whatwg-fetch',
         'symbol-observable',
 
+        /**
+         * babel runtime helpers referenced from entry chunks
+         * determined by running:
+         *
+         *  node scripts/build_kibana_platform_plugins --dist --profile
+         *  node scripts/find_babel_runtime_helpers_in_use.js
+         */
+        '@babel/runtime/helpers/assertThisInitialized',
+        '@babel/runtime/helpers/classCallCheck',
+        '@babel/runtime/helpers/classPrivateFieldGet',
+        '@babel/runtime/helpers/classPrivateFieldSet',
+        '@babel/runtime/helpers/createSuper',
+        '@babel/runtime/helpers/defineProperty',
+        '@babel/runtime/helpers/extends',
+        '@babel/runtime/helpers/inherits',
+        '@babel/runtime/helpers/interopRequireDefault',
+        '@babel/runtime/helpers/interopRequireWildcard',
+        '@babel/runtime/helpers/objectSpread2',
+        '@babel/runtime/helpers/objectWithoutPropertiesLoose',
+        '@babel/runtime/helpers/slicedToArray',
+        '@babel/runtime/helpers/toArray',
+        '@babel/runtime/helpers/toConsumableArray',
+        '@babel/runtime/helpers/typeof',
+        '@babel/runtime/helpers/wrapNativeSuper',
+
         // modules from npm
         '@elastic/charts',
         '@elastic/eui',
         '@elastic/eui/dist/eui_charts_theme',
         '@elastic/eui/lib/services',
         '@elastic/eui/lib/services/format',
-        '@elastic/eui/dist/eui_theme_light.json',
-        '@elastic/eui/dist/eui_theme_dark.json',
         '@elastic/eui/dist/eui_theme_amsterdam_light.json',
         '@elastic/eui/dist/eui_theme_amsterdam_dark.json',
         '@elastic/numeral',
@@ -71,8 +94,6 @@ module.exports = (_, argv) => {
         'styled-components',
         'tslib',
       ],
-      'kbn-ui-shared-deps-npm.v7.dark': ['@elastic/eui/dist/eui_theme_dark.css'],
-      'kbn-ui-shared-deps-npm.v7.light': ['@elastic/eui/dist/eui_theme_light.css'],
       'kbn-ui-shared-deps-npm.v8.dark': ['@elastic/eui/dist/eui_theme_amsterdam_dark.css'],
       'kbn-ui-shared-deps-npm.v8.light': ['@elastic/eui/dist/eui_theme_amsterdam_light.css'],
     },
diff --git a/packages/kbn-ui-shared-deps-src/src/theme.ts b/packages/kbn-ui-shared-deps-src/src/theme.ts
index 05c2210042ac6..f058913cdeeab 100644
--- a/packages/kbn-ui-shared-deps-src/src/theme.ts
+++ b/packages/kbn-ui-shared-deps-src/src/theme.ts
@@ -6,30 +6,21 @@
  * Side Public License, v 1.
  */
 
-import { default as v7Light } from '@elastic/eui/dist/eui_theme_light.json';
-import { default as v7Dark } from '@elastic/eui/dist/eui_theme_dark.json';
 import { default as v8Light } from '@elastic/eui/dist/eui_theme_amsterdam_light.json';
 import { default as v8Dark } from '@elastic/eui/dist/eui_theme_amsterdam_dark.json';
 
 const globals: any = typeof window === 'undefined' ? {} : window;
 
-export type Theme = typeof v7Light | typeof v8Light;
+export type Theme = typeof v8Light;
 
 // in the Kibana app we can rely on this global being defined, but in
 // some cases (like jest) the global is undefined
-export const tag: string = globals.__kbnThemeTag__ || 'v7light';
-export const version = tag.startsWith('v7') ? 7 : 8;
+export const tag: string = globals.__kbnThemeTag__ || 'v8light';
+export const version = 8;
 export const darkMode = tag.endsWith('dark');
 
-export let euiLightVars: Theme;
-export let euiDarkVars: Theme;
-if (version === 7) {
-  euiLightVars = v7Light;
-  euiDarkVars = v7Dark;
-} else {
-  euiLightVars = v8Light;
-  euiDarkVars = v8Dark;
-}
+export const euiLightVars: Theme = v8Light;
+export const euiDarkVars: Theme = v8Dark;
 
 /**
  * EUI Theme vars that automatically adjust to light/dark theme
diff --git a/renovate.json5 b/renovate.json5
index 69f642712ca6f..d979b24f1fe09 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -11,7 +11,7 @@
     'npm',
   ],
   baseBranches: [
-    'master',
+    'main',
     '7.16',
     '7.15',
   ],
@@ -38,7 +38,7 @@
         groupName: '@elastic/charts',
         packageNames: ['@elastic/charts'],
         reviewers: ['team:datavis'],
-        matchBaseBranches: ['master'],
+        matchBaseBranches: ['main'],
         labels: ['release_note:skip', 'v8.0.0', 'v7.16.0', 'auto-backport'],
         draftPR: true,
         enabled: true,
@@ -47,7 +47,7 @@
         groupName: '@elastic/elasticsearch',
         packageNames: ['@elastic/elasticsearch'],
         reviewers: ['team:kibana-operations', 'team:kibana-core'],
-        matchBaseBranches: ['master'],
+        matchBaseBranches: ['main'],
         labels: ['release_note:skip', 'v8.0.0', 'Team:Operations', 'Team:Core', 'backport:skip'],
         enabled: true,
       },
@@ -72,7 +72,7 @@
         packageNames: ['@types/babel__core'],
         matchPackagePatterns: ["^@babel", "^babel-plugin"],
         reviewers: ['team:kibana-operations'],
-        matchBaseBranches: ['master'],
+        matchBaseBranches: ['main'],
         labels: ['Team:Operations', 'release_note:skip'],
         enabled: true,
       },
@@ -82,7 +82,7 @@
         matchPackagePatterns: ["polyfill"],
         excludePackageNames: ['@loaders.gl/polyfills'],
         reviewers: ['team:kibana-operations'],
-        matchBaseBranches: ['master'],
+        matchBaseBranches: ['main'],
         labels: ['Team:Operations', 'release_note:skip'],
         enabled: true,
       },
@@ -90,7 +90,7 @@
         groupName: 'vega related modules',
         packageNames: ['vega', 'vega-lite', 'vega-schema-url-parser', 'vega-tooltip'],
         reviewers: ['team:kibana-vis-editors'],
-        matchBaseBranches: ['master'],
+        matchBaseBranches: ['main'],
         labels: ['Feature:Vega', 'Team:VisEditors'],
         enabled: true,
       },
@@ -99,7 +99,7 @@
         packageNames: ['eslint-plugin-cypress'],
         matchPackagePatterns: ["^cypress"],
         reviewers: ['Team:apm', 'Team: SecuritySolution'],
-        matchBaseBranches: ['master'],
+        matchBaseBranches: ['main'],
         labels: ['buildkite-ci', 'ci:all-cypress-suites'],
         enabled: true,
       }
@@ -113,7 +113,7 @@
           'xml-crypto', '@types/xml-crypto'
         ],
         reviewers: ['team:kibana-security'],
-        matchBaseBranches: ['master'],
+        matchBaseBranches: ['main'],
         labels: ['Team:Security', 'release_note:skip', 'auto-backport'],
         enabled: true,
       },
diff --git a/scripts/find_babel_runtime_helpers_in_use.js b/scripts/find_babel_runtime_helpers_in_use.js
new file mode 100644
index 0000000000000..a229c8e11a2ca
--- /dev/null
+++ b/scripts/find_babel_runtime_helpers_in_use.js
@@ -0,0 +1,10 @@
+/*
+ * Copyright 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.
+ */
+
+require('../src/setup_node_env/no_transpilation');
+require('@kbn/optimizer').runFindBabelHelpersInEntryBundlesCli();
diff --git a/src/core/public/core_app/styles/_globals_v7dark.scss b/src/core/public/core_app/styles/_globals_v7dark.scss
deleted file mode 100644
index 9341601089737..0000000000000
--- a/src/core/public/core_app/styles/_globals_v7dark.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-// v7dark global scope
-//
-// prepended to all .scss imports (from JS, when v7dark theme selected)
-
-@import '@elastic/eui/src/themes/eui/eui_colors_dark';
-@import '@elastic/eui/src/themes/eui/eui_globals';
-
-@import './mixins';
-
-$kbnThemeVersion: 'v7dark';
diff --git a/src/core/public/core_app/styles/_globals_v7light.scss b/src/core/public/core_app/styles/_globals_v7light.scss
deleted file mode 100644
index e1ff6ec70aab5..0000000000000
--- a/src/core/public/core_app/styles/_globals_v7light.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-// v7light global scope
-//
-// prepended to all .scss imports (from JS, when v7light theme selected)
-
-@import '@elastic/eui/src/themes/eui/eui_colors_light';
-@import '@elastic/eui/src/themes/eui/eui_globals';
-
-@import './mixins';
-
-$kbnThemeVersion: 'v7light';
diff --git a/src/core/public/core_app/styles/_mixins.scss b/src/core/public/core_app/styles/_mixins.scss
index b2adbdb691bb6..d088a47144f33 100644
--- a/src/core/public/core_app/styles/_mixins.scss
+++ b/src/core/public/core_app/styles/_mixins.scss
@@ -120,31 +120,3 @@
     }
   }
 }
-
-@mixin kbnThemeStyle($theme, $mode: 'both') {
-  $themes:  'v7', 'v8';
-  @if (index($themes, $theme)) {
-    @if ($mode == 'both') {
-      $themeLight: $theme + 'light';
-      $themeDark: $theme + 'dark';
-      // $kbnThemeVersion comes from the active theme's globals file (e.g. _globals_v8light.scss)
-      @if ($kbnThemeVersion == $themeLight or $kbnThemeVersion == $themeDark) {
-        @content;
-      }
-    } @else if ($mode == 'light') {
-      $themeLight: $theme + 'light';
-      @if ($kbnThemeVersion == $themeLight) {
-        @content;
-      }
-    } @else if ($mode == 'dark') {
-      $themeDark: $theme + 'dark';
-      @if ($kbnThemeVersion == $themeDark) {
-        @content;
-      }
-    } @else {
-      @warn 'The second parameter must be a valid mode (light, dark, or both) -- got #{$mode}';
-    }
-  } @else {
-    @warn 'Invalid $theme. Valid options are: #{$themes}. Got #{$theme} instead';
-  }
-}
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index 0cab7a72adae8..118834a1458cd 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -18,7 +18,9 @@ export class DocLinksService {
   public setup() {}
 
   public start({ injectedMetadata }: StartDeps): DocLinksStart {
-    const DOC_LINK_VERSION = injectedMetadata.getKibanaBranch();
+    const kibanaBranch = injectedMetadata.getKibanaBranch();
+    // Documentation for `main` branches is still published at a `master` URL.
+    const DOC_LINK_VERSION = kibanaBranch === 'main' ? 'master' : kibanaBranch;
     const ELASTIC_WEBSITE_URL = 'https://www.elastic.co/';
     const ELASTICSEARCH_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/`;
     const KIBANA_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/`;
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Black.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Black.woff
deleted file mode 100644
index 908f1912ba552..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Black.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Black.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Black.woff2
deleted file mode 100644
index bd14f008977ef..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Black.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff
deleted file mode 100644
index cab336ca9ae9d..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff2
deleted file mode 100644
index 1740872acb112..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BlackItalic.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Bold.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Bold.woff
deleted file mode 100644
index c4d9824070d68..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Bold.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Bold.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Bold.woff2
deleted file mode 100644
index 70e5f00662461..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Bold.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff
deleted file mode 100644
index 94aeeee923a44..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff2
deleted file mode 100644
index 18ed561d025bf..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-BoldItalic.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff
deleted file mode 100644
index 6f50a9ee83471..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff2
deleted file mode 100644
index 4c9e0b718d94f..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBold.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff
deleted file mode 100644
index ede913914485a..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff2
deleted file mode 100644
index af7822f92a0b0..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff
deleted file mode 100644
index dc7eefc252506..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff2
deleted file mode 100644
index 5508e70a63846..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff
deleted file mode 100644
index 37c434af76526..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff2
deleted file mode 100644
index 6dcfeac7b4fe8..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Italic.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Italic.woff
deleted file mode 100644
index 4932f1e26e1af..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Italic.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Italic.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Italic.woff2
deleted file mode 100644
index dbbd89279287e..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Italic.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff
deleted file mode 100644
index 56c3defcde214..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff2
deleted file mode 100644
index f23481625b23b..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Light-BETA.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff
deleted file mode 100644
index 94ceeda8f5313..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff2
deleted file mode 100644
index a99ed19507a6c..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Medium.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Medium.woff
deleted file mode 100644
index d18a8170133a3..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Medium.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Medium.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Medium.woff2
deleted file mode 100644
index 3896022f3d1ea..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Medium.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff
deleted file mode 100644
index 863ddc75a4e62..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff2
deleted file mode 100644
index b9e43541e4fa6..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-MediumItalic.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Regular.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Regular.woff
deleted file mode 100644
index aef2367d7fd47..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Regular.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Regular.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Regular.woff2
deleted file mode 100644
index e75fb707b9d37..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Regular.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBold.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBold.woff
deleted file mode 100644
index 27e3d0b568c10..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBold.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBold.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBold.woff2
deleted file mode 100644
index f21699d9ff0f8..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBold.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff
deleted file mode 100644
index 3859942772a90..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff2
deleted file mode 100644
index 7b556d72d3b70..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff
deleted file mode 100644
index 296e229b0778e..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff2
deleted file mode 100644
index eba73d06fd399..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-Thin-BETA.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff
deleted file mode 100644
index aae25d7b57aa1..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff2
deleted file mode 100644
index df5e5f86f5304..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-italic.var.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-italic.var.woff2
deleted file mode 100644
index 7aff5c010865b..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-italic.var.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-upright.var.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-upright.var.woff2
deleted file mode 100644
index 16b6adaa660a9..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI-upright.var.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI.var.woff2 b/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI.var.woff2
deleted file mode 100644
index 132600df3a278..0000000000000
Binary files a/src/core/server/core_app/assets/fonts/inter_ui/Inter-UI.var.woff2 and /dev/null differ
diff --git a/src/core/server/core_app/assets/fonts/inter_ui/LICENSE.txt b/src/core/server/core_app/assets/fonts/inter_ui/LICENSE.txt
deleted file mode 100644
index da64fc78e7e8a..0000000000000
--- a/src/core/server/core_app/assets/fonts/inter_ui/LICENSE.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-Copyright (c) 2016-2018 The Inter UI Project Authors (me@rsms.me)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION AND CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/core/server/rendering/bootstrap/__snapshots__/render_template.test.ts.snap b/src/core/server/rendering/bootstrap/__snapshots__/render_template.test.ts.snap
index fde12088b7735..83aacda2b599a 100644
--- a/src/core/server/rendering/bootstrap/__snapshots__/render_template.test.ts.snap
+++ b/src/core/server/rendering/bootstrap/__snapshots__/render_template.test.ts.snap
@@ -33,7 +33,7 @@ function kbnBundlesLoader() {
 
 var kbnCsp = JSON.parse(document.querySelector('kbn-csp').getAttribute('data'));
 window.__kbnStrictCsp__ = kbnCsp.strictCsp;
-window.__kbnThemeTag__ = \\"v7\\";
+window.__kbnThemeTag__ = \\"v8light\\";
 window.__kbnPublicPath__ = {\\"foo\\": \\"bar\\"};
 window.__kbnBundles__ = kbnBundlesLoader();
 
diff --git a/src/core/server/rendering/bootstrap/bootstrap_renderer.test.ts b/src/core/server/rendering/bootstrap/bootstrap_renderer.test.ts
index 36551def5eef0..efa47d810c273 100644
--- a/src/core/server/rendering/bootstrap/bootstrap_renderer.test.ts
+++ b/src/core/server/rendering/bootstrap/bootstrap_renderer.test.ts
@@ -85,15 +85,12 @@ describe('bootstrapRenderer', () => {
         uiSettingsClient,
       });
 
-      expect(uiSettingsClient.get).toHaveBeenCalledTimes(2);
+      expect(uiSettingsClient.get).toHaveBeenCalledTimes(1);
       expect(uiSettingsClient.get).toHaveBeenCalledWith('theme:darkMode');
-      expect(uiSettingsClient.get).toHaveBeenCalledWith('theme:version');
     });
 
     it('calls getThemeTag with the correct parameters', async () => {
-      uiSettingsClient.get.mockImplementation((settingName) => {
-        return Promise.resolve(settingName === 'theme:darkMode' ? true : 'v8');
-      });
+      uiSettingsClient.get.mockResolvedValue(true);
 
       const request = httpServerMock.createKibanaRequest();
 
@@ -126,15 +123,12 @@ describe('bootstrapRenderer', () => {
         uiSettingsClient,
       });
 
-      expect(uiSettingsClient.get).toHaveBeenCalledTimes(2);
+      expect(uiSettingsClient.get).toHaveBeenCalledTimes(1);
       expect(uiSettingsClient.get).toHaveBeenCalledWith('theme:darkMode');
-      expect(uiSettingsClient.get).toHaveBeenCalledWith('theme:version');
     });
 
     it('calls getThemeTag with the correct parameters', async () => {
-      uiSettingsClient.get.mockImplementation((settingName) => {
-        return Promise.resolve(settingName === 'theme:darkMode' ? true : 'v8');
-      });
+      uiSettingsClient.get.mockResolvedValue(true);
 
       const request = httpServerMock.createKibanaRequest();
 
diff --git a/src/core/server/rendering/bootstrap/bootstrap_renderer.ts b/src/core/server/rendering/bootstrap/bootstrap_renderer.ts
index c1268d49d2b7d..fb4db50e2e34c 100644
--- a/src/core/server/rendering/bootstrap/bootstrap_renderer.ts
+++ b/src/core/server/rendering/bootstrap/bootstrap_renderer.ts
@@ -8,6 +8,7 @@
 
 import { createHash } from 'crypto';
 import { PackageInfo } from '@kbn/config';
+import { ThemeVersion } from '@kbn/ui-shared-deps-npm';
 import { UiPlugins } from '../../plugins';
 import { IUiSettingsClient } from '../../ui_settings';
 import { HttpAuth, KibanaRequest } from '../../http';
@@ -50,12 +51,11 @@ export const bootstrapRendererFactory: BootstrapRendererFactory = ({
 
   return async function bootstrapRenderer({ uiSettingsClient, request }) {
     let darkMode = false;
-    let themeVersion = 'v8';
+    const themeVersion: ThemeVersion = 'v8';
 
     try {
       const authenticated = isAuthenticated(request);
       darkMode = authenticated ? await uiSettingsClient.get('theme:darkMode') : false;
-      themeVersion = authenticated ? await uiSettingsClient.get('theme:version') : 'v8';
     } catch (e) {
       // just use the default values in case of connectivity issues with ES
     }
diff --git a/src/core/server/rendering/bootstrap/get_theme_tag.test.ts b/src/core/server/rendering/bootstrap/get_theme_tag.test.ts
index 6fe56d425c13d..3bc782707f5ad 100644
--- a/src/core/server/rendering/bootstrap/get_theme_tag.test.ts
+++ b/src/core/server/rendering/bootstrap/get_theme_tag.test.ts
@@ -9,22 +9,6 @@
 import { getThemeTag } from './get_theme_tag';
 
 describe('getThemeTag', () => {
-  it('returns the correct value for version:v7 and darkMode:false', () => {
-    expect(
-      getThemeTag({
-        themeVersion: 'v7',
-        darkMode: false,
-      })
-    ).toEqual('v7light');
-  });
-  it('returns the correct value for version:v7 and darkMode:true', () => {
-    expect(
-      getThemeTag({
-        themeVersion: 'v7',
-        darkMode: true,
-      })
-    ).toEqual('v7dark');
-  });
   it('returns the correct value for version:v8 and darkMode:false', () => {
     expect(
       getThemeTag({
diff --git a/src/core/server/rendering/bootstrap/get_theme_tag.ts b/src/core/server/rendering/bootstrap/get_theme_tag.ts
index f722de6f971f3..058e5dd9e1c1a 100644
--- a/src/core/server/rendering/bootstrap/get_theme_tag.ts
+++ b/src/core/server/rendering/bootstrap/get_theme_tag.ts
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+import type { ThemeVersion } from '@kbn/ui-shared-deps-npm';
+
 /**
  * Computes the themeTag that will be used on the client-side as `__kbnThemeTag__`
  * @see `packages/kbn-ui-shared-deps-src/theme.ts`
@@ -14,8 +16,8 @@ export const getThemeTag = ({
   themeVersion,
   darkMode,
 }: {
-  themeVersion: string;
+  themeVersion: ThemeVersion;
   darkMode: boolean;
 }) => {
-  return `${themeVersion === 'v7' ? 'v7' : 'v8'}${darkMode ? 'dark' : 'light'}`;
+  return `${themeVersion}${darkMode ? 'dark' : 'light'}`;
 };
diff --git a/src/core/server/rendering/bootstrap/render_template.test.ts b/src/core/server/rendering/bootstrap/render_template.test.ts
index b061e8c31065c..7aeee9c9c075b 100644
--- a/src/core/server/rendering/bootstrap/render_template.test.ts
+++ b/src/core/server/rendering/bootstrap/render_template.test.ts
@@ -10,7 +10,7 @@ import { renderTemplate } from './render_template';
 
 function mockParams() {
   return {
-    themeTag: 'v7',
+    themeTag: 'v8light',
     jsDependencyPaths: ['/js-1', '/js-2'],
     styleSheetPaths: ['/style-1', '/style-2'],
     publicPathMap: '{"foo": "bar"}',
diff --git a/src/core/server/rendering/render_utils.test.ts b/src/core/server/rendering/render_utils.test.ts
index 1eb7db5edd8df..c8ebd6de4f854 100644
--- a/src/core/server/rendering/render_utils.test.ts
+++ b/src/core/server/rendering/render_utils.test.ts
@@ -10,25 +10,6 @@ import { getStylesheetPaths } from './render_utils';
 
 describe('getStylesheetPaths', () => {
   describe('when darkMode is `true`', () => {
-    describe('when themeVersion is `v7`', () => {
-      it('returns the correct list', () => {
-        expect(
-          getStylesheetPaths({
-            darkMode: true,
-            themeVersion: 'v7',
-            basePath: '/base-path',
-            buildNum: 9000,
-          })
-        ).toMatchInlineSnapshot(`
-          Array [
-            "/base-path/9000/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v7.dark.css",
-            "/base-path/9000/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css",
-            "/base-path/node_modules/@kbn/ui-framework/dist/kui_dark.css",
-            "/base-path/ui/legacy_dark_theme.css",
-          ]
-        `);
-      });
-    });
     describe('when themeVersion is `v8`', () => {
       it('returns the correct list', () => {
         expect(
@@ -50,25 +31,6 @@ describe('getStylesheetPaths', () => {
     });
   });
   describe('when darkMode is `false`', () => {
-    describe('when themeVersion is `v7`', () => {
-      it('returns the correct list', () => {
-        expect(
-          getStylesheetPaths({
-            darkMode: false,
-            themeVersion: 'v7',
-            basePath: '/base-path',
-            buildNum: 42,
-          })
-        ).toMatchInlineSnapshot(`
-          Array [
-            "/base-path/42/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v7.light.css",
-            "/base-path/42/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css",
-            "/base-path/node_modules/@kbn/ui-framework/dist/kui_light.css",
-            "/base-path/ui/legacy_light_theme.css",
-          ]
-        `);
-      });
-    });
     describe('when themeVersion is `v8`', () => {
       it('returns the correct list', () => {
         expect(
diff --git a/src/core/server/rendering/render_utils.ts b/src/core/server/rendering/render_utils.ts
index c3d27a1aa25fe..65cedda7ad489 100644
--- a/src/core/server/rendering/render_utils.ts
+++ b/src/core/server/rendering/render_utils.ts
@@ -28,7 +28,7 @@ export const getStylesheetPaths = ({
   basePath,
   buildNum,
 }: {
-  themeVersion: string;
+  themeVersion: UiSharedDepsNpm.ThemeVersion;
   darkMode: boolean;
   buildNum: number;
   basePath: string;
@@ -37,17 +37,17 @@ export const getStylesheetPaths = ({
   return [
     ...(darkMode
       ? [
-          themeVersion === 'v7'
-            ? `${regularBundlePath}/kbn-ui-shared-deps-npm/${UiSharedDepsNpm.darkCssDistFilename}`
-            : `${regularBundlePath}/kbn-ui-shared-deps-npm/${UiSharedDepsNpm.darkV8CssDistFilename}`,
+          `${regularBundlePath}/kbn-ui-shared-deps-npm/${UiSharedDepsNpm.darkCssDistFilename(
+            themeVersion
+          )}`,
           `${regularBundlePath}/kbn-ui-shared-deps-src/${UiSharedDepsSrc.cssDistFilename}`,
           `${basePath}/node_modules/@kbn/ui-framework/dist/kui_dark.css`,
           `${basePath}/ui/legacy_dark_theme.css`,
         ]
       : [
-          themeVersion === 'v7'
-            ? `${regularBundlePath}/kbn-ui-shared-deps-npm/${UiSharedDepsNpm.lightCssDistFilename}`
-            : `${regularBundlePath}/kbn-ui-shared-deps-npm/${UiSharedDepsNpm.lightV8CssDistFilename}`,
+          `${regularBundlePath}/kbn-ui-shared-deps-npm/${UiSharedDepsNpm.lightCssDistFilename(
+            themeVersion
+          )}`,
           `${regularBundlePath}/kbn-ui-shared-deps-src/${UiSharedDepsSrc.cssDistFilename}`,
           `${basePath}/node_modules/@kbn/ui-framework/dist/kui_light.css`,
           `${basePath}/ui/legacy_light_theme.css`,
diff --git a/src/core/server/rendering/rendering_service.test.ts b/src/core/server/rendering/rendering_service.test.ts
index f75d405fe8bf9..c989e75285077 100644
--- a/src/core/server/rendering/rendering_service.test.ts
+++ b/src/core/server/rendering/rendering_service.test.ts
@@ -112,9 +112,6 @@ function renderTestCases(
         if (settingName === 'theme:darkMode') {
           return true;
         }
-        if (settingName === 'theme:version') {
-          return 'v8';
-        }
         return settingName;
       });
 
diff --git a/src/core/server/rendering/rendering_service.tsx b/src/core/server/rendering/rendering_service.tsx
index f8b99686ff557..b1c6971d3c42b 100644
--- a/src/core/server/rendering/rendering_service.tsx
+++ b/src/core/server/rendering/rendering_service.tsx
@@ -10,6 +10,7 @@ import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { take } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
+import type { ThemeVersion } from '@kbn/ui-shared-deps-npm';
 
 import { UiPlugins } from '../plugins';
 import { CoreContext } from '../core_context';
@@ -93,7 +94,7 @@ export class RenderingService {
     };
 
     const darkMode = getSettingValue('theme:darkMode', settings, Boolean);
-    const themeVersion = getSettingValue('theme:version', settings, String);
+    const themeVersion: ThemeVersion = 'v8';
 
     const stylesheetPaths = getStylesheetPaths({
       darkMode,
@@ -109,8 +110,8 @@ export class RenderingService {
       i18n: i18n.translate,
       locale: i18n.getLocale(),
       darkMode,
-      stylesheetPaths,
       themeVersion,
+      stylesheetPaths,
       injectedMetadata: {
         version: env.packageInfo.version,
         buildNumber: env.packageInfo.buildNum,
diff --git a/src/core/server/rendering/types.ts b/src/core/server/rendering/types.ts
index 8089878ccefd0..ca6bab0dff1f8 100644
--- a/src/core/server/rendering/types.ts
+++ b/src/core/server/rendering/types.ts
@@ -7,6 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import type { ThemeVersion } from '@kbn/ui-shared-deps-npm';
 
 import { EnvironmentMode, PackageInfo } from '../config';
 import { ICspConfig } from '../csp';
@@ -24,7 +25,7 @@ export interface RenderingMetadata {
   i18n: typeof i18n.translate;
   locale: string;
   darkMode: boolean;
-  themeVersion?: string;
+  themeVersion: ThemeVersion;
   stylesheetPaths: string[];
   injectedMetadata: {
     version: string;
diff --git a/src/core/server/rendering/views/fonts.tsx b/src/core/server/rendering/views/fonts.tsx
index 93de5184bb357..44030620454e7 100644
--- a/src/core/server/rendering/views/fonts.tsx
+++ b/src/core/server/rendering/views/fonts.tsx
@@ -14,7 +14,6 @@ import { RenderingMetadata } from '../types';
 
 interface Props {
   url: RenderingMetadata['uiPublicUrl'];
-  themeVersion?: string;
 }
 
 interface FontFace {
@@ -165,158 +164,6 @@ const getInter = (url: string): FontFace => {
   };
 };
 
-const getInterUi = (url: string): FontFace => {
-  return {
-    family: 'Inter UI',
-    variants: [
-      {
-        style: 'normal',
-        weight: 100,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-Thin-BETA.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-Thin-BETA.woff`,
-        ],
-      },
-      {
-        style: 'italic',
-        weight: 100,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff`,
-        ],
-      },
-      {
-        style: 'normal',
-        weight: 200,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff`,
-        ],
-      },
-      {
-        style: 'italic',
-        weight: 200,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff`,
-        ],
-      },
-      {
-        style: 'normal',
-        weight: 300,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-Light-BETA.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-Light-BETA.woff`,
-        ],
-      },
-      {
-        style: 'italic',
-        weight: 300,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff`,
-        ],
-      },
-      {
-        style: 'normal',
-        weight: 400,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-Regular.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-Regular.woff`,
-        ],
-      },
-      {
-        style: 'italic',
-        weight: 400,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-Italic.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-Italic.woff`,
-        ],
-      },
-      {
-        style: 'normal',
-        weight: 500,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-Medium.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-Medium.woff`,
-        ],
-      },
-      {
-        style: 'italic',
-        weight: 500,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-MediumItalic.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-MediumItalic.woff`,
-        ],
-      },
-      {
-        style: 'normal',
-        weight: 600,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-SemiBold.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-SemiBold.woff`,
-        ],
-      },
-      {
-        style: 'italic',
-        weight: 600,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff`,
-        ],
-      },
-      {
-        style: 'normal',
-        weight: 700,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-Bold.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-Bold.woff`,
-        ],
-      },
-      {
-        style: 'italic',
-        weight: 700,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-BoldItalic.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-BoldItalic.woff`,
-        ],
-      },
-      {
-        style: 'normal',
-        weight: 800,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-ExtraBold.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-ExtraBold.woff`,
-        ],
-      },
-      {
-        style: 'italic',
-        weight: 800,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff`,
-        ],
-      },
-      {
-        style: 'normal',
-        weight: 900,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-Black.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-Black.woff`,
-        ],
-      },
-      {
-        style: 'italic',
-        weight: 900,
-        sources: [
-          `${url}/fonts/inter_ui/Inter-UI-BlackItalic.woff2`,
-          `${url}/fonts/inter_ui/Inter-UI-BlackItalic.woff`,
-        ],
-      },
-    ],
-  };
-};
-
 const getRoboto = (url: string): FontFace => {
   return {
     family: 'Roboto Mono',
@@ -372,11 +219,8 @@ const getRoboto = (url: string): FontFace => {
   };
 };
 
-export const Fonts: FunctionComponent<Props> = ({ url, themeVersion }) => {
-  /**
-   * If `themeVersion` is not provided, we want to fallback to the newest font family `Inter`
-   */
-  const sansFont = themeVersion === 'v7' ? getInterUi(url) : getInter(url);
+export const Fonts: FunctionComponent<Props> = ({ url }) => {
+  const sansFont = getInter(url);
   const codeFont = getRoboto(url);
 
   return (
diff --git a/src/core/server/rendering/views/template.tsx b/src/core/server/rendering/views/template.tsx
index e1a9a8a8c3f1d..971a9e22e4fcc 100644
--- a/src/core/server/rendering/views/template.tsx
+++ b/src/core/server/rendering/views/template.tsx
@@ -22,7 +22,6 @@ export const Template: FunctionComponent<Props> = ({
     uiPublicUrl,
     locale,
     darkMode,
-    themeVersion,
     stylesheetPaths,
     injectedMetadata,
     i18n,
@@ -37,7 +36,7 @@ export const Template: FunctionComponent<Props> = ({
         <meta httpEquiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <meta name="viewport" content="width=device-width" />
         <title>Elastic</title>
-        <Fonts themeVersion={themeVersion} url={uiPublicUrl} />
+        <Fonts url={uiPublicUrl} />
         {/* The alternate icon is a fallback for Safari which does not yet support SVG favicons */}
         <link rel="alternate icon" type="image/png" href={`${uiPublicUrl}/favicons/favicon.png`} />
         <link rel="icon" type="image/svg+xml" href={`${uiPublicUrl}/favicons/favicon.svg`} />
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
index 599b5dca0d904..fe3d6c469726d 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
@@ -46,15 +46,6 @@ describe('KibanaMigrator', () => {
   beforeEach(() => {
     (DocumentMigrator as jest.Mock).mockClear();
   });
-  describe('constructor', () => {
-    it('coerces the current Kibana version if it has a hyphen', () => {
-      const options = mockOptions();
-      options.kibanaVersion = '3.2.1-SNAPSHOT';
-      const migrator = new KibanaMigrator(options);
-      expect(migrator.kibanaVersion).toEqual('3.2.1');
-      expect((DocumentMigrator as jest.Mock).mock.calls[0][0].kibanaVersion).toEqual('3.2.1');
-    });
-  });
   describe('getActiveMappings', () => {
     it('returns full index mappings w/ core properties', () => {
       const options = mockOptions();
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
index a812339cef07e..198983538c93d 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
@@ -88,7 +88,7 @@ export class KibanaMigrator {
     this.serializer = new SavedObjectsSerializer(this.typeRegistry);
     this.mappingProperties = mergeTypes(this.typeRegistry.getAllTypes());
     this.log = logger;
-    this.kibanaVersion = kibanaVersion.split('-')[0]; // coerce a semver-like string (x.y.z-SNAPSHOT) or prerelease version (x.y.z-alpha) to a regular semver (x.y.z);
+    this.kibanaVersion = kibanaVersion;
     this.documentMigrator = new DocumentMigrator({
       kibanaVersion: this.kibanaVersion,
       typeRegistry,
diff --git a/src/core/server/saved_objects/migrationsv2/README.md b/src/core/server/saved_objects/migrationsv2/README.md
index a6b8e01a3dc6c..60bf84eef87a6 100644
--- a/src/core/server/saved_objects/migrationsv2/README.md
+++ b/src/core/server/saved_objects/migrationsv2/README.md
@@ -90,7 +90,7 @@ able to successfully complete the migration once the cluster has enough heap.
 
 For more background information on the problem see the [saved object
 migrations
-RFC](https://github.com/elastic/kibana/blob/master/rfcs/text/0013_saved_object_migrations.md).
+RFC](https://github.com/elastic/kibana/blob/main/rfcs/text/0013_saved_object_migrations.md).
 
 # Algorithm steps
 The design goals for the algorithm was to keep downtime below 10 minutes for
diff --git a/src/core/server/saved_objects/saved_objects_service.test.mocks.ts b/src/core/server/saved_objects/saved_objects_service.test.mocks.ts
index d0ac98fa5e3c7..1faebcc5fcc97 100644
--- a/src/core/server/saved_objects/saved_objects_service.test.mocks.ts
+++ b/src/core/server/saved_objects/saved_objects_service.test.mocks.ts
@@ -25,3 +25,8 @@ export const typeRegistryInstanceMock = typeRegistryMock.create();
 jest.doMock('./saved_objects_type_registry', () => ({
   SavedObjectTypeRegistry: jest.fn().mockImplementation(() => typeRegistryInstanceMock),
 }));
+
+export const registerRoutesMock = jest.fn();
+jest.doMock('./routes', () => ({
+  registerRoutes: registerRoutesMock,
+}));
diff --git a/src/core/server/saved_objects/saved_objects_service.test.ts b/src/core/server/saved_objects/saved_objects_service.test.ts
index 7321e760273bf..a4f6c019c9624 100644
--- a/src/core/server/saved_objects/saved_objects_service.test.ts
+++ b/src/core/server/saved_objects/saved_objects_service.test.ts
@@ -6,17 +6,25 @@
  * Side Public License, v 1.
  */
 
+import { join } from 'path';
+import loadJsonFile from 'load-json-file';
+
 import {
-  migratorInstanceMock,
   clientProviderInstanceMock,
+  KibanaMigratorMock,
+  migratorInstanceMock,
+  registerRoutesMock,
   typeRegistryInstanceMock,
 } from './saved_objects_service.test.mocks';
 import { BehaviorSubject } from 'rxjs';
+import { RawPackageInfo } from '@kbn/config';
 import { ByteSizeValue } from '@kbn/config-schema';
+import { REPO_ROOT } from '@kbn/dev-utils';
 
 import { SavedObjectsService } from './saved_objects_service';
 import { mockCoreContext } from '../core_context.mock';
 import { Env } from '../config';
+import { getEnvOptions } from '../config/mocks';
 import { configServiceMock } from '../mocks';
 import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
 import { coreUsageDataServiceMock } from '../core_usage_data/core_usage_data_service.mock';
@@ -108,6 +116,42 @@ describe('SavedObjectsService', () => {
       expect(mockRegistry.registerDeprecations).toHaveBeenCalledWith(deprecations);
     });
 
+    it('registers the deprecation provider with the correct kibanaVersion', async () => {
+      const pkg = loadJsonFile.sync(join(REPO_ROOT, 'package.json')) as RawPackageInfo;
+      const kibanaVersion = pkg.version;
+
+      const coreContext = createCoreContext({
+        env: Env.createDefault(REPO_ROOT, getEnvOptions(), {
+          ...pkg,
+          version: `${kibanaVersion}-beta1`, // test behavior when release has a version qualifier
+        }),
+      });
+
+      const soService = new SavedObjectsService(coreContext);
+      await soService.setup(createSetupDeps());
+
+      expect(getSavedObjectsDeprecationsProvider).toHaveBeenCalledWith(
+        expect.objectContaining({ kibanaVersion })
+      );
+    });
+
+    it('calls registerRoutes with the correct kibanaVersion', async () => {
+      const pkg = loadJsonFile.sync(join(REPO_ROOT, 'package.json')) as RawPackageInfo;
+      const kibanaVersion = pkg.version;
+
+      const coreContext = createCoreContext({
+        env: Env.createDefault(REPO_ROOT, getEnvOptions(), {
+          ...pkg,
+          version: `${kibanaVersion}-beta1`, // test behavior when release has a version qualifier
+        }),
+      });
+
+      const soService = new SavedObjectsService(coreContext);
+      await soService.setup(createSetupDeps());
+
+      expect(registerRoutesMock).toHaveBeenCalledWith(expect.objectContaining({ kibanaVersion }));
+    });
+
     describe('#setClientFactoryProvider', () => {
       it('registers the factory to the clientProvider', async () => {
         const coreContext = createCoreContext();
@@ -218,6 +262,24 @@ describe('SavedObjectsService', () => {
       expect(migratorInstanceMock.runMigrations).not.toHaveBeenCalled();
     });
 
+    it('calls KibanaMigrator with correct version', async () => {
+      const pkg = loadJsonFile.sync(join(REPO_ROOT, 'package.json')) as RawPackageInfo;
+      const kibanaVersion = pkg.version;
+
+      const coreContext = createCoreContext({
+        env: Env.createDefault(REPO_ROOT, getEnvOptions(), {
+          ...pkg,
+          version: `${kibanaVersion}-beta1`, // test behavior when release has a version qualifier
+        }),
+      });
+
+      const soService = new SavedObjectsService(coreContext);
+      await soService.setup(createSetupDeps());
+      await soService.start(createStartDeps());
+
+      expect(KibanaMigratorMock).toHaveBeenCalledWith(expect.objectContaining({ kibanaVersion }));
+    });
+
     it('waits for all es nodes to be compatible before running migrations', async (done) => {
       expect.assertions(2);
       const coreContext = createCoreContext({ skipMigration: false });
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
index 33d75c38f4369..baa1636dde13f 100644
--- a/src/core/server/saved_objects/saved_objects_service.ts
+++ b/src/core/server/saved_objects/saved_objects_service.ts
@@ -278,6 +278,7 @@ export class SavedObjectsService
   implements CoreService<InternalSavedObjectsServiceSetup, InternalSavedObjectsServiceStart>
 {
   private logger: Logger;
+  private readonly kibanaVersion: string;
 
   private setupDeps?: SavedObjectsSetupDeps;
   private config?: SavedObjectConfig;
@@ -290,6 +291,9 @@ export class SavedObjectsService
 
   constructor(private readonly coreContext: CoreContext) {
     this.logger = coreContext.logger.get('savedobjects-service');
+    this.kibanaVersion = SavedObjectsService.stripVersionQualifier(
+      this.coreContext.env.packageInfo.version
+    );
   }
 
   public async setup(setupDeps: SavedObjectsSetupDeps): Promise<InternalSavedObjectsServiceSetup> {
@@ -312,7 +316,7 @@ export class SavedObjectsService
       getSavedObjectsDeprecationsProvider({
         kibanaIndex,
         savedObjectsConfig: this.config,
-        kibanaVersion: this.coreContext.env.packageInfo.version,
+        kibanaVersion: this.kibanaVersion,
         typeRegistry: this.typeRegistry,
       })
     );
@@ -326,7 +330,7 @@ export class SavedObjectsService
       config: this.config,
       migratorPromise: this.migrator$.pipe(first()).toPromise(),
       kibanaIndex,
-      kibanaVersion: this.coreContext.env.packageInfo.version,
+      kibanaVersion: this.kibanaVersion,
     });
 
     registerCoreObjectTypes(this.typeRegistry);
@@ -502,11 +506,19 @@ export class SavedObjectsService
     return new KibanaMigrator({
       typeRegistry: this.typeRegistry,
       logger: this.logger,
-      kibanaVersion: this.coreContext.env.packageInfo.version,
+      kibanaVersion: this.kibanaVersion,
       soMigrationsConfig,
       kibanaIndex,
       client,
       migrationsRetryDelay,
     });
   }
+
+  /**
+   * Coerce a semver-like string (x.y.z-SNAPSHOT) or prerelease version (x.y.z-alpha)
+   * to regular semver (x.y.z).
+   */
+  private static stripVersionQualifier(version: string) {
+    return version.split('-')[0];
+  }
 }
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index 383801e790c76..ab802d2f36677 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -1646,7 +1646,7 @@ export class SavedObjectsRepository {
    *
    * When using incrementCounter for collecting usage data, you need to ensure
    * that usage collection happens on a best-effort basis and doesn't
-   * negatively affect your plugin or users. See https://github.com/elastic/kibana/blob/master/src/plugins/usage_collection/README.mdx#tracking-interactions-with-incrementcounter)
+   * negatively affect your plugin or users. See https://github.com/elastic/kibana/blob/main/src/plugins/usage_collection/README.mdx#tracking-interactions-with-incrementcounter)
    *
    * @example
    * ```ts
diff --git a/src/core/server/ui_settings/saved_objects/migrations.test.ts b/src/core/server/ui_settings/saved_objects/migrations.test.ts
index 2d374b0c98424..e89811790060a 100644
--- a/src/core/server/ui_settings/saved_objects/migrations.test.ts
+++ b/src/core/server/ui_settings/saved_objects/migrations.test.ts
@@ -186,4 +186,28 @@ describe('ui_settings 8.0.0 migrations', () => {
       migrationVersion: {},
     });
   });
+  test('removes custom theme:version setting', () => {
+    const doc = {
+      type: 'config',
+      id: '8.0.0',
+      attributes: {
+        buildNum: 9007199254740991,
+        'theme:version': 'v7',
+      },
+      references: [],
+      updated_at: '2020-06-09T20:18:20.349Z',
+      migrationVersion: {},
+    };
+
+    expect(migration(doc)).toEqual({
+      type: 'config',
+      id: '8.0.0',
+      attributes: {
+        buildNum: 9007199254740991,
+      },
+      references: [],
+      updated_at: '2020-06-09T20:18:20.349Z',
+      migrationVersion: {},
+    });
+  });
 });
diff --git a/src/core/server/ui_settings/saved_objects/migrations.ts b/src/core/server/ui_settings/saved_objects/migrations.ts
index 88632923e5514..91666146655c6 100644
--- a/src/core/server/ui_settings/saved_objects/migrations.ts
+++ b/src/core/server/ui_settings/saved_objects/migrations.ts
@@ -88,6 +88,7 @@ export const migrations = {
             // owner: Team:Core
             'telemetry:optIn',
             'xPackMonitoring:allowReport',
+            'theme:version',
           ].includes(key)
             ? {
                 ...acc,
diff --git a/src/core/server/ui_settings/settings/theme.test.ts b/src/core/server/ui_settings/settings/theme.test.ts
index 58cbffb255b53..839ece4eaf8d0 100644
--- a/src/core/server/ui_settings/settings/theme.test.ts
+++ b/src/core/server/ui_settings/settings/theme.test.ts
@@ -29,72 +29,28 @@ describe('theme settings', () => {
       );
     });
   });
-
-  describe('theme:version', () => {
-    const validate = getValidationFn(themeSettings['theme:version']);
-
-    it('should only accept valid values', () => {
-      expect(() => validate('v7')).not.toThrow();
-      expect(() => validate('v8')).not.toThrow();
-      expect(() => validate('v12')).toThrowErrorMatchingInlineSnapshot(`
-"types that failed validation:
-- [0]: expected value to equal [v7]
-- [1]: expected value to equal [v8]"
-`);
-    });
-  });
 });
 
 describe('process.env.KBN_OPTIMIZER_THEMES handling', () => {
-  it('provides valid options based on tags', () => {
-    process.env.KBN_OPTIMIZER_THEMES = 'v7light,v8dark';
-    let settings = getThemeSettings({ isDist: false });
-    expect(settings['theme:version'].options).toEqual(['v7', 'v8']);
-
-    process.env.KBN_OPTIMIZER_THEMES = 'v8dark,v7light';
-    settings = getThemeSettings({ isDist: false });
-    expect(settings['theme:version'].options).toEqual(['v7', 'v8']);
-
-    process.env.KBN_OPTIMIZER_THEMES = 'v8dark,v7light,v7dark,v8light';
-    settings = getThemeSettings({ isDist: false });
-    expect(settings['theme:version'].options).toEqual(['v7', 'v8']);
-
-    process.env.KBN_OPTIMIZER_THEMES = '*';
-    settings = getThemeSettings({ isDist: false });
-    expect(settings['theme:version'].options).toEqual(['v7', 'v8']);
-
-    process.env.KBN_OPTIMIZER_THEMES = 'v7light';
-    settings = getThemeSettings({ isDist: false });
-    expect(settings['theme:version'].options).toEqual(['v7']);
-
-    process.env.KBN_OPTIMIZER_THEMES = 'v8light';
-    settings = getThemeSettings({ isDist: false });
-    expect(settings['theme:version'].options).toEqual(['v8']);
-  });
-
   it('defaults to properties of first tag', () => {
-    process.env.KBN_OPTIMIZER_THEMES = 'v8dark,v7light';
+    process.env.KBN_OPTIMIZER_THEMES = 'v8dark,v8light';
     let settings = getThemeSettings({ isDist: false });
     expect(settings['theme:darkMode'].value).toBe(true);
-    expect(settings['theme:version'].value).toBe('v8');
 
-    process.env.KBN_OPTIMIZER_THEMES = 'v7light,v8dark';
+    process.env.KBN_OPTIMIZER_THEMES = 'v8light,v8dark';
     settings = getThemeSettings({ isDist: false });
     expect(settings['theme:darkMode'].value).toBe(false);
-    expect(settings['theme:version'].value).toBe('v7');
   });
 
   it('ignores the value when isDist is undefined', () => {
-    process.env.KBN_OPTIMIZER_THEMES = 'v7light';
+    process.env.KBN_OPTIMIZER_THEMES = 'v8dark';
     const settings = getThemeSettings({ isDist: undefined });
     expect(settings['theme:darkMode'].value).toBe(false);
-    expect(settings['theme:version'].options).toEqual(['v7', 'v8']);
   });
 
   it('ignores the value when isDist is true', () => {
-    process.env.KBN_OPTIMIZER_THEMES = 'v7light';
+    process.env.KBN_OPTIMIZER_THEMES = 'v8dark';
     const settings = getThemeSettings({ isDist: true });
     expect(settings['theme:darkMode'].value).toBe(false);
-    expect(settings['theme:version'].options).toEqual(['v7', 'v8']);
   });
 });
diff --git a/src/core/server/ui_settings/settings/theme.ts b/src/core/server/ui_settings/settings/theme.ts
index 4d2c45a9c84b0..1c34314839916 100644
--- a/src/core/server/ui_settings/settings/theme.ts
+++ b/src/core/server/ui_settings/settings/theme.ts
@@ -6,19 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { schema, Type } from '@kbn/config-schema';
+import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
+import type { ThemeVersion } from '@kbn/ui-shared-deps-npm';
 import { UiSettingsParams } from '../../../types';
 
 function parseThemeTags() {
-  if (!process.env.KBN_OPTIMIZER_THEMES) {
+  if (!process.env.KBN_OPTIMIZER_THEMES || process.env.KBN_OPTIMIZER_THEMES === '*') {
     return ['v8light', 'v8dark'];
   }
 
-  if (process.env.KBN_OPTIMIZER_THEMES === '*') {
-    return ['v8light', 'v8dark', 'v7light', 'v7dark'];
-  }
-
   return process.env.KBN_OPTIMIZER_THEMES.split(',').map((t) => t.trim());
 }
 
@@ -26,16 +23,12 @@ function getThemeInfo(options: GetThemeSettingsOptions) {
   if (options?.isDist ?? true) {
     return {
       defaultDarkMode: false,
-      defaultVersion: 'v8',
-      availableVersions: ['v7', 'v8'],
     };
   }
 
   const themeTags = parseThemeTags();
   return {
     defaultDarkMode: themeTags[0].endsWith('dark'),
-    defaultVersion: themeTags[0].slice(0, 2),
-    availableVersions: ['v7', 'v8'].filter((v) => themeTags.some((t) => t.startsWith(v))),
   };
 }
 
@@ -46,9 +39,7 @@ interface GetThemeSettingsOptions {
 export const getThemeSettings = (
   options: GetThemeSettingsOptions = {}
 ): Record<string, UiSettingsParams> => {
-  const { availableVersions, defaultDarkMode, defaultVersion } = getThemeInfo(options);
-
-  const onlyOneThemeAvailable = !options?.isDist && availableVersions.length === 1;
+  const { defaultDarkMode } = getThemeInfo(options);
 
   return {
     'theme:darkMode': {
@@ -62,29 +53,17 @@ export const getThemeSettings = (
       requiresPageReload: true,
       schema: schema.boolean(),
     },
+    /**
+     * Theme is sticking around as there are still a number of places reading it and
+     * we might use it again in the future.
+     */
     'theme:version': {
       name: i18n.translate('core.ui_settings.params.themeVersionTitle', {
         defaultMessage: 'Theme version',
       }),
-      value: defaultVersion,
-      type: 'select',
-      options: availableVersions,
-      description: i18n.translate('core.ui_settings.params.themeVersionText', {
-        defaultMessage:
-          'Switch between the theme used for the current and next version of Kibana. A page refresh is required for the setting to be applied. {lessOptions}',
-        values: {
-          lessOptions: onlyOneThemeAvailable
-            ? '<br><br> There is only one theme available, set <code>KBN_OPTIMIZER_THEMES=v7light,v7dark,v8light,v8dark</code> to get more options.'
-            : undefined,
-        },
-      }),
-      requiresPageReload: true,
-      schema: schema.oneOf(availableVersions.map((v) => schema.literal(v)) as [Type<string>]),
-      optionLabels: onlyOneThemeAvailable
-        ? {
-            [availableVersions[0]]: `${availableVersions[0]} (only)`,
-          }
-        : undefined,
+      value: 'v8' as ThemeVersion,
+      readonly: true,
+      schema: schema.literal('v8'),
     },
   };
 };
diff --git a/src/dev/code_coverage/docs/team_assignment/README.md b/src/dev/code_coverage/docs/team_assignment/README.md
index f2884fb42b8d7..bef4e74415b5a 100644
--- a/src/dev/code_coverage/docs/team_assignment/README.md
+++ b/src/dev/code_coverage/docs/team_assignment/README.md
@@ -3,7 +3,7 @@
 Team assignment occurs once per ci run.
 
 The "orchestration" entry point is a [Jenkinsfile Scripted Pipeline](https://github.com/elastic/kibana/blob/f73bc48b3bbbb5ad2042c1aa267aea2150b7b742/.ci/Jenkinsfile_coverage#L21)  
-This Jenkinsfile runs a [shell script](https://github.com/elastic/kibana/blob/master/src/dev/code_coverage/shell_scripts/generate_team_assignments_and_ingest_coverage.sh#L33) that kicks everything off.  
+This Jenkinsfile runs a [shell script](https://github.com/elastic/kibana/blob/main/src/dev/code_coverage/shell_scripts/generate_team_assignments_and_ingest_coverage.sh#L33) that kicks everything off.  
 The end result is the data is ingested to our [Kibana Stats Cluster](https://kibana-stats.elastic.dev/app/dashboards#/view/58b8db70-62f9-11ea-8312-7f2d69b79843?_g=(filters%3A!()%2CrefreshInterval%3A(pause%3A!t%2Cvalue%3A0)%2Ctime%3A(from%3Anow-7d%2Cto%3Anow)))
 
 ## Team Assignment Parsing (from .github/CODEOWNERS)  
diff --git a/src/plugins/chart_expressions/expression_metric/README.md b/src/plugins/chart_expressions/expression_metric/README.md
index ec2541ebf74d8..ea49c1b1131ab 100755
--- a/src/plugins/chart_expressions/expression_metric/README.md
+++ b/src/plugins/chart_expressions/expression_metric/README.md
@@ -6,4 +6,4 @@ Expression MetricVis plugin adds a `metric` renderer and function to the express
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/src/plugins/chart_expressions/expression_tagcloud/README.md b/src/plugins/chart_expressions/expression_tagcloud/README.md
index ae7635ffe0173..2331d6bef8c29 100755
--- a/src/plugins/chart_expressions/expression_tagcloud/README.md
+++ b/src/plugins/chart_expressions/expression_tagcloud/README.md
@@ -6,4 +6,4 @@ Expression Tagcloud plugin adds a `tagcloud` renderer and function to the expres
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/src/plugins/console/README.md b/src/plugins/console/README.md
index 3bb58d37d1684..6920ae8b944cf 100644
--- a/src/plugins/console/README.md
+++ b/src/plugins/console/README.md
@@ -18,17 +18,17 @@ GET _search
 ```
 
 ## Architecture
-Console uses Ace editor that is wrapped with [`CoreEditor`](https://github.com/elastic/kibana/blob/master/src/plugins/console/public/types/core_editor.ts), so that if needed it can easily be replaced with another editor, for example Monaco.
-The autocomplete logic is located in [`autocomplete`](https://github.com/elastic/kibana/blob/master/src/plugins/console/public/lib/autocomplete) folder. Autocomplete rules are computed by classes in `components` sub-folder.
+Console uses Ace editor that is wrapped with [`CoreEditor`](https://github.com/elastic/kibana/blob/main/src/plugins/console/public/types/core_editor.ts), so that if needed it can easily be replaced with another editor, for example Monaco.
+The autocomplete logic is located in [`autocomplete`](https://github.com/elastic/kibana/blob/main/src/plugins/console/public/lib/autocomplete) folder. Autocomplete rules are computed by classes in `components` sub-folder.
 
 ## Autocomplete definitions
 Kibana users benefit greatly from autocomplete suggestions since not all Elasticsearch APIs can be provided with a corresponding UI. Autocomplete suggestions improve usability of Console for any Elasticsearch API endpoint.
 Autocomplete definitions are all created in the form of javascript objects loaded from `json` and `js` files. 
 
 ### Creating definitions
-The [`generated`](https://github.com/elastic/kibana/blob/master/src/plugins/console/server/lib/spec_definitions/json/generated) folder contains definitions created automatically from Elasticsearch REST API specifications. See this [README](https://github.com/elastic/kibana/blob/master/packages/kbn-spec-to-console/README.md) file for more information on the `spec-to-console` script. 
+The [`generated`](https://github.com/elastic/kibana/blob/main/src/plugins/console/server/lib/spec_definitions/json/generated) folder contains definitions created automatically from Elasticsearch REST API specifications. See this [README](https://github.com/elastic/kibana/blob/main/packages/kbn-spec-to-console/README.md) file for more information on the `spec-to-console` script. 
 
-Manually created override files in the [`overrides`](https://github.com/elastic/kibana/blob/master/src/plugins/console/server/lib/spec_definitions/json/overrides) folder contain fixes for generated files and additions for request body parameters.   
+Manually created override files in the [`overrides`](https://github.com/elastic/kibana/blob/main/src/plugins/console/server/lib/spec_definitions/json/overrides) folder contain fixes for generated files and additions for request body parameters.   
 
 ### Top level keys
 Use following top level keys in the definitions objects.
@@ -214,7 +214,7 @@ Use this type to copy a configuration object specified in a different endpoint d
 }
 ```
 #### Global scope (`GLOBAL`)
-Use `GLOBAL` keyword with `__scope_link` to refer to a reusable set of definitions created in the [`globals`](https://github.com/elastic/kibana/blob/master/src/plugins/console/server/lib/spec_definitions/js/globals.ts) file.
+Use `GLOBAL` keyword with `__scope_link` to refer to a reusable set of definitions created in the [`globals`](https://github.com/elastic/kibana/blob/main/src/plugins/console/server/lib/spec_definitions/js/globals.ts) file.
 For example: 
 ```json
 {
@@ -226,11 +226,11 @@ For example:
 }
 ```
 #### Conditional definition (`__condition: { lines_regex: ... }`)
-To provide a different set of autocomplete suggestions based on the value configured in the request. For example, when creating a snapshot repository of different types (`fs`, `url` etc) different properties are displayed in the suggestions list based on the type. See [snapshot.create_repository.json](https://github.com/elastic/kibana/blob/master/src/plugins/console/server/lib/spec_definitions/json/overrides/snapshot.create_repository.json) for an example.
+To provide a different set of autocomplete suggestions based on the value configured in the request. For example, when creating a snapshot repository of different types (`fs`, `url` etc) different properties are displayed in the suggestions list based on the type. See [snapshot.create_repository.json](https://github.com/elastic/kibana/blob/main/src/plugins/console/server/lib/spec_definitions/json/overrides/snapshot.create_repository.json) for an example.
 
 
 ### Variables
 Some autocomplete definitions need to be configured with dynamic values that can't be hard coded into a json or js file, for example a list of indices in the cluster. 
-A list of variables is defined in the  `parametrizedComponentFactories` function in [`kb.js`](https://github.com/elastic/kibana/blob/master/src/plugins/console/public/lib/kb/kb.js) file. The values of these variables are assigned dynamically for every cluster. 
+A list of variables is defined in the  `parametrizedComponentFactories` function in [`kb.js`](https://github.com/elastic/kibana/blob/main/src/plugins/console/public/lib/kb/kb.js) file. The values of these variables are assigned dynamically for every cluster. 
 Use these variables with curly braces, for example `{indices}`, `{types}`, `{id}`, `{username}`, `{template}`, `{nodes}` etc.
 
diff --git a/src/plugins/custom_integrations/README.md b/src/plugins/custom_integrations/README.md
index e7af518e21ec1..a94c7fc97a970 100755
--- a/src/plugins/custom_integrations/README.md
+++ b/src/plugins/custom_integrations/README.md
@@ -6,4 +6,4 @@ Register add-data cards
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/src/plugins/custom_integrations/storybook/manager.ts b/src/plugins/custom_integrations/storybook/manager.ts
index 99c01efdddfdc..0b4454798d4e6 100644
--- a/src/plugins/custom_integrations/storybook/manager.ts
+++ b/src/plugins/custom_integrations/storybook/manager.ts
@@ -14,7 +14,7 @@ addons.setConfig({
   theme: create({
     base: 'light',
     brandTitle: 'Kibana Custom Integrations Storybook',
-    brandUrl: 'https://github.com/elastic/kibana/tree/master/src/plugins/custom_integrations',
+    brandUrl: 'https://github.com/elastic/kibana/tree/main/src/plugins/custom_integrations',
   }),
   showPanel: true.valueOf,
   selectedPanel: PANEL_ID,
diff --git a/src/plugins/data/public/ui/query_string_input/_query_bar.scss b/src/plugins/data/public/ui/query_string_input/_query_bar.scss
index 479414c458466..f8c2f067d9ec5 100644
--- a/src/plugins/data/public/ui/query_string_input/_query_bar.scss
+++ b/src/plugins/data/public/ui/query_string_input/_query_bar.scss
@@ -14,19 +14,17 @@
   display: flex;
   flex: 1 1 100%;
   position: relative;
+  background-color: $euiFormBackgroundColor;
+  border-radius: $euiFormControlBorderRadius;
 
-  @include kbnThemeStyle('v8') {
-    background-color: $euiFormBackgroundColor;
-    border-radius: $euiFormControlBorderRadius;
+  &.kbnQueryBar__textareaWrap--hasPrepend {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
 
-    &.kbnQueryBar__textareaWrap--hasPrepend {
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
-    &.kbnQueryBar__textareaWrap--hasAppend {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-    }
+  &.kbnQueryBar__textareaWrap--hasAppend {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
   }
 }
 
@@ -39,24 +37,17 @@
   // shadow to line up correctly.
   padding: $euiSizeS;
   box-shadow: 0 0 0 1px $euiFormBorderColor;
+  padding-bottom: $euiSizeS + 1px;
+  // Firefox adds margin to textarea
+  margin: 0;
 
-  @include kbnThemeStyle('v7') {
-    padding-top: $euiSizeS + 2px;
+  &.kbnQueryBar__textarea--hasPrepend {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
   }
-
-  @include kbnThemeStyle('v8') {
-    padding-bottom: $euiSizeS + 1px;
-    // Firefox adds margin to textarea
-    margin: 0;
-
-    &.kbnQueryBar__textarea--hasPrepend {
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
-    &.kbnQueryBar__textarea--hasAppend {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-    }
+  &.kbnQueryBar__textarea--hasAppend {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
   }
 
   &:not(.kbnQueryBar__textarea--autoHeight):not(:invalid) {
diff --git a/src/plugins/embeddable/README.asciidoc b/src/plugins/embeddable/README.asciidoc
index 5dd74393e0dc1..a5b54fabc7af1 100644
--- a/src/plugins/embeddable/README.asciidoc
+++ b/src/plugins/embeddable/README.asciidoc
@@ -9,7 +9,7 @@ Containers are a special type of embeddable that can contain nested embeddables.
 
 === Examples
 
-Multiple embeddable examples are implemented and registered https://github.com/elastic/kibana/tree/master/examples/embeddable_examples[here]. They can be played around with and explored https://github.com/elastic/kibana/tree/master/examples/embeddable_explorer[in the Embeddable Explorer example plugin]. Just run kibana with
+Multiple embeddable examples are implemented and registered https://github.com/elastic/kibana/tree/main/examples/embeddable_examples[here]. They can be played around with and explored https://github.com/elastic/kibana/tree/main/examples/embeddable_explorer[in the Embeddable Explorer example plugin]. Just run kibana with
 
 [source,sh]
 --
@@ -18,20 +18,20 @@ yarn start --run-examples
 
 and navigate to the Embeddable explorer app.
 
-There is also an example of rendering dashboard container outside of dashboard app https://github.com/elastic/kibana/tree/master/examples/dashboard_embeddable_examples[here].
+There is also an example of rendering dashboard container outside of dashboard app https://github.com/elastic/kibana/tree/main/examples/dashboard_embeddable_examples[here].
 
 === Docs
 
-link:https://github.com/elastic/kibana/blob/master/src/plugins/embeddable/docs/README.md[Embeddable docs, guides & caveats]
+link:https://github.com/elastic/kibana/blob/main/src/plugins/embeddable/docs/README.md[Embeddable docs, guides & caveats]
 
 === API docs
 
 ==== Browser API
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablesetup.md[Browser Setup contract]
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablestart.md[Browser Start contract]
+https://github.com/elastic/kibana/blob/main/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablesetup.md[Browser Setup contract]
+https://github.com/elastic/kibana/blob/main/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablestart.md[Browser Start contract]
 
 ==== Server API
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/embeddable/server/kibana-plugin-plugins-embeddable-server.embeddablesetup.md[Server Setup contract]
+https://github.com/elastic/kibana/blob/main/docs/development/plugins/embeddable/server/kibana-plugin-plugins-embeddable-server.embeddablesetup.md[Server Setup contract]
 
 === Testing
 
diff --git a/src/plugins/expression_error/README.md b/src/plugins/expression_error/README.md
index 5e22d8fc652c7..1f53f9a560164 100755
--- a/src/plugins/expression_error/README.md
+++ b/src/plugins/expression_error/README.md
@@ -6,4 +6,4 @@ Expression Error plugin adds an `error` renderer to the expression plugin. The r
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/src/plugins/expression_image/README.md b/src/plugins/expression_image/README.md
index b02c9fd39b3d2..9171510bb6ea2 100755
--- a/src/plugins/expression_image/README.md
+++ b/src/plugins/expression_image/README.md
@@ -6,4 +6,4 @@ Expression Image plugin adds an `image` renderer to the expression plugin. The r
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/src/plugins/expression_metric/README.md b/src/plugins/expression_metric/README.md
index ae02ebd51256e..e186c86b6c8b8 100755
--- a/src/plugins/expression_metric/README.md
+++ b/src/plugins/expression_metric/README.md
@@ -6,4 +6,4 @@ Expression Metric plugin adds a `metric` renderer and function to the expression
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/src/plugins/expression_repeat_image/README.md b/src/plugins/expression_repeat_image/README.md
index 11f4f9847c39a..bfcb787db8fe2 100755
--- a/src/plugins/expression_repeat_image/README.md
+++ b/src/plugins/expression_repeat_image/README.md
@@ -6,4 +6,4 @@ Expression Repeat Image plugin adds a `repeatImage` function to the expression p
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/src/plugins/expression_reveal_image/README.md b/src/plugins/expression_reveal_image/README.md
index 21c27a6eee05b..78212a9bc2026 100755
--- a/src/plugins/expression_reveal_image/README.md
+++ b/src/plugins/expression_reveal_image/README.md
@@ -6,4 +6,4 @@ Expression Reveal Image plugin adds a `revealImage` function to the expression p
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/src/plugins/expression_shape/README.md b/src/plugins/expression_shape/README.md
index a7e86b6524275..35350077b786b 100755
--- a/src/plugins/expression_shape/README.md
+++ b/src/plugins/expression_shape/README.md
@@ -6,4 +6,4 @@ Expression Shape plugin adds a `shape` function to the expression plugin and an
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/src/plugins/expressions/README.asciidoc b/src/plugins/expressions/README.asciidoc
index 554e3bfcb6976..a1462fd635d92 100644
--- a/src/plugins/expressions/README.asciidoc
+++ b/src/plugins/expressions/README.asciidoc
@@ -43,12 +43,12 @@ image::https://user-images.githubusercontent.com/9773803/74162514-3250a880-4c21-
 === API documentation
 
 ==== Server API
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionsserversetup.md[Server Setup contract]
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionsserverstart.md[Server Start contract]
+https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionsserversetup.md[Server Setup contract]
+https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.expressionsserverstart.md[Server Start contract]
 
 ==== Browser API
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservicesetup.md[Browser Setup contract]
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsstart.md[Browser Start contract]
+https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsservicesetup.md[Browser Setup contract]
+https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionsstart.md[Browser Start contract]
 
 
 ==== Other documentation
diff --git a/src/plugins/kibana_overview/README.md b/src/plugins/kibana_overview/README.md
index ad0cbfdf7013b..4681a3453fecd 100644
--- a/src/plugins/kibana_overview/README.md
+++ b/src/plugins/kibana_overview/README.md
@@ -6,4 +6,4 @@
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/src/plugins/kibana_react/public/toolbar_button/toolbar_button.scss b/src/plugins/kibana_react/public/toolbar_button/toolbar_button.scss
index 0b5152bd99bbf..f5cc1e53f24f9 100644
--- a/src/plugins/kibana_react/public/toolbar_button/toolbar_button.scss
+++ b/src/plugins/kibana_react/public/toolbar_button/toolbar_button.scss
@@ -5,10 +5,8 @@
   // todo: once issue https://github.com/elastic/eui/issues/4730 is merged, this code might be safe to remove
   // Some toolbar buttons are just icons, but EuiButton comes with margin and min-width that need to be removed
   min-width: 0;
-  @include kbnThemeStyle('v8') {
-    border-width: $euiBorderWidthThin;
-    border-style: solid;
-  }
+  border-width: $euiBorderWidthThin;
+  border-style: solid;
 
   &[class*='--text'] {
     // Lighten the border color for all states
diff --git a/src/plugins/kibana_utils/common/state_containers/README.md b/src/plugins/kibana_utils/common/state_containers/README.md
index c623e8b306438..1e9f60e41c729 100644
--- a/src/plugins/kibana_utils/common/state_containers/README.md
+++ b/src/plugins/kibana_utils/common/state_containers/README.md
@@ -1,2 +1,2 @@
 * [docs](../../docs/state_containers)
-* [api reference](https://github.com/elastic/kibana/tree/master/src/plugins/kibana_utils/docs/state_containers)
\ No newline at end of file
+* [api reference](https://github.com/elastic/kibana/tree/main/src/plugins/kibana_utils/docs/state_containers)
\ No newline at end of file
diff --git a/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts b/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts
index 841cf8b87a565..7de28363c970d 100644
--- a/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts
+++ b/src/plugins/kibana_utils/common/state_containers/create_state_container_react_helpers.ts
@@ -63,7 +63,7 @@ export const useContainerSelector = <Container extends StateContainer<any, any>,
 
 /**
  * Creates helpers for using {@link StateContainer | State Containers} with react
- * Refer to {@link https://github.com/elastic/kibana/blob/master/src/plugins/kibana_utils/docs/state_containers/react.md | guide} for details
+ * Refer to {@link https://github.com/elastic/kibana/blob/main/src/plugins/kibana_utils/docs/state_containers/react.md | guide} for details
  * @public
  */
 export const createStateContainerReactHelpers = <Container extends StateContainer<any, any>>() => {
diff --git a/src/plugins/kibana_utils/common/state_containers/index.ts b/src/plugins/kibana_utils/common/state_containers/index.ts
index 34032147cc171..c96b48cc045b7 100644
--- a/src/plugins/kibana_utils/common/state_containers/index.ts
+++ b/src/plugins/kibana_utils/common/state_containers/index.ts
@@ -8,7 +8,7 @@
 
 /**
  * State containers are Redux-store-like objects meant to help you manage state in your services or apps.
- * Refer to {@link https://github.com/elastic/kibana/tree/master/src/plugins/kibana_utils/docs/state_containers | guides and examples} for more info
+ * Refer to {@link https://github.com/elastic/kibana/tree/main/src/plugins/kibana_utils/docs/state_containers | guides and examples} for more info
  *
  * @packageDocumentation
  */
diff --git a/src/plugins/kibana_utils/public/state_sync/README.md b/src/plugins/kibana_utils/public/state_sync/README.md
index eb5f6e60958fc..5003246c12857 100644
--- a/src/plugins/kibana_utils/public/state_sync/README.md
+++ b/src/plugins/kibana_utils/public/state_sync/README.md
@@ -1,3 +1,3 @@
 - [docs](../../docs/state_sync)
 - [demo plugins](../../../../../examples/state_containers_examples): run Kibana with `--run-examples` flag.
-- [api reference](https://github.com/elastic/kibana/tree/master/src/plugins/kibana_utils/docs/state_sync)
+- [api reference](https://github.com/elastic/kibana/tree/main/src/plugins/kibana_utils/docs/state_sync)
diff --git a/src/plugins/kibana_utils/public/state_sync/index.ts b/src/plugins/kibana_utils/public/state_sync/index.ts
index 28a774bf341bf..2e14096c23950 100644
--- a/src/plugins/kibana_utils/public/state_sync/index.ts
+++ b/src/plugins/kibana_utils/public/state_sync/index.ts
@@ -10,7 +10,7 @@
  * State syncing utilities are a set of helpers for syncing your application state
  * with browser URL or browser storage.
  *
- * They are designed to work together with {@link https://github.com/elastic/kibana/tree/master/src/plugins/kibana_utils/docs/state_containers | state containers}. But state containers are not required.
+ * They are designed to work together with {@link https://github.com/elastic/kibana/tree/main/src/plugins/kibana_utils/docs/state_containers | state containers}. But state containers are not required.
  *
  * State syncing utilities include:
  *
@@ -22,7 +22,7 @@
  * Listens for state updates in the URL and pushes them back to state.
  *   * {@link ISessionStorageStateStorage} - Serializes state and persists it to browser storage.
  *
- * Refer {@link https://github.com/elastic/kibana/tree/master/src/plugins/kibana_utils/docs/state_sync | here} for a complete guide and examples.
+ * Refer {@link https://github.com/elastic/kibana/tree/main/src/plugins/kibana_utils/docs/state_sync | here} for a complete guide and examples.
  * @packageDocumentation
  */
 
diff --git a/src/plugins/kibana_utils/public/state_sync/state_sync.ts b/src/plugins/kibana_utils/public/state_sync/state_sync.ts
index 8cfe0fe0fe967..2c3141e76d712 100644
--- a/src/plugins/kibana_utils/public/state_sync/state_sync.ts
+++ b/src/plugins/kibana_utils/public/state_sync/state_sync.ts
@@ -42,7 +42,7 @@ export interface ISyncStateRef<StateStorage extends IStateStorage = IStateStorag
  * Utility for syncing application state wrapped in state container
  * with some kind of storage (e.g. URL)
  *
- * Go {@link https://github.com/elastic/kibana/tree/master/src/plugins/kibana_utils/docs/state_sync | here} for a complete guide and examples.
+ * Go {@link https://github.com/elastic/kibana/tree/main/src/plugins/kibana_utils/docs/state_sync | here} for a complete guide and examples.
  *
  * @example
  *
diff --git a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts
index 9a32999ad35c2..97f048ea0d916 100644
--- a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts
+++ b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts
@@ -27,7 +27,7 @@ import {
  * 3. Takes care of listening to the URL updates and notifies state about the updates.
  * 4. Takes care of batching URL updates to prevent redundant browser history records.
  *
- * {@link https://github.com/elastic/kibana/blob/master/src/plugins/kibana_utils/docs/state_sync/storages/kbn_url_storage.md | Refer to this guide for more info}
+ * {@link https://github.com/elastic/kibana/blob/main/src/plugins/kibana_utils/docs/state_sync/storages/kbn_url_storage.md | Refer to this guide for more info}
  * @public
  */
 export interface IKbnUrlStateStorage extends IStateStorage {
diff --git a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_session_storage_state_storage.ts b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_session_storage_state_storage.ts
index 53fb267b0cb0a..e3d300bc3bc1c 100644
--- a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_session_storage_state_storage.ts
+++ b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_session_storage_state_storage.ts
@@ -10,7 +10,7 @@ import { IStateStorage } from './types';
 
 /**
  * {@link IStateStorage} for storing state in browser {@link Storage}
- * {@link https://github.com/elastic/kibana/blob/master/src/plugins/kibana_utils/docs/state_sync/storages/session_storage.md | guide}
+ * {@link https://github.com/elastic/kibana/blob/main/src/plugins/kibana_utils/docs/state_sync/storages/session_storage.md | guide}
  * @public
  */
 export interface ISessionStorageStateStorage extends IStateStorage {
@@ -20,7 +20,7 @@ export interface ISessionStorageStateStorage extends IStateStorage {
 
 /**
  * Creates {@link ISessionStorageStateStorage}
- * {@link https://github.com/elastic/kibana/blob/master/src/plugins/kibana_utils/docs/state_sync/storages/session_storage.md | guide}
+ * {@link https://github.com/elastic/kibana/blob/main/src/plugins/kibana_utils/docs/state_sync/storages/session_storage.md | guide}
  * @param storage - Option {@link Storage} to use for storing state. By default window.sessionStorage.
  * @returns - {@link ISessionStorageStateStorage}
  * @public
diff --git a/src/plugins/navigation/public/top_nav_menu/_index.scss b/src/plugins/navigation/public/top_nav_menu/_index.scss
index 9af1bb5434bb1..c0d5ee5a7593d 100644
--- a/src/plugins/navigation/public/top_nav_menu/_index.scss
+++ b/src/plugins/navigation/public/top_nav_menu/_index.scss
@@ -1,12 +1,6 @@
 .kbnTopNavMenu {
-  @include kbnThemeStyle('v7') {
-    margin-right: $euiSizeXS;
-  }
-
-  @include kbnThemeStyle('v8') {
-    button:last-child {
-      margin-right: 0;
-    }
+  button:last-child {
+    margin-right: 0;
   }
 }
 
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_component.tsx b/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_component.tsx
index 16ae4c1858660..22b97b6f6b0da 100644
--- a/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_component.tsx
+++ b/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_component.tsx
@@ -108,11 +108,15 @@ export const ControlGroup = () => {
     return null;
   }
 
+  let panelBg: 'subdued' | 'primary' | 'success' = 'subdued';
+  if (emptyState) panelBg = 'primary';
+  if (draggingId) panelBg = 'success';
+
   return (
     <EuiPanel
       borderRadius="m"
-      color={emptyState ? 'subdued' : undefined}
-      paddingSize={emptyState ? 'none' : 's'}
+      color={panelBg}
+      paddingSize={emptyState ? 's' : 'none'}
       className={classNames('controlsWrapper', {
         'controlsWrapper--empty': emptyState,
         'controlsWrapper--twoLine': controlStyle === 'twoLine',
@@ -141,7 +145,7 @@ export const ControlGroup = () => {
                 <EuiFlexGroup
                   className={classNames('controlGroup', { 'controlGroup-isDragging': draggingId })}
                   alignItems="center"
-                  gutterSize={'m'}
+                  gutterSize="s"
                   wrap={true}
                 >
                   {idsInOrder.map(
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_sortable_item.tsx b/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_sortable_item.tsx
index 3ec553e5aa7d1..0ef9c4b7f115a 100644
--- a/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_sortable_item.tsx
+++ b/src/plugins/presentation_util/public/components/controls/control_group/component/control_group_sortable_item.tsx
@@ -116,11 +116,15 @@ export const ControlClone = ({ draggingId }: { draggingId: string }) => {
       })}
     >
       {controlStyle === 'twoLine' ? <EuiFormLabel>{title}</EuiFormLabel> : undefined}
-      <EuiFlexGroup gutterSize="none" className={'controlFrame__draggable'}>
+      <EuiFlexGroup responsive={false} gutterSize="none" className={'controlFrame__draggable'}>
         <EuiFlexItem grow={false}>
           <EuiIcon type="grabHorizontal" className="controlFrame__dragHandle" />
         </EuiFlexItem>
-        {controlStyle === 'oneLine' ? <EuiFlexItem>{title}</EuiFlexItem> : undefined}
+        {controlStyle === 'oneLine' ? (
+          <EuiFlexItem>
+            <label className="controlFrameCloneWrapper__label">{title}</label>
+          </EuiFlexItem>
+        ) : undefined}
       </EuiFlexGroup>
     </EuiFlexItem>
   );
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/control_group.scss b/src/plugins/presentation_util/public/components/controls/control_group/control_group.scss
index c69674df29616..e595bc245e31d 100644
--- a/src/plugins/presentation_util/public/components/controls/control_group/control_group.scss
+++ b/src/plugins/presentation_util/public/components/controls/control_group/control_group.scss
@@ -4,7 +4,6 @@ $largeControl: $euiSize * 50;
 $controlMinWidth: $euiSize * 14;
 
 .controlGroup {
-  overflow-x: clip; // sometimes when using auto width, removing a control can cause a horizontal scrollbar to appear.
   min-height: $euiSize * 4;
 }
 
@@ -40,10 +39,6 @@ $controlMinWidth: $euiSize * 14;
 .controlFrameCloneWrapper {
   width: max-content;
 
-  .euiFormLabel {
-    padding-bottom: $euiSizeXS;
-  }
-
   &--small {
     width: $smallControl;
   }
@@ -60,7 +55,7 @@ $controlMinWidth: $euiSize * 14;
     margin-top: -$euiSize * 1.25;
   }
 
-  .euiFormLabel, div {
+  &__label {
     cursor: grabbing !important; // prevents cursor flickering while dragging the clone
   }
 
@@ -69,20 +64,14 @@ $controlMinWidth: $euiSize * 14;
     height: $euiButtonHeight;
     align-items: center;
     border-radius: $euiBorderRadius;
-    @include euiFontSizeS;
     font-weight: $euiFontWeightSemiBold;
     @include euiFormControlDefaultShadow;
     background-color: $euiFormInputGroupLabelBackground;
     min-width: $controlMinWidth;
+    @include euiFontSizeXS;
   }
 
   .controlFrame__formControlLayout, .controlFrame__draggable {
-    &-clone {
-      box-shadow: 0 0 0 1px $euiShadowColor,
-        0 1px 6px 0 $euiShadowColor;
-      cursor: grabbing !important;
-    }
-
     .controlFrame__dragHandle {
       cursor: grabbing;
     }
@@ -92,7 +81,6 @@ $controlMinWidth: $euiSize * 14;
 .controlFrameWrapper {
   flex-basis: auto;
   position: relative;
-  display: block;
 
   .controlFrame__formControlLayout {
     width: 100%;
@@ -102,6 +90,7 @@ $controlMinWidth: $euiSize * 14;
     &Label {
       @include euiTextTruncate;
       max-width: 50%;
+      border-radius: $euiBorderRadius;
     }
 
     &:not(.controlFrame__formControlLayout-clone) {
@@ -148,19 +137,20 @@ $controlMinWidth: $euiSize * 14;
       border-radius: $euiBorderRadius;
       top: 0;
       bottom: 0;
-      width: 2px;
+      width: $euiSizeXS * .5;
     }
   }
 
   &--insertBefore {
     .controlFrame__formControlLayout:after {
-      left: -$euiSizeS;
+      left: -$euiSizeXS - 1;
+
     }
   }
 
   &--insertAfter {
     .controlFrame__formControlLayout:after {
-      right: -$euiSizeS;
+      right: -$euiSizeXS - 1;
     }
   }
 
@@ -202,7 +192,7 @@ $controlMinWidth: $euiSize * 14;
       opacity: 0;
     }
     .controlFrame__formControlLayout {
-      background-color: $euiColorEmptyShade !important;
+      background-color: tintOrShade($euiColorSuccess, 90%, 70%);
       color: transparent !important;
       box-shadow: none;
 
diff --git a/src/plugins/presentation_util/public/components/controls/control_group/editor/control_editor.tsx b/src/plugins/presentation_util/public/components/controls/control_group/editor/control_editor.tsx
index 0fdcba570c941..c31a8397fa233 100644
--- a/src/plugins/presentation_util/public/components/controls/control_group/editor/control_editor.tsx
+++ b/src/plugins/presentation_util/public/components/controls/control_group/editor/control_editor.tsx
@@ -88,19 +88,6 @@ export const ControlEditor = ({
       </EuiFlyoutHeader>
       <EuiFlyoutBody>
         <EuiForm>
-          <EuiFormRow label={ControlGroupStrings.manageControl.getWidthInputTitle()}>
-            <EuiButtonGroup
-              color="primary"
-              legend={ControlGroupStrings.management.controlWidth.getWidthSwitchLegend()}
-              options={CONTROL_WIDTH_OPTIONS}
-              idSelected={currentWidth}
-              onChange={(newWidth: string) => {
-                setCurrentWidth(newWidth as ControlWidth);
-                updateWidth(newWidth as ControlWidth);
-              }}
-            />
-          </EuiFormRow>
-
           <EuiSpacer size="l" />
           {ControlTypeEditor && (
             <ControlTypeEditor
@@ -126,6 +113,18 @@ export const ControlEditor = ({
               }}
             />
           </EuiFormRow>
+          <EuiFormRow label={ControlGroupStrings.manageControl.getWidthInputTitle()}>
+            <EuiButtonGroup
+              color="primary"
+              legend={ControlGroupStrings.management.controlWidth.getWidthSwitchLegend()}
+              options={CONTROL_WIDTH_OPTIONS}
+              idSelected={currentWidth}
+              onChange={(newWidth: string) => {
+                setCurrentWidth(newWidth as ControlWidth);
+                updateWidth(newWidth as ControlWidth);
+              }}
+            />
+          </EuiFormRow>
           <EuiSpacer size="l" />
           {removeControl && (
             <EuiButtonEmpty
diff --git a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list.scss b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list.scss
index e9a4ef215733e..51ad9dc6610a8 100644
--- a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list.scss
+++ b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list.scss
@@ -1,13 +1,13 @@
-.optionsList--anchorOverride {
+.optionsList__anchorOverride {
   display:block;
 }
 
-.optionsList--popoverOverride {
+.optionsList__popoverOverride {
   width: 100%;
   height: 100%;
 }
 
-.optionsList--items {
+.optionsList__items {
   @include euiScrollBar;
 
   overflow-y: auto;
@@ -16,15 +16,18 @@
   max-width: 100%;
 }
 
+.optionsList__actions {
+  padding: $euiSizeS;
+  border-bottom: $euiBorderThin;
+  border-color: darken($euiColorLightestShade, 2%);
+}
+
 .optionsList--filterBtn {
   .euiFilterButton__text-hasNotification {
     flex-grow: 1;
     justify-content: space-between;
     width: 0;
   }
-  &.optionsList--filterBtnSingle {
-    width: 100%;
-  }
   &.optionsList--filterBtnPlaceholder {
     .euiFilterButton__textShift {
       color: $euiTextSubduedColor;
diff --git a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_component.tsx b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_component.tsx
index 9c8af47a1f598..43026a67eb946 100644
--- a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_component.tsx
+++ b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_component.tsx
@@ -108,8 +108,8 @@ export const OptionsListComponent = ({
       <EuiPopover
         button={button}
         isOpen={isPopoverOpen}
-        className="optionsList--popoverOverride"
-        anchorClassName="optionsList--anchorOverride"
+        className="optionsList__popoverOverride"
+        anchorClassName="optionsList__anchorOverride"
         closePopover={() => setIsPopoverOpen(false)}
         panelPaddingSize="none"
         anchorPosition="downCenter"
diff --git a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_editor.tsx b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_editor.tsx
index 86623980cfc41..86f4f85b3b0b2 100644
--- a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_editor.tsx
+++ b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_editor.tsx
@@ -70,7 +70,7 @@ export const OptionsListEditor = ({
   const { dataView, fieldName } = state;
   return (
     <>
-      <EuiFormRow fullWidth label={OptionsListStrings.editor.getIndexPatternTitle()}>
+      <EuiFormRow fullWidth label={OptionsListStrings.editor.getDataViewTitle()}>
         <DataViewPicker
           dataViews={state.dataViewListItems}
           selectedDataViewId={dataView?.id}
diff --git a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_popover_component.tsx b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_popover_component.tsx
index eb9829cd78840..90f92e30c32c9 100644
--- a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_popover_component.tsx
+++ b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_popover_component.tsx
@@ -45,7 +45,7 @@ export const OptionsListPopover = ({
   } = useReduxEmbeddableContext<OptionsListEmbeddableInput, typeof optionsListReducers>();
 
   const dispatch = useEmbeddableDispatch();
-  const { selectedOptions, singleSelect } = useEmbeddableSelector((state) => state);
+  const { selectedOptions, singleSelect, title } = useEmbeddableSelector((state) => state);
 
   // track selectedOptions in a set for more efficient lookup
   const selectedOptionsSet = useMemo(() => new Set<string>(selectedOptions), [selectedOptions]);
@@ -53,7 +53,8 @@ export const OptionsListPopover = ({
 
   return (
     <>
-      <EuiPopoverTitle paddingSize="s">
+      <EuiPopoverTitle paddingSize="s">{title}</EuiPopoverTitle>
+      <div className="optionsList__actions">
         <EuiFormRow>
           <EuiFlexGroup gutterSize="xs" direction="row" justifyContent="spaceBetween">
             <EuiFlexItem>
@@ -100,9 +101,8 @@ export const OptionsListPopover = ({
             </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFormRow>
-      </EuiPopoverTitle>
-
-      <div className="optionsList--items">
+      </div>
+      <div className="optionsList__items">
         {!showOnlySelected && (
           <>
             {availableOptions?.map((availableOption, index) => (
diff --git a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_strings.ts b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_strings.ts
index 52b5dc6d44910..dee0d4e7e1807 100644
--- a/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_strings.ts
+++ b/src/plugins/presentation_util/public/components/controls/control_types/options_list/options_list_strings.ts
@@ -24,6 +24,10 @@ export const OptionsListStrings = {
       i18n.translate('presentationUtil.controls.optionsList.editor.indexPatternTitle', {
         defaultMessage: 'Index pattern',
       }),
+    getDataViewTitle: () =>
+      i18n.translate('presentationUtil.controls.optionsList.editor.dataViewTitle', {
+        defaultMessage: 'Data view',
+      }),
     getNoDataViewTitle: () =>
       i18n.translate('presentationUtil.controls.optionsList.editor.noDataViewTitle', {
         defaultMessage: 'Select data view',
diff --git a/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx b/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx
index 237a9666deb30..7b285944840c8 100644
--- a/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx
+++ b/src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.tsx
@@ -67,7 +67,7 @@ export function DataViewPicker({
         panelPaddingSize="s"
         ownFocus
       >
-        <div>
+        <div style={{ width: 368 }}>
           <EuiPopoverTitle>
             {i18n.translate('presentationUtil.dataViewPicker.changeDataViewTitle', {
               defaultMessage: 'Data view',
diff --git a/src/plugins/presentation_util/public/components/field_picker/field_picker.scss b/src/plugins/presentation_util/public/components/field_picker/field_picker.scss
index eac1979fd003a..a06c469e713bf 100644
--- a/src/plugins/presentation_util/public/components/field_picker/field_picker.scss
+++ b/src/plugins/presentation_util/public/components/field_picker/field_picker.scss
@@ -1,7 +1,5 @@
 .presFieldPicker__fieldButton {
-  box-shadow: 0 .8px .8px rgba(0,0,0,.04),0 2.3px 2px rgba(0,0,0,.03);
-  background: #FFF;
-  border: 1px dashed transparent;
+  background: $euiColorEmptyShade;
 }
 
 .presFieldPickerFieldButtonActive {
diff --git a/src/plugins/presentation_util/public/components/field_picker/field_search.tsx b/src/plugins/presentation_util/public/components/field_picker/field_search.tsx
index 7840cb2d9a168..c0c73ebafa049 100644
--- a/src/plugins/presentation_util/public/components/field_picker/field_search.tsx
+++ b/src/plugins/presentation_util/public/components/field_picker/field_search.tsx
@@ -19,6 +19,7 @@ import {
   EuiOutsideClickDetector,
   EuiFilterButton,
   EuiSpacer,
+  EuiPopoverTitle,
 } from '@elastic/eui';
 import { FieldIcon } from '@kbn/react-field/field_icon';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -87,7 +88,6 @@ export function FieldSearch({
           <EuiPopover
             panelClassName="euiFilterGroup__popoverPanel"
             panelPaddingSize="none"
-            anchorPosition="rightUp"
             display="block"
             isOpen={isPopoverOpen}
             closePopover={() => {
@@ -95,6 +95,11 @@ export function FieldSearch({
             }}
             button={buttonContent}
           >
+            <EuiPopoverTitle paddingSize="s">
+              {i18n.translate('presentationUtil.fieldSearch.filterByTypeLabel', {
+                defaultMessage: 'Filter by type',
+              })}
+            </EuiPopoverTitle>
             <EuiContextMenuPanel
               watchedItemProps={['icon', 'disabled']}
               items={(availableFieldTypes as string[]).map((type) => (
@@ -110,10 +115,12 @@ export function FieldSearch({
                     }
                   }}
                 >
-                  <span>
-                    <FieldIcon type={type} label={type} />
-                    {type}
-                  </span>
+                  <EuiFlexGroup gutterSize="xs" responsive={false}>
+                    <EuiFlexItem grow={false}>
+                      <FieldIcon type={type} label={type} />
+                    </EuiFlexItem>
+                    <EuiFlexItem>{type}</EuiFlexItem>
+                  </EuiFlexGroup>
                 </EuiContextMenuItem>
               ))}
             />
diff --git a/src/plugins/presentation_util/public/components/solution_toolbar/items/button.scss b/src/plugins/presentation_util/public/components/solution_toolbar/items/button.scss
index a1e5b4e141765..4283813f1d0b7 100644
--- a/src/plugins/presentation_util/public/components/solution_toolbar/items/button.scss
+++ b/src/plugins/presentation_util/public/components/solution_toolbar/items/button.scss
@@ -5,10 +5,8 @@
   // Lighten the border color for all states
   border-color: $euiBorderColor !important; // sass-lint:disable-line no-important
 
-  @include kbnThemeStyle('v8') {
-    &[class*='--text'] {
-      border-width: $euiBorderWidthThin;
-      border-style: solid;
-    }
+  &[class*='--text'] {
+    border-width: $euiBorderWidthThin;
+    border-style: solid;
   }
 }
diff --git a/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss b/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss
index 535570a51d777..434f06b69a684 100644
--- a/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss
+++ b/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss
@@ -1,11 +1,9 @@
 .quickButtonGroup {
   .quickButtonGroup__button {
     background-color: $euiColorEmptyShade;
-    @include kbnThemeStyle('v8') {
-      // sass-lint:disable-block no-important
-      border-width: $euiBorderWidthThin !important;
-      border-style: solid !important;
-      border-color: $euiBorderColor !important;
-    }
+    // sass-lint:disable-block no-important
+    border-width: $euiBorderWidthThin !important;
+    border-style: solid !important;
+    border-color: $euiBorderColor !important;
   }
 }
diff --git a/src/plugins/presentation_util/storybook/manager.ts b/src/plugins/presentation_util/storybook/manager.ts
index 0c7774fd00762..e38cbf418bc18 100644
--- a/src/plugins/presentation_util/storybook/manager.ts
+++ b/src/plugins/presentation_util/storybook/manager.ts
@@ -14,7 +14,7 @@ addons.setConfig({
   theme: create({
     base: 'light',
     brandTitle: 'Kibana Presentation Utility Storybook',
-    brandUrl: 'https://github.com/elastic/kibana/tree/master/src/plugins/presentation_util',
+    brandUrl: 'https://github.com/elastic/kibana/tree/main/src/plugins/presentation_util',
   }),
   showPanel: true.valueOf,
   selectedPanel: PANEL_ID,
diff --git a/src/plugins/ui_actions/README.asciidoc b/src/plugins/ui_actions/README.asciidoc
index 27b3eae3a52a7..8fd3d0378ce6e 100644
--- a/src/plugins/ui_actions/README.asciidoc
+++ b/src/plugins/ui_actions/README.asciidoc
@@ -69,15 +69,15 @@ action to execute.
 
 === Examples
 
-https://github.com/elastic/kibana/blob/master/examples/ui_action_examples/README.md[ui_action examples]
+https://github.com/elastic/kibana/blob/main/examples/ui_action_examples/README.md[ui_action examples]
 
 === API Docs
 
 ==== Server API
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/ui_actions/server/kibana-plugin-plugins-ui_actions-server.uiactionssetup.md[Browser Setup contract]
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/ui_actions/server/kibana-plugin-plugins-ui_actions-server.uiactionsstart.md[Browser Start contract]
+https://github.com/elastic/kibana/blob/main/docs/development/plugins/ui_actions/server/kibana-plugin-plugins-ui_actions-server.uiactionssetup.md[Browser Setup contract]
+https://github.com/elastic/kibana/blob/main/docs/development/plugins/ui_actions/server/kibana-plugin-plugins-ui_actions-server.uiactionsstart.md[Browser Start contract]
 
 ==== Browser API
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionssetup.md[Browser Setup contract]
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionsstart.md[Browser Start contract]
+https://github.com/elastic/kibana/blob/main/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionssetup.md[Browser Setup contract]
+https://github.com/elastic/kibana/blob/main/docs/development/plugins/ui_actions/public/kibana-plugin-plugins-ui_actions-public.uiactionsstart.md[Browser Start contract]
 
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/math.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/math.js
index f00a485f2d759..f9b8b8f9632a0 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/math.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/math.js
@@ -115,7 +115,7 @@ export function MathAgg(props) {
                 values={{
                   link: (
                     <EuiLink
-                      href="https://github.com/elastic/kibana/blob/master/packages/kbn-tinymath/docs/functions.md"
+                      href="https://github.com/elastic/kibana/blob/main/packages/kbn-tinymath/docs/functions.md"
                       target="_blank"
                     >
                       <FormattedMessage
diff --git a/x-pack/examples/alerting_example/public/plugin.tsx b/x-pack/examples/alerting_example/public/plugin.tsx
index 242fd6e1fd2f5..25b6800ade2e8 100644
--- a/x-pack/examples/alerting_example/public/plugin.tsx
+++ b/x-pack/examples/alerting_example/public/plugin.tsx
@@ -67,7 +67,7 @@ export class AlertingExamplePlugin implements Plugin<Setup, Start, AlertingExamp
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting',
+          href: 'https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting',
           iconType: 'logoGithub',
           size: 's',
           target: '_blank',
diff --git a/x-pack/examples/embedded_lens_example/public/plugin.ts b/x-pack/examples/embedded_lens_example/public/plugin.ts
index 991c506ed5796..f0f799ea8f8ec 100644
--- a/x-pack/examples/embedded_lens_example/public/plugin.ts
+++ b/x-pack/examples/embedded_lens_example/public/plugin.ts
@@ -39,7 +39,7 @@ export class EmbeddedLensExamplePlugin
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/tree/master/x-pack/examples/embedded_lens_example',
+          href: 'https://github.com/elastic/kibana/tree/main/x-pack/examples/embedded_lens_example',
           iconType: 'logoGithub',
           size: 's',
           target: '_blank',
diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts b/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts
index d41b18addcca4..76cfe32ea9ec3 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts
@@ -141,7 +141,7 @@ export class UiActionsEnhancedExamplesPlugin
       links: [
         {
           label: 'README',
-          href: 'https://github.com/elastic/kibana/tree/master/x-pack/examples/ui_actions_enhanced_examples#ui-actions-enhanced-examples',
+          href: 'https://github.com/elastic/kibana/tree/main/x-pack/examples/ui_actions_enhanced_examples#ui-actions-enhanced-examples',
           iconType: 'logoGithub',
           size: 's',
           target: '_blank',
diff --git a/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.test.ts b/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.test.ts
index e7e311902d08d..af009217ed99b 100644
--- a/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.test.ts
+++ b/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.test.ts
@@ -42,7 +42,7 @@ describe('AlertNavigationRegistry', () => {
     test('returns true for registered consumer & alert types handlers', () => {
       const registry = new AlertNavigationRegistry();
       const alertType = mockAlertType('index_threshold');
-      registry.register('siem', alertType, handler);
+      registry.register('siem', alertType.id, handler);
       expect(registry.has('siem', alertType)).toEqual(true);
     });
 
@@ -72,7 +72,7 @@ describe('AlertNavigationRegistry', () => {
     test('registers a handler by consumer & Alert Type', () => {
       const registry = new AlertNavigationRegistry();
       const alertType = mockAlertType('index_threshold');
-      registry.register('siem', alertType, handler);
+      registry.register('siem', alertType.id, handler);
       expect(registry.has('siem', alertType)).toEqual(true);
     });
 
@@ -80,11 +80,11 @@ describe('AlertNavigationRegistry', () => {
       const registry = new AlertNavigationRegistry();
 
       const indexThresholdAlertType = mockAlertType('index_threshold');
-      registry.register('siem', indexThresholdAlertType, handler);
+      registry.register('siem', indexThresholdAlertType.id, handler);
       expect(registry.has('siem', indexThresholdAlertType)).toEqual(true);
 
       const geoAlertType = mockAlertType('geogrid');
-      registry.register('siem', geoAlertType, handler);
+      registry.register('siem', geoAlertType.id, handler);
       expect(registry.has('siem', geoAlertType)).toEqual(true);
     });
 
@@ -92,19 +92,19 @@ describe('AlertNavigationRegistry', () => {
       const registry = new AlertNavigationRegistry();
 
       const indexThresholdAlertType = mockAlertType('geogrid');
-      registry.register('siem', indexThresholdAlertType, handler);
+      registry.register('siem', indexThresholdAlertType.id, handler);
       expect(registry.has('siem', indexThresholdAlertType)).toEqual(true);
 
-      registry.register('apm', indexThresholdAlertType, handler);
+      registry.register('apm', indexThresholdAlertType.id, handler);
       expect(registry.has('apm', indexThresholdAlertType)).toEqual(true);
     });
 
     test('throws if an existing handler is registered', () => {
       const registry = new AlertNavigationRegistry();
       const alertType = mockAlertType('index_threshold');
-      registry.register('siem', alertType, handler);
+      registry.register('siem', alertType.id, handler);
       expect(() => {
-        registry.register('siem', alertType, handler);
+        registry.register('siem', alertType.id, handler);
       }).toThrowErrorMatchingInlineSnapshot(
         `"Navigation for Alert type \\"index_threshold\\" within \\"siem\\" is already registered."`
       );
@@ -125,7 +125,7 @@ describe('AlertNavigationRegistry', () => {
       expect(registry.hasDefaultHandler('siem')).toEqual(true);
 
       const geoAlertType = mockAlertType('geogrid');
-      registry.register('siem', geoAlertType, handler);
+      registry.register('siem', geoAlertType.id, handler);
       expect(registry.has('siem', geoAlertType)).toEqual(true);
     });
 
@@ -149,7 +149,7 @@ describe('AlertNavigationRegistry', () => {
       }
 
       const indexThresholdAlertType = mockAlertType('indexThreshold');
-      registry.register('siem', indexThresholdAlertType, indexThresholdHandler);
+      registry.register('siem', indexThresholdAlertType.id, indexThresholdHandler);
       expect(registry.get('siem', indexThresholdAlertType)).toEqual(indexThresholdHandler);
     });
 
@@ -167,7 +167,7 @@ describe('AlertNavigationRegistry', () => {
     test('returns default handlers by consumer when there are other alert type handler', () => {
       const registry = new AlertNavigationRegistry();
 
-      registry.register('siem', mockAlertType('indexThreshold'), () => ({}));
+      registry.register('siem', mockAlertType('indexThreshold').id, () => ({}));
 
       function defaultHandler(alert: SanitizedAlert) {
         return {};
diff --git a/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.ts b/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.ts
index 65b7c1e68e431..0c7bf052fef4c 100644
--- a/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.ts
+++ b/x-pack/plugins/alerting/public/alert_navigation_registry/alert_navigation_registry.ts
@@ -15,11 +15,11 @@ export class AlertNavigationRegistry {
     new Map();
 
   public has(consumer: string, alertType: AlertType) {
-    return this.hasTypedHandler(consumer, alertType) || this.hasDefaultHandler(consumer);
+    return this.hasTypedHandler(consumer, alertType.id) || this.hasDefaultHandler(consumer);
   }
 
-  public hasTypedHandler(consumer: string, alertType: AlertType) {
-    return this.alertNavigations.get(consumer)?.has(alertType.id) ?? false;
+  public hasTypedHandler(consumer: string, ruleTypeId: string) {
+    return this.alertNavigations.get(consumer)?.has(ruleTypeId) ?? false;
   }
 
   public hasDefaultHandler(consumer: string) {
@@ -50,14 +50,14 @@ export class AlertNavigationRegistry {
     consumerNavigations.set(DEFAULT_HANDLER, handler);
   }
 
-  public register(consumer: string, alertType: AlertType, handler: AlertNavigationHandler) {
-    if (this.hasTypedHandler(consumer, alertType)) {
+  public register(consumer: string, ruleTypeId: string, handler: AlertNavigationHandler) {
+    if (this.hasTypedHandler(consumer, ruleTypeId)) {
       throw new Error(
         i18n.translate('xpack.alerting.alertNavigationRegistry.register.duplicateNavigationError', {
           defaultMessage:
             'Navigation for Alert type "{alertType}" within "{consumer}" is already registered.',
           values: {
-            alertType: alertType.id,
+            alertType: ruleTypeId,
             consumer,
           },
         })
@@ -67,7 +67,7 @@ export class AlertNavigationRegistry {
     const consumerNavigations =
       this.alertNavigations.get(consumer) ?? this.createConsumerNavigation(consumer);
 
-    consumerNavigations.set(alertType.id, handler);
+    consumerNavigations.set(ruleTypeId, handler);
   }
 
   public get(consumer: string, alertType: AlertType): AlertNavigationHandler {
diff --git a/x-pack/plugins/alerting/public/plugin.ts b/x-pack/plugins/alerting/public/plugin.ts
index be7080f5df6da..71fb0c7fe32b2 100644
--- a/x-pack/plugins/alerting/public/plugin.ts
+++ b/x-pack/plugins/alerting/public/plugin.ts
@@ -59,15 +59,7 @@ export class AlertingPublicPlugin implements Plugin<PluginSetupContract, PluginS
       ruleTypeId: string,
       handler: AlertNavigationHandler
     ) => {
-      const alertType = await loadAlertType({ http: core.http, id: ruleTypeId });
-      if (!alertType) {
-        // eslint-disable-next-line no-console
-        console.log(
-          `Unable to register navigation for rule type "${ruleTypeId}" because it is not registered on the server side.`
-        );
-        return;
-      }
-      this.alertNavigationRegistry!.register(applicationId, alertType, handler);
+      this.alertNavigationRegistry!.register(applicationId, ruleTypeId, handler);
     };
 
     const registerDefaultNavigation = async (
diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
index c8f52110f5bcc..9834225e73723 100644
--- a/x-pack/plugins/alerting/server/plugin.ts
+++ b/x-pack/plugins/alerting/server/plugin.ts
@@ -6,10 +6,9 @@
  */
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { first, map, share } from 'rxjs/operators';
+import { first } from 'rxjs/operators';
 import { BehaviorSubject } from 'rxjs';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { combineLatest } from 'rxjs';
 import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
 import {
   EncryptedSavedObjectsPluginSetup,
@@ -61,11 +60,7 @@ import {
   initializeApiKeyInvalidator,
   scheduleApiKeyInvalidatorTask,
 } from './invalidate_pending_api_keys/task';
-import {
-  getHealthStatusStream,
-  scheduleAlertingHealthCheck,
-  initializeAlertingHealth,
-} from './health';
+import { scheduleAlertingHealthCheck, initializeAlertingHealth } from './health';
 import { AlertsConfig } from './config';
 import { getHealth } from './health/get_health';
 import { AlertingAuthorizationClientFactory } from './alerting_authorization_client_factory';
@@ -236,33 +231,33 @@ export class AlertingPlugin {
     );
 
     const serviceStatus$ = new BehaviorSubject<ServiceStatus>({
-      level: ServiceStatusLevels.degraded,
-      summary: 'Alerting is initializing',
+      level: ServiceStatusLevels.available,
+      summary: 'Alerting is (probably) ready',
     });
     core.status.set(serviceStatus$);
 
-    core.getStartServices().then(async ([coreStart, startPlugins]) => {
-      combineLatest([
-        core.status.derivedStatus$,
-        getHealthStatusStream(
-          startPlugins.taskManager,
-          this.logger,
-          coreStart.savedObjects,
-          this.config
-        ),
-      ])
-        .pipe(
-          map(([derivedStatus, healthStatus]) => {
-            if (healthStatus.level > derivedStatus.level) {
-              return healthStatus as ServiceStatus;
-            } else {
-              return derivedStatus;
-            }
-          }),
-          share()
-        )
-        .subscribe(serviceStatus$);
-    });
+    // core.getStartServices().then(async ([coreStart, startPlugins]) => {
+    //   combineLatest([
+    //     core.status.derivedStatus$,
+    //     getHealthStatusStream(
+    //       startPlugins.taskManager,
+    //       this.logger,
+    //       coreStart.savedObjects,
+    //       this.config
+    //     ),
+    //   ])
+    //     .pipe(
+    //       map(([derivedStatus, healthStatus]) => {
+    //         if (healthStatus.level > derivedStatus.level) {
+    //           return healthStatus as ServiceStatus;
+    //         } else {
+    //           return derivedStatus;
+    //         }
+    //       }),
+    //       share()
+    //     )
+    //     .subscribe(serviceStatus$);
+    // });
 
     initializeAlertingHealth(this.logger, plugins.taskManager, core.getStartServices());
 
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx
index 101923a7678fb..040190cf44ad6 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx
@@ -45,40 +45,40 @@ export function Example() {
   const distribution = {
     bucketSize: 62350,
     currentPeriod: [
-      { key: 1624279912350, count: 6 },
-      { key: 1624279974700, count: 1 },
-      { key: 1624280037050, count: 2 },
-      { key: 1624280099400, count: 3 },
-      { key: 1624280161750, count: 13 },
-      { key: 1624280224100, count: 1 },
-      { key: 1624280286450, count: 2 },
-      { key: 1624280348800, count: 0 },
-      { key: 1624280411150, count: 4 },
-      { key: 1624280473500, count: 4 },
-      { key: 1624280535850, count: 1 },
-      { key: 1624280598200, count: 4 },
-      { key: 1624280660550, count: 0 },
-      { key: 1624280722900, count: 2 },
-      { key: 1624280785250, count: 3 },
-      { key: 1624280847600, count: 0 },
+      { x: 1624279912350, y: 6 },
+      { x: 1624279974700, y: 1 },
+      { x: 1624280037050, y: 2 },
+      { x: 1624280099400, y: 3 },
+      { x: 1624280161750, y: 13 },
+      { x: 1624280224100, y: 1 },
+      { x: 1624280286450, y: 2 },
+      { x: 1624280348800, y: 0 },
+      { x: 1624280411150, y: 4 },
+      { x: 1624280473500, y: 4 },
+      { x: 1624280535850, y: 1 },
+      { x: 1624280598200, y: 4 },
+      { x: 1624280660550, y: 0 },
+      { x: 1624280722900, y: 2 },
+      { x: 1624280785250, y: 3 },
+      { x: 1624280847600, y: 0 },
     ],
     previousPeriod: [
-      { key: 1624279912350, count: 6 },
-      { key: 1624279974700, count: 1 },
-      { key: 1624280037050, count: 2 },
-      { key: 1624280099400, count: 3 },
-      { key: 1624280161750, count: 13 },
-      { key: 1624280224100, count: 1 },
-      { key: 1624280286450, count: 2 },
-      { key: 1624280348800, count: 0 },
-      { key: 1624280411150, count: 4 },
-      { key: 1624280473500, count: 4 },
-      { key: 1624280535850, count: 1 },
-      { key: 1624280598200, count: 4 },
-      { key: 1624280660550, count: 0 },
-      { key: 1624280722900, count: 2 },
-      { key: 1624280785250, count: 3 },
-      { key: 1624280847600, count: 0 },
+      { x: 1624279912350, y: 6 },
+      { x: 1624279974700, y: 1 },
+      { x: 1624280037050, y: 2 },
+      { x: 1624280099400, y: 3 },
+      { x: 1624280161750, y: 13 },
+      { x: 1624280224100, y: 1 },
+      { x: 1624280286450, y: 2 },
+      { x: 1624280348800, y: 0 },
+      { x: 1624280411150, y: 4 },
+      { x: 1624280473500, y: 4 },
+      { x: 1624280535850, y: 1 },
+      { x: 1624280598200, y: 4 },
+      { x: 1624280660550, y: 0 },
+      { x: 1624280722900, y: 2 },
+      { x: 1624280785250, y: 3 },
+      { x: 1624280847600, y: 0 },
     ],
   };
 
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.tsx
index 6a3157b3c4b7f..abff050457359 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.tsx
@@ -22,7 +22,6 @@ import { ALERT_RULE_TYPE_ID as ALERT_RULE_TYPE_ID_NON_TYPED } from '@kbn/rule-da
 import { i18n } from '@kbn/i18n';
 import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
 import { APIReturnType } from '../../../../services/rest/createCallApmApi';
-import { offsetPreviousPeriodCoordinates } from '../../../../../common/utils/offset_previous_period_coordinate';
 import { useTheme } from '../../../../hooks/use_theme';
 import { FETCH_STATUS } from '../../../../hooks/use_fetcher';
 import { AlertType } from '../../../../../common/alert_types';
@@ -31,7 +30,6 @@ import { ChartContainer } from '../../../shared/charts/chart_container';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
 import { LazyAlertsFlyout } from '../../../../../../observability/public';
 import { useUrlParams } from '../../../../context/url_params_context/use_url_params';
-import { Coordinate } from '../../../../../typings/timeseries';
 import { getTimeZone } from '../../../shared/charts/helper/timezone';
 
 const ALERT_RULE_TYPE_ID: typeof ALERT_RULE_TYPE_ID_TYPED =
@@ -40,18 +38,6 @@ const ALERT_RULE_TYPE_ID: typeof ALERT_RULE_TYPE_ID_TYPED =
 type ErrorDistributionAPIResponse =
   APIReturnType<'GET /internal/apm/services/{serviceName}/errors/distribution'>;
 
-export function getCoordinatedBuckets(
-  buckets:
-    | ErrorDistributionAPIResponse['currentPeriod']
-    | ErrorDistributionAPIResponse['previousPeriod']
-): Coordinate[] {
-  return buckets.map(({ count, key }) => {
-    return {
-      x: key,
-      y: count,
-    };
-  });
-}
 interface Props {
   fetchStatus: FETCH_STATUS;
   distribution: ErrorDistributionAPIResponse;
@@ -61,15 +47,13 @@ interface Props {
 export function ErrorDistribution({ distribution, title, fetchStatus }: Props) {
   const { core } = useApmPluginContext();
   const theme = useTheme();
-  const currentPeriod = getCoordinatedBuckets(distribution.currentPeriod);
-  const previousPeriod = getCoordinatedBuckets(distribution.previousPeriod);
 
   const { urlParams } = useUrlParams();
   const { comparisonEnabled } = urlParams;
 
   const timeseries = [
     {
-      data: currentPeriod,
+      data: distribution.currentPeriod,
       color: theme.eui.euiColorVis1,
       title: i18n.translate('xpack.apm.errorGroup.chart.ocurrences', {
         defaultMessage: 'Occurences',
@@ -78,10 +62,7 @@ export function ErrorDistribution({ distribution, title, fetchStatus }: Props) {
     ...(comparisonEnabled
       ? [
           {
-            data: offsetPreviousPeriodCoordinates({
-              currentPeriodTimeseries: currentPeriod,
-              previousPeriodTimeseries: previousPeriod,
-            }),
+            data: distribution.previousPeriod,
             color: theme.eui.euiColorMediumShade,
             title: i18n.translate(
               'xpack.apm.errorGroup.chart.ocurrences.previousPeriodLabel',
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
index 6bf3b2cb493f1..4b5c2b5d6134d 100644
--- a/x-pack/plugins/apm/server/index.ts
+++ b/x-pack/plugins/apm/server/index.ts
@@ -14,7 +14,7 @@ import { maxSuggestions } from '../../observability/common';
 import { SearchAggregatedTransactionSetting } from '../common/aggregated_transactions';
 import { APMPlugin } from './plugin';
 
-// All options should be documented in the APM configuration settings: https://github.com/elastic/kibana/blob/master/docs/settings/apm-settings.asciidoc
+// All options should be documented in the APM configuration settings: https://github.com/elastic/kibana/blob/main/docs/settings/apm-settings.asciidoc
 // and be included on cloud allow list unless there are specific reasons not to
 const configSchema = schema.object({
   serviceMapEnabled: schema.boolean({ defaultValue: true }),
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts
index 31c533814e697..a2d22a2c8f6ad 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts
@@ -80,8 +80,8 @@ export async function getBuckets({
 
   const buckets = (resp.aggregations?.distribution.buckets || []).map(
     (bucket) => ({
-      key: bucket.key,
-      count: bucket.doc_count,
+      x: bucket.key,
+      y: bucket.doc_count,
     })
   );
 
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts
index 7c2eaf38be6a7..7d5cbe9f95584 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { offsetPreviousPeriodCoordinates } from '../../../../common/utils/offset_previous_period_coordinate';
 import { Setup } from '../../helpers/setup_request';
 import { BUCKET_TARGET_COUNT } from '../../transactions/constants';
 import { getBuckets } from './get_buckets';
@@ -64,7 +65,10 @@ export async function getErrorDistribution({
 
   return {
     currentPeriod: currentPeriod.buckets,
-    previousPeriod: previousPeriod.buckets,
+    previousPeriod: offsetPreviousPeriodCoordinates({
+      currentPeriodTimeseries: currentPeriod.buckets,
+      previousPeriodTimeseries: previousPeriod.buckets,
+    }),
     bucketSize,
   };
 }
diff --git a/x-pack/plugins/canvas/PLUGINS.mdx b/x-pack/plugins/canvas/PLUGINS.mdx
index 0f93948d663a0..77fe65f864607 100644
--- a/x-pack/plugins/canvas/PLUGINS.mdx
+++ b/x-pack/plugins/canvas/PLUGINS.mdx
@@ -222,7 +222,7 @@ Now, let's try out our new server function.
 
 You should now see one random number and one "Server Time in ms" value.
 
-> More information about building Kibana Plugins can be found in [src/core](https://github.com/elastic/kibana/blob/master/src/core/README.md)
+> More information about building Kibana Plugins can be found in [src/core](https://github.com/elastic/kibana/blob/main/src/core/README.md)
 
 ### My Canvas Plugin stopped working
 
diff --git a/x-pack/plugins/canvas/i18n/README.md b/x-pack/plugins/canvas/i18n/README.md
index 45459b4191fae..42e088abaa320 100644
--- a/x-pack/plugins/canvas/i18n/README.md
+++ b/x-pack/plugins/canvas/i18n/README.md
@@ -1,6 +1,6 @@
 # Canvas and Internationalization (i18n)
 
-Creating i18n strings in Kibana requires use of the [`@kbn/i18n`](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/GUIDELINE.md) library. The following outlines the strategy for localizing strings in Canvas
+Creating i18n strings in Kibana requires use of the [`@kbn/i18n`](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/GUIDELINE.md) library. The following outlines the strategy for localizing strings in Canvas
 
 ## Why i18n Dictionaries
 
diff --git a/x-pack/plugins/canvas/public/services/kibana/notify.ts b/x-pack/plugins/canvas/public/services/kibana/notify.ts
index 0082b523d050e..1752840127fe1 100644
--- a/x-pack/plugins/canvas/public/services/kibana/notify.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/notify.ts
@@ -42,7 +42,7 @@ export const notifyServiceFactory: CanvasNotifyServiceFactory = ({ coreStart })
   return {
     /*
      * @param {(string | Object)} err: message or Error object
-     * @param {Object} opts: option to override toast title or icon, see https://github.com/elastic/kibana/blob/master/src/legacy/ui/public/notify/toasts/TOAST_NOTIFICATIONS.md
+     * @param {Object} opts: option to override toast title or icon, see https://github.com/elastic/kibana/blob/main/src/legacy/ui/public/notify/toasts/TOAST_NOTIFICATIONS.md
      */
     error(err, opts) {
       toasts.addDanger(getToast(err, opts));
diff --git a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js
index 7db6bf8948f8b..610f9ee0bb197 100644
--- a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js
+++ b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js
@@ -158,7 +158,7 @@ module.exports = {
               additionalData(content, loaderContext) {
                 return `@import ${stringifyRequest(
                   loaderContext,
-                  path.resolve(KIBANA_ROOT, 'src/core/public/core_app/styles/_globals_v7light.scss')
+                  path.resolve(KIBANA_ROOT, 'src/core/public/core_app/styles/_globals_v8light.scss')
                 )};\n${content}`;
               },
               implementation: require('node-sass'),
diff --git a/x-pack/plugins/canvas/storybook/addon/src/register.tsx b/x-pack/plugins/canvas/storybook/addon/src/register.tsx
index 1e99d6bdb74eb..71a3684b171aa 100644
--- a/x-pack/plugins/canvas/storybook/addon/src/register.tsx
+++ b/x-pack/plugins/canvas/storybook/addon/src/register.tsx
@@ -39,7 +39,7 @@ addons.setConfig({
   theme: create({
     base: 'light',
     brandTitle: 'Canvas Storybook',
-    brandUrl: 'https://github.com/elastic/kibana/tree/master/x-pack/plugins/canvas',
+    brandUrl: 'https://github.com/elastic/kibana/tree/main/x-pack/plugins/canvas',
   }),
   showPanel: true,
   isFullscreen: false,
diff --git a/x-pack/plugins/cases/README.md b/x-pack/plugins/cases/README.md
index f28926eb52052..a4c3b46ae9973 100644
--- a/x-pack/plugins/cases/README.md
+++ b/x-pack/plugins/cases/README.md
@@ -167,7 +167,7 @@ UI component:
 
 _***Feature in development, disabled by default**_
 
-See [Kibana Actions](https://github.com/elastic/kibana/tree/master/x-pack/plugins/actions) for more information.
+See [Kibana Actions](https://github.com/elastic/kibana/tree/main/x-pack/plugins/actions) for more information.
 
 
 ID: `.case`
diff --git a/x-pack/plugins/cases/common/utils/index.ts b/x-pack/plugins/cases/common/utils/index.ts
new file mode 100644
index 0000000000000..072c2b10dc225
--- /dev/null
+++ b/x-pack/plugins/cases/common/utils/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 * from './connectors_api';
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts b/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts
index af4883ab4ba96..593e5fa5497f5 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts
+++ b/x-pack/plugins/cases/public/components/connectors/jira/api.test.ts
@@ -74,13 +74,33 @@ const fieldsResponse = {
   },
 };
 
-const issueResponse = {
+const issue = {
   id: '10267',
   key: 'RJ-107',
-  fields: { summary: 'Test title' },
+  title: 'test title',
+};
+
+const issueResponse = {
+  status: 'ok' as const,
+  connector_id: '1',
+  data: issue,
+};
+
+const issuesResponse = {
+  ...issueResponse,
+  data: [issue],
 };
 
-const issuesResponse = [issueResponse];
+const camelCasedIssueResponse = {
+  status: 'ok' as const,
+  actionId: '1',
+  data: issue,
+};
+
+const camelCasedIssuesResponse = {
+  ...camelCasedIssueResponse,
+  data: [issue],
+};
 
 describe('Jira API', () => {
   const http = httpServiceMock.createStartContract();
@@ -131,7 +151,7 @@ describe('Jira API', () => {
         title: 'test issue',
       });
 
-      expect(res).toEqual(issuesResponse);
+      expect(res).toEqual(camelCasedIssuesResponse);
       expect(http.post).toHaveBeenCalledWith('/api/actions/connector/test/_execute', {
         body: '{"params":{"subAction":"issues","subActionParams":{"title":"test issue"}}}',
         signal: abortCtrl.signal,
@@ -142,7 +162,7 @@ describe('Jira API', () => {
   describe('getIssue', () => {
     test('should call get fields API', async () => {
       const abortCtrl = new AbortController();
-      http.post.mockResolvedValueOnce(issuesResponse);
+      http.post.mockResolvedValueOnce(issueResponse);
       const res = await getIssue({
         http,
         signal: abortCtrl.signal,
@@ -150,7 +170,7 @@ describe('Jira API', () => {
         id: 'RJ-107',
       });
 
-      expect(res).toEqual(issuesResponse);
+      expect(res).toEqual(camelCasedIssueResponse);
       expect(http.post).toHaveBeenCalledWith('/api/actions/connector/test/_execute', {
         body: '{"params":{"subAction":"issue","subActionParams":{"id":"RJ-107"}}}',
         signal: abortCtrl.signal,
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/api.ts b/x-pack/plugins/cases/public/components/connectors/jira/api.ts
index 109d8a6794c54..b4bbec156f04d 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/api.ts
+++ b/x-pack/plugins/cases/public/components/connectors/jira/api.ts
@@ -7,7 +7,11 @@
 
 import { HttpSetup } from 'kibana/public';
 import { ActionTypeExecutorResult } from '../../../../../actions/common';
-import { getExecuteConnectorUrl } from '../../../../common/utils/connectors_api';
+import { getExecuteConnectorUrl } from '../../../../common/utils';
+import {
+  ConnectorExecutorResult,
+  rewriteResponseToCamelCase,
+} from '../rewrite_response_to_camel_case';
 import { IssueTypes, Fields, Issues, Issue } from './types';
 
 export interface GetIssueTypesProps {
@@ -17,12 +21,17 @@ export interface GetIssueTypesProps {
 }
 
 export async function getIssueTypes({ http, signal, connectorId }: GetIssueTypesProps) {
-  return http.post<ActionTypeExecutorResult<IssueTypes>>(getExecuteConnectorUrl(connectorId), {
-    body: JSON.stringify({
-      params: { subAction: 'issueTypes', subActionParams: {} },
-    }),
-    signal,
-  });
+  const res = await http.post<ConnectorExecutorResult<IssueTypes>>(
+    getExecuteConnectorUrl(connectorId),
+    {
+      body: JSON.stringify({
+        params: { subAction: 'issueTypes', subActionParams: {} },
+      }),
+      signal,
+    }
+  );
+
+  return rewriteResponseToCamelCase(res);
 }
 
 export interface GetFieldsByIssueTypeProps {
@@ -38,12 +47,16 @@ export async function getFieldsByIssueType({
   connectorId,
   id,
 }: GetFieldsByIssueTypeProps): Promise<ActionTypeExecutorResult<Fields>> {
-  return http.post(getExecuteConnectorUrl(connectorId), {
-    body: JSON.stringify({
-      params: { subAction: 'fieldsByIssueType', subActionParams: { id } },
-    }),
-    signal,
-  });
+  const res = await http.post<ConnectorExecutorResult<Fields>>(
+    getExecuteConnectorUrl(connectorId),
+    {
+      body: JSON.stringify({
+        params: { subAction: 'fieldsByIssueType', subActionParams: { id } },
+      }),
+      signal,
+    }
+  );
+  return rewriteResponseToCamelCase(res);
 }
 
 export interface GetIssuesTypeProps {
@@ -59,12 +72,16 @@ export async function getIssues({
   connectorId,
   title,
 }: GetIssuesTypeProps): Promise<ActionTypeExecutorResult<Issues>> {
-  return http.post(getExecuteConnectorUrl(connectorId), {
-    body: JSON.stringify({
-      params: { subAction: 'issues', subActionParams: { title } },
-    }),
-    signal,
-  });
+  const res = await http.post<ConnectorExecutorResult<Issues>>(
+    getExecuteConnectorUrl(connectorId),
+    {
+      body: JSON.stringify({
+        params: { subAction: 'issues', subActionParams: { title } },
+      }),
+      signal,
+    }
+  );
+  return rewriteResponseToCamelCase(res);
 }
 
 export interface GetIssueTypeProps {
@@ -80,10 +97,11 @@ export async function getIssue({
   connectorId,
   id,
 }: GetIssueTypeProps): Promise<ActionTypeExecutorResult<Issue>> {
-  return http.post(getExecuteConnectorUrl(connectorId), {
+  const res = await http.post<ConnectorExecutorResult<Issue>>(getExecuteConnectorUrl(connectorId), {
     body: JSON.stringify({
       params: { subAction: 'issue', subActionParams: { id } },
     }),
     signal,
   });
+  return rewriteResponseToCamelCase(res);
 }
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx
index 686df1022a0d7..d762c9d3aaf20 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_fields_by_issue_type.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, IToasts } from 'kibana/public';
 import { ActionConnector } from '../../../../common';
 import { getFieldsByIssueType } from './api';
 import { Fields } from './types';
@@ -14,10 +14,7 @@ import * as i18n from './translations';
 
 interface Props {
   http: HttpSetup;
-  toastNotifications: Pick<
-    ToastsApi,
-    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
-  >;
+  toastNotifications: IToasts;
   issueType: string | null;
   connector?: ActionConnector;
 }
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx
index 0d7073f3bf2d4..6f409f1ddef8d 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/use_get_issue_types.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, IToasts } from 'kibana/public';
 import { ActionConnector } from '../../../../common';
 import { getIssueTypes } from './api';
 import { IssueTypes } from './types';
@@ -14,10 +14,7 @@ import * as i18n from './translations';
 
 interface Props {
   http: HttpSetup;
-  toastNotifications: Pick<
-    ToastsApi,
-    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
-  >;
+  toastNotifications: IToasts;
   connector?: ActionConnector;
   handleIssueType: (options: Array<{ value: string; text: string }>) => void;
 }
diff --git a/x-pack/plugins/cases/public/components/connectors/resilient/api.ts b/x-pack/plugins/cases/public/components/connectors/resilient/api.ts
index 301d29866d302..6d803b6fbe542 100644
--- a/x-pack/plugins/cases/public/components/connectors/resilient/api.ts
+++ b/x-pack/plugins/cases/public/components/connectors/resilient/api.ts
@@ -6,8 +6,11 @@
  */
 
 import { HttpSetup } from 'kibana/public';
-import { ActionTypeExecutorResult } from '../../../../../actions/common';
 import { getExecuteConnectorUrl } from '../../../../common/utils/connectors_api';
+import {
+  ConnectorExecutorResult,
+  rewriteResponseToCamelCase,
+} from '../rewrite_response_to_camel_case';
 import { ResilientIncidentTypes, ResilientSeverity } from './types';
 
 export const BASE_ACTION_API_PATH = '/api/actions';
@@ -19,7 +22,7 @@ export interface Props {
 }
 
 export async function getIncidentTypes({ http, signal, connectorId }: Props) {
-  return http.post<ActionTypeExecutorResult<ResilientIncidentTypes>>(
+  const res = await http.post<ConnectorExecutorResult<ResilientIncidentTypes>>(
     getExecuteConnectorUrl(connectorId),
     {
       body: JSON.stringify({
@@ -28,10 +31,12 @@ export async function getIncidentTypes({ http, signal, connectorId }: Props) {
       signal,
     }
   );
+
+  return rewriteResponseToCamelCase(res);
 }
 
 export async function getSeverity({ http, signal, connectorId }: Props) {
-  return http.post<ActionTypeExecutorResult<ResilientSeverity>>(
+  const res = await http.post<ConnectorExecutorResult<ResilientSeverity>>(
     getExecuteConnectorUrl(connectorId),
     {
       body: JSON.stringify({
@@ -40,4 +45,6 @@ export async function getSeverity({ http, signal, connectorId }: Props) {
       signal,
     }
   );
+
+  return rewriteResponseToCamelCase(res);
 }
diff --git a/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.test.ts b/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.test.ts
new file mode 100644
index 0000000000000..28f901076759b
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.test.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  ConnectorExecutorResult,
+  rewriteResponseToCamelCase,
+} from './rewrite_response_to_camel_case';
+
+const responseWithSnakeCasedFields: ConnectorExecutorResult<{}> = {
+  service_message: 'oh noooooo',
+  connector_id: '1213',
+  data: {},
+  status: 'ok',
+};
+
+describe('rewriteResponseToCamelCase works correctly', () => {
+  it('correctly transforms snake case to camel case for ActionTypeExecuteResults', () => {
+    const camelCasedData = rewriteResponseToCamelCase(responseWithSnakeCasedFields);
+
+    expect(camelCasedData).toEqual({
+      serviceMessage: 'oh noooooo',
+      actionId: '1213',
+      data: {},
+      status: 'ok',
+    });
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.ts b/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.ts
new file mode 100644
index 0000000000000..e73488257d9d2
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/connectors/rewrite_response_to_camel_case.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 { ActionTypeExecutorResult, RewriteResponseCase } from '../../../../actions/common';
+
+export type ConnectorExecutorResult<T> = ReturnType<
+  RewriteResponseCase<ActionTypeExecutorResult<T>>
+>;
+
+export const rewriteResponseToCamelCase = <T>({
+  connector_id: actionId,
+  service_message: serviceMessage,
+  ...data
+}: ConnectorExecutorResult<T>): ActionTypeExecutorResult<T> => ({
+  ...data,
+  actionId,
+  ...(serviceMessage && { serviceMessage }),
+});
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts b/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts
index 3d9211caa9b9a..de3ea1f16c359 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/api.ts
@@ -6,8 +6,11 @@
  */
 
 import { HttpSetup } from 'kibana/public';
-import { ActionTypeExecutorResult } from '../../../../../actions/common';
 import { getExecuteConnectorUrl } from '../../../../common/utils/connectors_api';
+import {
+  ConnectorExecutorResult,
+  rewriteResponseToCamelCase,
+} from '../rewrite_response_to_camel_case';
 import { Choice } from './types';
 
 export const BASE_ACTION_API_PATH = '/api/actions';
@@ -20,10 +23,14 @@ export interface GetChoicesProps {
 }
 
 export async function getChoices({ http, signal, connectorId, fields }: GetChoicesProps) {
-  return http.post<ActionTypeExecutorResult<Choice[]>>(getExecuteConnectorUrl(connectorId), {
-    body: JSON.stringify({
-      params: { subAction: 'getChoices', subActionParams: { fields } },
-    }),
-    signal,
-  });
+  const res = await http.post<ConnectorExecutorResult<Choice[]>>(
+    getExecuteConnectorUrl(connectorId),
+    {
+      body: JSON.stringify({
+        params: { subAction: 'getChoices', subActionParams: { fields } },
+      }),
+      signal,
+    }
+  );
+  return rewriteResponseToCamelCase(res);
 }
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx b/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx
index 4edf740a60011..2c6181dd08eb1 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/use_get_choices.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, IToasts } from 'kibana/public';
 import { ActionConnector } from '../../../../common';
 import { getChoices } from './api';
 import { Choice } from './types';
@@ -14,10 +14,7 @@ import * as i18n from './translations';
 
 export interface UseGetChoicesProps {
   http: HttpSetup;
-  toastNotifications: Pick<
-    ToastsApi,
-    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
-  >;
+  toastNotifications: IToasts;
   connector?: ActionConnector;
   fields: string[];
   onSuccess?: (choices: Choice[]) => void;
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.tsx b/x-pack/plugins/enterprise_search/public/applications/index.tsx
index 04fa3ae681045..fef40ed00bfc1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.tsx
@@ -96,7 +96,7 @@ export const renderApp = (
  * Render function for Kibana's header action menu chrome -
  * reusable by any Enterprise Search plugin simply by passing in
  * a custom HeaderActions component (e.g., WorkplaceSearchHeaderActions)
- * @see https://github.com/elastic/kibana/blob/master/docs/development/core/public/kibana-plugin-core-public.appmountparameters.setheaderactionmenu.md
+ * @see https://github.com/elastic/kibana/blob/main/docs/development/core/public/kibana-plugin-core-public.appmountparameters.setheaderactionmenu.md
  */
 
 export const renderHeaderActions = (
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.ts
index ca24be5864b84..650aa00d1801d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_title.ts
@@ -13,7 +13,7 @@ import {
 
 /**
  * Generate a document title that generally follows our breadcrumb trails
- * https://github.com/elastic/kibana/blob/master/docs/development/core/public/kibana-plugin-core-public.chromedoctitle.md
+ * https://github.com/elastic/kibana/blob/main/docs/development/core/public/kibana-plugin-core-public.chromedoctitle.md
  */
 
 type Title = string[];
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.tsx
index e639f9d22fb4b..0d7e14f063248 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/set_chrome.tsx
@@ -22,7 +22,7 @@ import { enterpriseSearchTitle, appSearchTitle, workplaceSearchTitle } from './g
 
 /**
  * Helpers for setting Kibana chrome (breadcrumbs, doc titles) on React view mount
- * @see https://github.com/elastic/kibana/blob/master/src/core/public/chrome/chrome_service.tsx
+ * @see https://github.com/elastic/kibana/blob/main/src/core/public/chrome/chrome_service.tsx
  *
  * Example usage (don't forget to i18n.translate() page titles!):
  *
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
index 5b02756e44b52..8d480b69b3fe5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.test.tsx
@@ -79,7 +79,7 @@ describe('EnterpriseSearchPageTemplate', () => {
       expect(wrapper.find('.emptyState').exists()).toBe(true);
       expect(wrapper.find('.test').exists()).toBe(false);
 
-      // @see https://github.com/elastic/kibana/blob/master/dev_docs/tutorials/kibana_page_template.mdx#isemptystate
+      // @see https://github.com/elastic/kibana/blob/main/dev_docs/tutorials/kibana_page_template.mdx#isemptystate
       // if you want to use KibanaPageTemplate's `isEmptyState` without a custom emptyState
     });
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
index affec11921545..7528fa14b7ae4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
@@ -32,7 +32,7 @@ import './page_template.scss';
  * WorkplaceSearchPageTemplate sitting on top of this template (:nesting_dolls:),
  * which in turn manages individual product-specific concerns (e.g. side navs, telemetry, etc.)
  *
- * @see https://github.com/elastic/kibana/tree/master/src/plugins/kibana_react/public/page_template
+ * @see https://github.com/elastic/kibana/tree/main/src/plugins/kibana_react/public/page_template
  * @see https://elastic.github.io/eui/#/layout/page
  */
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
index e5dabdd51e543..c1f4262881bd2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
@@ -17,7 +17,7 @@ import { LOGS_SOURCE_ID } from '../../../../common/constants';
  * default for timestamps. All other props get passed as-is to the underlying LogStream.
  *
  * Documentation links for reference:
- * - https://github.com/elastic/kibana/blob/master/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx
+ * - https://github.com/elastic/kibana/blob/main/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx
  * - Run `yarn storybook infra` for live docs
  */
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts
index 89210def248b3..b117918311120 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.ts
@@ -59,7 +59,7 @@ class EnterpriseSearchHttpAgent {
   /*
    * Convert verificationMode to rejectUnauthorized for more consistent config settings
    * with the rest of Kibana
-   * @see https://github.com/elastic/kibana/blob/master/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_tls_options.ts
+   * @see https://github.com/elastic/kibana/blob/main/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_tls_options.ts
    */
   getAgentOptions(verificationMode: 'full' | 'certificate' | 'none') {
     const agentOptions: AgentOptions = {};
diff --git a/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts b/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts
index 87defff89bad4..554fe127b4353 100644
--- a/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/route_config_helpers.ts
@@ -33,8 +33,8 @@ interface ConfigWithoutBodyOptions<P, Q, B, Method extends RouteMethod>
  * The will pass a String Buffer to the route handler. The proper way to validate this when validation
  * is enabled to to use `body: schema.buffer()`.
  *
- * @see https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.routeconfigoptionsbody.md
- * @see https://github.com/elastic/kibana/blob/master/packages/kbn-config-schema/README.md#schemabuffer
+ * @see https://github.com/elastic/kibana/blob/main/docs/development/core/server/kibana-plugin-core-server.routeconfigoptionsbody.md
+ * @see https://github.com/elastic/kibana/blob/main/packages/kbn-config-schema/README.md#schemabuffer
  *
  * Example:
  *  router.put({
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
index f40046c22b419..29a744e487f40 100644
--- a/x-pack/plugins/enterprise_search/server/plugin.ts
+++ b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -172,7 +172,7 @@ export class EnterpriseSearchPlugin implements Plugin {
 
     /*
      * Register logs source configuration, used by LogStream components
-     * @see https://github.com/elastic/kibana/blob/master/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx#with-a-source-configuration
+     * @see https://github.com/elastic/kibana/blob/main/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx#with-a-source-configuration
      */
     infra.defineInternalSourceConfiguration(LOGS_SOURCE_ID, {
       name: 'Enterprise Search Logs',
diff --git a/x-pack/plugins/event_log/README.md b/x-pack/plugins/event_log/README.md
index 61f79c662fad6..0aac72d734f04 100644
--- a/x-pack/plugins/event_log/README.md
+++ b/x-pack/plugins/event_log/README.md
@@ -427,7 +427,7 @@ yarn test:jest x-pack/plugins/event_log --watch
 
 ### API Integration tests
 
-See: [`x-pack/test/plugin_api_integration/test_suites/event_log`](https://github.com/elastic/kibana/tree/master/x-pack/test/plugin_api_integration/test_suites/event_log).
+See: [`x-pack/test/plugin_api_integration/test_suites/event_log`](https://github.com/elastic/kibana/tree/main/x-pack/test/plugin_api_integration/test_suites/event_log).
 
 To develop integration tests, first start the test server from the root of the repo:
 
diff --git a/x-pack/plugins/fleet/README.md b/x-pack/plugins/fleet/README.md
index ce8e95c83d6bd..80d13b28c8265 100644
--- a/x-pack/plugins/fleet/README.md
+++ b/x-pack/plugins/fleet/README.md
@@ -2,7 +2,7 @@
 
 ## Plugin
 
-- The plugin is enabled by default. See the TypeScript type for the [the available plugin configuration options](https://github.com/elastic/kibana/blob/master/x-pack/plugins/fleet/common/types/index.ts#L9-L27)
+- The plugin is enabled by default. See the TypeScript type for the [the available plugin configuration options](https://github.com/elastic/kibana/blob/main/x-pack/plugins/fleet/common/types/index.ts#L9-L27)
 - Adding `xpack.fleet.enabled=false` will disable the plugin including the EPM and Fleet features. It will also remove the `PACKAGE_POLICY_API_ROUTES` and `AGENT_POLICY_API_ROUTES` values in [`common/constants/routes.ts`](./common/constants/routes.ts)
 - Adding `--xpack.fleet.agents.enabled=false` will disable the Fleet API & UI
   - [code for adding the routes](https://github.com/elastic/kibana/blob/1f27d349533b1c2865c10c45b2cf705d7416fb36/x-pack/plugins/ingest_manager/server/plugin.ts#L115-L133)
@@ -26,7 +26,7 @@ Also you need to configure the hosts your agent is going to use to comunication
 
 ### Getting started
 
-See the Kibana docs for [how to set up your dev environment](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#setting-up-your-development-environment), [run Elasticsearch](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#running-elasticsearch), and [start Kibana](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#running-kibana)
+See the Kibana docs for [how to set up your dev environment](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md#setting-up-your-development-environment), [run Elasticsearch](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md#running-elasticsearch), and [start Kibana](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md#running-kibana)
 
 One common development workflow is:
 
@@ -44,7 +44,7 @@ One common development workflow is:
   ```
 
 This plugin follows the `common`, `server`, `public` structure from the [Architecture Style Guide
-](https://github.com/elastic/kibana/blob/master/style_guides/architecture_style_guide.md#file-and-folder-structure). We also follow the pattern of developing feature branches under your personal fork of Kibana.
+](https://github.com/elastic/kibana/blob/main/style_guides/architecture_style_guide.md#file-and-folder-structure). We also follow the pattern of developing feature branches under your personal fork of Kibana.
 
 Note: The plugin was previously named Ingest Manager it's possible that some variables are still named with that old plugin name.
 
diff --git a/x-pack/plugins/fleet/common/types/index.ts b/x-pack/plugins/fleet/common/types/index.ts
index bd970fc2cd83e..6eb31fd79aa77 100644
--- a/x-pack/plugins/fleet/common/types/index.ts
+++ b/x-pack/plugins/fleet/common/types/index.ts
@@ -32,6 +32,9 @@ export interface FleetConfigType {
   packages?: PreconfiguredPackage[];
   outputs?: PreconfiguredOutput[];
   agentIdVerificationEnabled?: boolean;
+  developer?: {
+    disableRegistryVersionCheck?: boolean;
+  };
 }
 
 // Calling Object.entries(PackagesGroupedByStatus) gave `status: string`
diff --git a/x-pack/plugins/fleet/dev_docs/api_integration_tests.md b/x-pack/plugins/fleet/dev_docs/api_integration_tests.md
index bf1a84ae4c563..7372c06269ce4 100644
--- a/x-pack/plugins/fleet/dev_docs/api_integration_tests.md
+++ b/x-pack/plugins/fleet/dev_docs/api_integration_tests.md
@@ -35,7 +35,7 @@ Port `12345` is used as an example here, it can be anything, but the environment
 ## DockerServers service setup
 
 We use the `DockerServers` service provided by `kbn-test`. The documentation for this functionality can be found here:
-https://github.com/elastic/kibana/blob/master/packages/kbn-test/src/functional_test_runner/lib/docker_servers/README.md
+https://github.com/elastic/kibana/blob/main/packages/kbn-test/src/functional_test_runner/lib/docker_servers/README.md
 
 The main configuration for the `DockerServers` service for our tests can be found in `x-pack/test/fleet_api_integration/config.ts`:
 
diff --git a/x-pack/plugins/fleet/dev_docs/diagrams/architecture_overview/architecture_overview.excalidraw b/x-pack/plugins/fleet/dev_docs/diagrams/architecture_overview/architecture_overview.excalidraw
index bfd73693d156d..5be5f2758f00c 100644
--- a/x-pack/plugins/fleet/dev_docs/diagrams/architecture_overview/architecture_overview.excalidraw
+++ b/x-pack/plugins/fleet/dev_docs/diagrams/architecture_overview/architecture_overview.excalidraw
@@ -358,7 +358,7 @@
       ],
       "fontSize": 20,
       "fontFamily": 2,
-      "text": "Fleet and Integrations are both Kibana applications. Kibana's architecture\nallows for many plugins/application to exist and register themselves as distinct\nexperiences. The Fleet team mainly works on these two Kibana applications \nwithin the `xpack/plugins/fleet` directory in the Kibana codebase.\n\nhttps://github.com/elastic/kibana/tree/master/x-pack/plugins/fleet\nhttps://www.elastic.co/guide/en/fleet/current/fleet-overview.html\n",
+      "text": "Fleet and Integrations are both Kibana applications. Kibana's architecture\nallows for many plugins/application to exist and register themselves as distinct\nexperiences. The Fleet team mainly works on these two Kibana applications \nwithin the `xpack/plugins/fleet` directory in the Kibana codebase.\n\nhttps://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet\nhttps://www.elastic.co/guide/en/fleet/current/fleet-overview.html\n",
       "baseline": 179,
       "textAlign": "left",
       "verticalAlign": "top"
diff --git a/x-pack/plugins/fleet/dev_docs/tracing.md b/x-pack/plugins/fleet/dev_docs/tracing.md
index 1f2d51cc214ec..e560766745043 100644
--- a/x-pack/plugins/fleet/dev_docs/tracing.md
+++ b/x-pack/plugins/fleet/dev_docs/tracing.md
@@ -10,7 +10,7 @@ To use it in Fleet,
       https://github.com/elastic/kibana/blob/a537f9af500bc3d3a6e2ceea8817ee89c474cbb0/x-pack/plugins/reporting/server/export_types/png/execute_job/index.ts#L30-L31
       - <details><summary>an example for <code>startTransaction</code></summary> <a href="https://www.elastic.co/guide/en/apm/agent/nodejs/current/transaction-api.html"><code>Transaction</code> docs</a><p><img width="700" alt="Screen Shot 2020-11-02 at 9 06 50 AM" src="https://user-images.githubusercontent.com/57655/97877262-e7b11800-1cea-11eb-9883-aeb4fb6b4554.png"></details>
       - <details><summary>an example for <code>startSpan</code></summary><a href="https://www.elastic.co/guide/en/apm/agent/nodejs/current/span-api.html"><code>Span</code> docs</a><p><img width="1008" alt="Screen Shot 2020-06-02 at 9 15 42 PM" src="https://user-images.githubusercontent.com/57655/83584866-590b5580-a516-11ea-8133-286353000d5c.png"></details>
-  1. start Kibana with APM enabled (as described in [Instrumenting with Elastic APM](https://github.com/elastic/kibana/blob/master/docs/developer/getting-started/debugging.asciidoc#instrumenting-with-elastic-apm))
+  1. start Kibana with APM enabled (as described in [Instrumenting with Elastic APM](https://github.com/elastic/kibana/blob/main/docs/developer/getting-started/debugging.asciidoc#instrumenting-with-elastic-apm))
       - <details><summary>via env variable or <code>config/apm.dev.js</code></summary>
         <code>ELASTIC_APM_ACTIVE=true yarn start</code>
         <p>or <code>module.exports = {
diff --git a/x-pack/plugins/fleet/server/index.ts b/x-pack/plugins/fleet/server/index.ts
index 9ce361503ddf3..cdc0dfddc01e5 100644
--- a/x-pack/plugins/fleet/server/index.ts
+++ b/x-pack/plugins/fleet/server/index.ts
@@ -120,6 +120,10 @@ export const config: PluginConfigDescriptor = {
     agentPolicies: PreconfiguredAgentPoliciesSchema,
     outputs: PreconfiguredOutputsSchema,
     agentIdVerificationEnabled: schema.boolean({ defaultValue: true }),
+    developer: schema.object({
+      // TODO: change default to false as soon as EPR issue fixed. Blocker for 8.0.
+      disableRegistryVersionCheck: schema.boolean({ defaultValue: true }),
+    }),
   }),
 };
 
diff --git a/x-pack/plugins/fleet/server/mocks/index.ts b/x-pack/plugins/fleet/server/mocks/index.ts
index 9300e0bb6c3e1..282135c7b1bcd 100644
--- a/x-pack/plugins/fleet/server/mocks/index.ts
+++ b/x-pack/plugins/fleet/server/mocks/index.ts
@@ -57,8 +57,8 @@ export const createAppContextStartContractMock = (): MockedFleetAppContext => {
       agentIdVerificationEnabled: true,
     },
     config$,
-    kibanaVersion: '8.0.0',
-    kibanaBranch: 'master',
+    kibanaVersion: '8.99.0', // Fake version :)
+    kibanaBranch: 'main',
   };
 };
 
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/storage.ts b/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
index 29594b0a247a1..bc26388c990f3 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
@@ -264,7 +264,7 @@ export const getEsPackage = async (
       dataStreams.push({
         dataset: dataset || `${pkgName}.${dataStreamPath}`,
         package: pkgName,
-        ingest_pipeline: ingestPipeline || 'default',
+        ingest_pipeline: ingestPipeline,
         path: dataStreamPath,
         streams,
         ...dataStreamManifestProps,
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/validation.ts b/x-pack/plugins/fleet/server/services/epm/archive/validation.ts
index c530c61d0a8f7..a46a26738bdab 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/validation.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/validation.ts
@@ -217,7 +217,6 @@ export function parseAndVerifyDataStreams(
     }
     const streams = parseAndVerifyStreams(manifestStreams, dataStreamPath);
 
-    // default ingest pipeline name see https://github.com/elastic/package-registry/blob/master/util/dataset.go#L26
     dataStreams.push(
       Object.entries(restOfProps).reduce(
         (validatedDataStream, [key, value]) => {
@@ -233,7 +232,7 @@ export function parseAndVerifyDataStreams(
           type,
           package: pkgName,
           dataset: dataset || `${pkgName}.${dataStreamPath}`,
-          ingest_pipeline: ingestPipeline || 'default',
+          ingest_pipeline: ingestPipeline,
           path: dataStreamPath,
           streams,
         }
diff --git a/x-pack/plugins/fleet/server/services/epm/registry/index.ts b/x-pack/plugins/fleet/server/services/epm/registry/index.ts
index aa2c3f1d4da3c..85a52763b7fb7 100644
--- a/x-pack/plugins/fleet/server/services/epm/registry/index.ts
+++ b/x-pack/plugins/fleet/server/services/epm/registry/index.ts
@@ -140,11 +140,18 @@ export async function fetchFile(filePath: string): Promise<Response> {
 }
 
 function setKibanaVersion(url: URL) {
+  // TODO: change default to false as soon as EPR issue fixed. Blocker for 8.0.
+  const disableVersionCheck =
+    appContextService.getConfig()?.developer?.disableRegistryVersionCheck ?? true;
+  if (disableVersionCheck) {
+    return;
+  }
+
   const kibanaVersion = appContextService.getKibanaVersion().split('-')[0]; // may be x.y.z-SNAPSHOT
   const kibanaBranch = appContextService.getKibanaBranch();
 
-  // on master, request all packages regardless of version
-  if (kibanaVersion && kibanaBranch !== 'master') {
+  // on main, request all packages regardless of version
+  if (kibanaVersion && kibanaBranch !== 'main') {
     url.searchParams.set('kibana.version', kibanaVersion);
   }
 }
diff --git a/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts b/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts
index dfca8511fd84c..bcaf5ac1f0634 100644
--- a/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts
+++ b/x-pack/plugins/fleet/server/services/epm/registry/registry_url.ts
@@ -21,7 +21,7 @@ const SNAPSHOT_REGISTRY_URL_CDN = 'https://epr-snapshot.elastic.co';
 
 const getDefaultRegistryUrl = (): string => {
   const branch = appContextService.getKibanaBranch();
-  if (branch === 'master') {
+  if (branch === 'main') {
     return SNAPSHOT_REGISTRY_URL_CDN;
   } else if (appContextService.getKibanaVersion().includes('-SNAPSHOT')) {
     return STAGING_REGISTRY_URL_CDN;
diff --git a/x-pack/plugins/fleet/storybook/manager.ts b/x-pack/plugins/fleet/storybook/manager.ts
index 471a735ed370f..193364f06a62e 100644
--- a/x-pack/plugins/fleet/storybook/manager.ts
+++ b/x-pack/plugins/fleet/storybook/manager.ts
@@ -13,7 +13,7 @@ addons.setConfig({
   theme: create({
     base: 'light',
     brandTitle: 'Kibana Fleet Storybook',
-    brandUrl: 'https://github.com/elastic/kibana/tree/master/x-pack/plugins/fleet',
+    brandUrl: 'https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet',
   }),
   showPanel: true.valueOf,
   selectedPanel: PANEL_ID,
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx b/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx
index b241147c8d675..99580adfed5bb 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx
@@ -172,7 +172,7 @@ To use the component your plugin needs to follow certain criteria:
 
 - Ensure `"infra"` and `"data"` are specified as a `requiredPlugins` in your plugin's `kibana.json`.
 - Ensure the `<LogStream />` component is mounted inside the hierachy of a [`kibana-react` provider](https://github.com/elastic/kibana/blob/b2d0aa7b7fae1c89c8f9e8854ae73e71be64e765/src/plugins/kibana_react/README.md#L45). At a minimum, the kibana-react provider must pass `http` (from core start services) and `data` (from core plugin start dependencies).
-- Ensure the `<LogStream />` component is mounted inside the hierachy of a [`EuiThemeProvider`](https://github.com/elastic/kibana/blob/master/src/plugins/kibana_react/common/eui_styled_components.tsx).
+- Ensure the `<LogStream />` component is mounted inside the hierachy of a [`EuiThemeProvider`](https://github.com/elastic/kibana/blob/main/src/plugins/kibana_react/common/eui_styled_components.tsx).
 
 ## Usage
 
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx b/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
index 2698e975cebca..eadb9d129c5a2 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream.tsx
@@ -105,7 +105,7 @@ export const LogStreamContent: React.FC<LogStreamContentProps> = ({
       `<LogStream /> cannot access kibana core services.
 
 Ensure the component is mounted within kibana-react's <KibanaContextProvider> hierarchy.
-Read more at https://github.com/elastic/kibana/blob/master/src/plugins/kibana_react/README.md"
+Read more at https://github.com/elastic/kibana/blob/main/src/plugins/kibana_react/README.md"
 `
     );
   }
diff --git a/x-pack/plugins/ingest_pipelines/README.md b/x-pack/plugins/ingest_pipelines/README.md
index dd7c130c7a72d..04cfc23cfbbff 100644
--- a/x-pack/plugins/ingest_pipelines/README.md
+++ b/x-pack/plugins/ingest_pipelines/README.md
@@ -13,7 +13,7 @@ It requires a Basic license and the following cluster privileges: `manage_pipeli
 
 A new app called Ingest Pipelines is registered in the Management section and follows a typical CRUD UI pattern. The client-side portion of this app lives in [public/application](public/application) and uses endpoints registered in [server/routes/api](server/routes/api). For more information on the pipeline processors editor component, check out the [component readme](public/application/components/pipeline_processors_editor/README.md).
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions on setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions on setting up your development environment.
 
 ### Test coverage
 
diff --git a/x-pack/plugins/lens/public/_mixins.scss b/x-pack/plugins/lens/public/_mixins.scss
index 7282de214636c..1ac02039faf42 100644
--- a/x-pack/plugins/lens/public/_mixins.scss
+++ b/x-pack/plugins/lens/public/_mixins.scss
@@ -50,16 +50,10 @@
 
 // Removes EUI focus ring
 @mixin removeEuiFocusRing {
-  @include kbnThemeStyle('v7') {
-    animation: none !important; // sass-lint:disable-line no-important
-  }
-
-  @include kbnThemeStyle('v8') {
-    outline: none;
+  outline: none;
 
-    &:focus-visible {
-      outline-style: none;
-    }
+  &:focus-visible {
+    outline-style: none;
   }
 }
 
@@ -69,23 +63,14 @@
 
   #{$target} {
     @include euiFocusBackground;
-
-    @include kbnThemeStyle('v7') {
-      @include euiFocusRing;
-    }
-
-    @include kbnThemeStyle('v8') {
-      outline: $euiFocusRingSize solid currentColor; // Safari & Firefox
-    }
+    outline: $euiFocusRingSize solid currentColor; // Safari & Firefox
   }
 
-  @include kbnThemeStyle('v8') {
-    &:focus-visible #{$target} {
-      outline-style: auto; // Chrome
-    }
+  &:focus-visible #{$target} {
+    outline-style: auto; // Chrome
+  }
 
-    &:not(:focus-visible) #{$target} {
-      outline: none;
-    }
+  &:not(:focus-visible) #{$target} {
+    outline: none;
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/lens/public/drag_drop/drag_drop.scss b/x-pack/plugins/lens/public/drag_drop/drag_drop.scss
index 5522b65fca261..814640ba515eb 100644
--- a/x-pack/plugins/lens/public/drag_drop/drag_drop.scss
+++ b/x-pack/plugins/lens/public/drag_drop/drag_drop.scss
@@ -20,15 +20,8 @@
   transform: translate(-12px, 8px);
   z-index: $lnsZLevel3;
   pointer-events: none;
-
-  @include kbnThemeStyle('v7') {
-    box-shadow: 0 0 0 $euiFocusRingSize $euiFocusRingColor;
-  }
-
-  @include kbnThemeStyle('v8') {
-    outline: $euiFocusRingSize solid currentColor; // Safari & Firefox
-    outline-style: auto; // Chrome
-  }
+  outline: $euiFocusRingSize solid currentColor; // Safari & Firefox
+  outline-style: auto; // Chrome
 }
 
 // Draggable item
@@ -211,4 +204,4 @@
   &.lnsDragDrop-incompatibleExtraDrop {
     color: $euiColorWarningText;
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
index 4c699ff899bba..343cd746ba2ac 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
@@ -104,10 +104,6 @@
   min-height: $euiSizeXXL - 2;
   word-break: break-word;
   font-weight: $euiFontWeightRegular;
-
-  @include kbnThemeStyle('v7') {
-    font-size: $euiFontSizeS;
-  }
 }
 
 .lnsLayerPanel__triggerTextLabel {
@@ -152,4 +148,4 @@
     @include passDownFocusRing('.lnsLayerPanel__triggerTextLabel');
     background-color: transparent;
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss
index e57455e5bd5ab..9a87f1ba46e94 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel_wrapper.scss
@@ -10,6 +10,7 @@
   height: 100%;
 
   .lnsWorkspacePanelWrapper__pageContentBody {
+    @include euiBottomShadowMedium;
     @include euiScrollBar;
     flex-grow: 1;
     display: flex;
@@ -19,14 +20,6 @@
     background: $euiColorEmptyShade;
     height: 100%;
 
-    @include kbnThemeStyle('v7') {
-      @include euiBottomShadowSmall;
-    }
-
-    @include kbnThemeStyle('v8') {
-      @include euiBottomShadowMedium;
-    }
-
     > * {
       flex: 1 1 100%;
       display: flex;
@@ -42,13 +35,7 @@
 }
 
 .lnsWorkspacePanel__dragDrop {
-  @include kbnThemeStyle('v7') {
-    border: $euiBorderThin;
-  }
-
-  @include kbnThemeStyle('v8') {
-    border: $euiBorderWidthThin solid transparent;
-  }
+  border: $euiBorderWidthThin solid transparent;
 
   &.lnsDragDrop-isDropTarget {
     @include lnsDroppable;
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.scss b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.scss
index 8b509e9c39b7b..d4c91f80317fd 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.scss
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.scss
@@ -54,9 +54,3 @@
   padding-top: 0;
   padding-bottom: 0;
 }
-
-.lnsIndexPatternDimensionEditor__warning {
-  @include kbnThemeStyle('v7') {
-    border: none;
-  }
-}
diff --git a/x-pack/plugins/maps/public/_mixins.scss b/x-pack/plugins/maps/public/_mixins.scss
index 914bc23c1163c..135d90b3a4c56 100644
--- a/x-pack/plugins/maps/public/_mixins.scss
+++ b/x-pack/plugins/maps/public/_mixins.scss
@@ -1,11 +1,4 @@
 @mixin mapToolbarButtonGroupBorderRadius {
-  @include kbnThemeStyle($theme: 'v7') {
-    border-radius: $euiBorderRadius;
-  }
-
-  @include kbnThemeStyle($theme: 'v8') {
-    border-radius: $euiBorderRadiusSmall;
-  }
-
+  border-radius: $euiBorderRadiusSmall;
   overflow: hidden;
 }
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.test.ts b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.test.ts
index f5e2a467c5e62..d8346fa8f5283 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.test.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.test.ts
@@ -17,25 +17,48 @@ const defaultParams = {
   origin: FIELD_ORIGIN.SOURCE,
 };
 
-describe('supportsFieldMeta', () => {
-  test('Non-counting aggregations should support field meta', () => {
+describe('supportsFieldMetaFromEs', () => {
+  test('Non-counting aggregations should support field meta from ES', () => {
     const avgMetric = new AggField({ ...defaultParams, aggType: AGG_TYPE.AVG });
-    expect(avgMetric.supportsFieldMeta()).toBe(true);
+    expect(avgMetric.supportsFieldMetaFromEs()).toBe(true);
     const maxMetric = new AggField({ ...defaultParams, aggType: AGG_TYPE.MAX });
-    expect(maxMetric.supportsFieldMeta()).toBe(true);
+    expect(maxMetric.supportsFieldMetaFromEs()).toBe(true);
     const minMetric = new AggField({ ...defaultParams, aggType: AGG_TYPE.MIN });
-    expect(minMetric.supportsFieldMeta()).toBe(true);
+    expect(minMetric.supportsFieldMetaFromEs()).toBe(true);
     const termsMetric = new AggField({ ...defaultParams, aggType: AGG_TYPE.TERMS });
-    expect(termsMetric.supportsFieldMeta()).toBe(true);
+    expect(termsMetric.supportsFieldMetaFromEs()).toBe(true);
   });
 
-  test('Counting aggregations should not support field meta', () => {
+  test('Counting aggregations should not support field meta from ES', () => {
     const sumMetric = new AggField({ ...defaultParams, aggType: AGG_TYPE.SUM });
-    expect(sumMetric.supportsFieldMeta()).toBe(false);
+    expect(sumMetric.supportsFieldMetaFromEs()).toBe(false);
     const uniqueCountMetric = new AggField({
       ...defaultParams,
       aggType: AGG_TYPE.UNIQUE_COUNT,
     });
-    expect(uniqueCountMetric.supportsFieldMeta()).toBe(false);
+    expect(uniqueCountMetric.supportsFieldMetaFromEs()).toBe(false);
+  });
+});
+
+describe('supportsFieldMetaFromLocalData', () => {
+  test('number metrics should support field meta from local', () => {
+    const avgMetric = new AggField({ ...defaultParams, aggType: AGG_TYPE.AVG });
+    expect(avgMetric.supportsFieldMetaFromLocalData()).toBe(true);
+    const maxMetric = new AggField({ ...defaultParams, aggType: AGG_TYPE.MAX });
+    expect(maxMetric.supportsFieldMetaFromLocalData()).toBe(true);
+    const minMetric = new AggField({ ...defaultParams, aggType: AGG_TYPE.MIN });
+    expect(minMetric.supportsFieldMetaFromLocalData()).toBe(true);
+    const sumMetric = new AggField({ ...defaultParams, aggType: AGG_TYPE.SUM });
+    expect(sumMetric.supportsFieldMetaFromLocalData()).toBe(true);
+    const uniqueCountMetric = new AggField({
+      ...defaultParams,
+      aggType: AGG_TYPE.UNIQUE_COUNT,
+    });
+    expect(uniqueCountMetric.supportsFieldMetaFromLocalData()).toBe(true);
+  });
+
+  test('Non number metrics should not support field meta from local', () => {
+    const termMetric = new AggField({ ...defaultParams, aggType: AGG_TYPE.TERMS });
+    expect(termMetric.supportsFieldMetaFromLocalData()).toBe(false);
   });
 });
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
index acfe6a9055eb6..aba25a6d0babf 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
@@ -30,6 +30,16 @@ export class AggField extends CountAggField {
     this._aggType = params.aggType;
   }
 
+  supportsFieldMetaFromEs(): boolean {
+    // count and sum aggregations are not within field bounds so they do not support field meta.
+    return !isMetricCountable(this._getAggType());
+  }
+
+  supportsFieldMetaFromLocalData(): boolean {
+    // Elasticsearch vector tile search API returns meta tiles with numeric aggregation metrics.
+    return this._getDataTypeSynchronous() === 'number';
+  }
+
   isValid(): boolean {
     return !!this._esDocField;
   }
@@ -38,11 +48,6 @@ export class AggField extends CountAggField {
     return this._source.isMvt() ? this.getName() + '.value' : this.getName();
   }
 
-  supportsFieldMeta(): boolean {
-    // count and sum aggregations are not within field bounds so they do not support field meta.
-    return !isMetricCountable(this._getAggType());
-  }
-
   canValueBeFormatted(): boolean {
     return this._getAggType() !== AGG_TYPE.UNIQUE_COUNT;
   }
@@ -73,10 +78,14 @@ export class AggField extends CountAggField {
         );
   }
 
-  async getDataType(): Promise<string> {
+  _getDataTypeSynchronous(): string {
     return this._getAggType() === AGG_TYPE.TERMS ? 'string' : 'number';
   }
 
+  async getDataType(): Promise<string> {
+    return this._getDataTypeSynchronous();
+  }
+
   getBucketCount(): number {
     // terms aggregation increases the overall number of buckets per split bucket
     return this._getAggType() === AGG_TYPE.TERMS ? TERMS_AGG_SHARD_SIZE : 0;
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts b/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts
index e54c846883c20..4ab2f1b211a30 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/agg_field_types.ts
@@ -19,5 +19,4 @@ export interface CountAggFieldParams {
   label?: string;
   source: IESAggSource;
   origin: FIELD_ORIGIN;
-  canReadFromGeoJson?: boolean;
 }
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.test.ts b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.test.ts
index c9970123c8095..5a9e4476507e0 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.test.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.test.ts
@@ -18,9 +18,9 @@ const defaultParams = {
   origin: FIELD_ORIGIN.SOURCE,
 };
 
-describe('supportsFieldMeta', () => {
+describe('supportsFieldMetaFromEs', () => {
   test('Counting aggregations should not support field meta', () => {
     const countMetric = new CountAggField({ ...defaultParams });
-    expect(countMetric.supportsFieldMeta()).toBe(false);
+    expect(countMetric.supportsFieldMetaFromEs()).toBe(false);
   });
 });
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
index b303dbc342bb2..d8301ccd35353 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
@@ -18,13 +18,20 @@ export class CountAggField implements IESAggField {
   protected readonly _source: IESAggSource;
   private readonly _origin: FIELD_ORIGIN;
   protected readonly _label?: string;
-  private readonly _canReadFromGeoJson: boolean;
 
-  constructor({ label, source, origin, canReadFromGeoJson = true }: CountAggFieldParams) {
+  constructor({ label, source, origin }: CountAggFieldParams) {
     this._source = source;
     this._origin = origin;
     this._label = label;
-    this._canReadFromGeoJson = canReadFromGeoJson;
+  }
+
+  supportsFieldMetaFromEs(): boolean {
+    return false;
+  }
+
+  supportsFieldMetaFromLocalData(): boolean {
+    // Elasticsearch vector tile search API returns meta tiles for aggregation metrics
+    return true;
   }
 
   _getAggType(): AGG_TYPE {
@@ -79,10 +86,6 @@ export class CountAggField implements IESAggField {
     return null;
   }
 
-  supportsFieldMeta(): boolean {
-    return false;
-  }
-
   getBucketCount() {
     return 0;
   }
@@ -103,14 +106,6 @@ export class CountAggField implements IESAggField {
     return null;
   }
 
-  supportsAutoDomain(): boolean {
-    return true;
-  }
-
-  canReadFromGeoJson(): boolean {
-    return this._canReadFromGeoJson;
-  }
-
   isEqual(field: IESAggField) {
     return field.getName() === this.getName();
   }
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/es_agg_factory.ts b/x-pack/plugins/maps/public/classes/fields/agg/es_agg_factory.ts
index 597cf2a0567d2..7e43a2a63658c 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/es_agg_factory.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/es_agg_factory.ts
@@ -18,8 +18,7 @@ import { PercentileAggField } from './percentile_agg_field';
 export function esAggFieldsFactory(
   aggDescriptor: AggDescriptor,
   source: IESAggSource,
-  origin: FIELD_ORIGIN,
-  canReadFromGeoJson: boolean = true
+  origin: FIELD_ORIGIN
 ): IESAggField[] {
   let aggField;
   if (aggDescriptor.type === AGG_TYPE.COUNT) {
@@ -27,7 +26,6 @@ export function esAggFieldsFactory(
       label: aggDescriptor.label,
       source,
       origin,
-      canReadFromGeoJson,
     });
   } else if (aggDescriptor.type === AGG_TYPE.PERCENTILE) {
     aggField = new PercentileAggField({
@@ -42,7 +40,6 @@ export function esAggFieldsFactory(
           : DEFAULT_PERCENTILE,
       source,
       origin,
-      canReadFromGeoJson,
     });
   } else {
     aggField = new AggField({
@@ -54,14 +51,13 @@ export function esAggFieldsFactory(
       aggType: aggDescriptor.type,
       source,
       origin,
-      canReadFromGeoJson,
     });
   }
 
   const aggFields: IESAggField[] = [aggField];
 
   if ('field' in aggDescriptor && aggDescriptor.type === AGG_TYPE.TERMS) {
-    aggFields.push(new TopTermPercentageField(aggField, canReadFromGeoJson));
+    aggFields.push(new TopTermPercentageField(aggField));
   }
 
   return aggFields;
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts
index 141f6aea5d301..4591b252de279 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/percentile_agg_field.ts
@@ -31,7 +31,12 @@ export class PercentileAggField extends AggField implements IESAggField {
     this._percentile = params.percentile;
   }
 
-  supportsFieldMeta(): boolean {
+  supportsFieldMetaFromEs(): boolean {
+    return true;
+  }
+
+  supportsFieldMetaFromLocalData(): boolean {
+    // Elasticsearch vector tile search API returns meta tiles for aggregation metrics
     return true;
   }
 
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts
index 227084bfe0cad..ccb1cae201548 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts
@@ -12,11 +12,18 @@ import { TOP_TERM_PERCENTAGE_SUFFIX, FIELD_ORIGIN } from '../../../../common/con
 
 export class TopTermPercentageField implements IESAggField {
   private readonly _topTermAggField: IESAggField;
-  private readonly _canReadFromGeoJson: boolean;
 
-  constructor(topTermAggField: IESAggField, canReadFromGeoJson: boolean = true) {
+  constructor(topTermAggField: IESAggField) {
     this._topTermAggField = topTermAggField;
-    this._canReadFromGeoJson = canReadFromGeoJson;
+  }
+
+  supportsFieldMetaFromEs(): boolean {
+    return false;
+  }
+
+  supportsFieldMetaFromLocalData(): boolean {
+    // Elasticsearch vector tile search API does not support top term metric
+    return false;
   }
 
   getSource(): IVectorSource {
@@ -64,15 +71,6 @@ export class TopTermPercentageField implements IESAggField {
   getBucketCount(): number {
     return 0;
   }
-
-  supportsAutoDomain(): boolean {
-    return this._canReadFromGeoJson;
-  }
-
-  supportsFieldMeta(): boolean {
-    return false;
-  }
-
   async getExtendedStatsFieldMetaRequest(): Promise<unknown | null> {
     return null;
   }
@@ -89,10 +87,6 @@ export class TopTermPercentageField implements IESAggField {
     return false;
   }
 
-  canReadFromGeoJson(): boolean {
-    return this._canReadFromGeoJson;
-  }
-
   isEqual(field: IESAggField) {
     return field.getName() === this.getName();
   }
diff --git a/x-pack/plugins/maps/public/classes/fields/ems_file_field.ts b/x-pack/plugins/maps/public/classes/fields/ems_file_field.ts
index 87119f32182de..9463f364ad953 100644
--- a/x-pack/plugins/maps/public/classes/fields/ems_file_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/ems_file_field.ts
@@ -26,6 +26,14 @@ export class EMSFileField extends AbstractField implements IField {
     this._source = source;
   }
 
+  supportsFieldMetaFromEs(): boolean {
+    return false;
+  }
+
+  supportsFieldMetaFromLocalData(): boolean {
+    return true;
+  }
+
   getSource(): IVectorSource {
     return this._source;
   }
diff --git a/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts b/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
index afddb34d2d0ec..b3f68da99d529 100644
--- a/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
@@ -16,22 +16,27 @@ import { IVectorSource } from '../sources/vector_source';
 
 export class ESDocField extends AbstractField implements IField {
   private readonly _source: IESSource;
-  private readonly _canReadFromGeoJson: boolean;
 
   constructor({
     fieldName,
     source,
     origin,
-    canReadFromGeoJson = true,
   }: {
     fieldName: string;
     source: IESSource;
     origin: FIELD_ORIGIN;
-    canReadFromGeoJson?: boolean;
   }) {
     super({ fieldName, origin });
     this._source = source;
-    this._canReadFromGeoJson = canReadFromGeoJson;
+  }
+
+  supportsFieldMetaFromEs(): boolean {
+    return true;
+  }
+
+  supportsFieldMetaFromLocalData(): boolean {
+    // Elasticsearch vector tile search API does not return meta tiles for documents
+    return !this.getSource().isMvt();
   }
 
   canValueBeFormatted(): boolean {
@@ -73,14 +78,6 @@ export class ESDocField extends AbstractField implements IField {
       : super.getLabel();
   }
 
-  supportsFieldMeta(): boolean {
-    return true;
-  }
-
-  canReadFromGeoJson(): boolean {
-    return this._canReadFromGeoJson;
-  }
-
   async getExtendedStatsFieldMetaRequest(): Promise<unknown | null> {
     const indexPatternField = await this._getIndexPatternField();
 
diff --git a/x-pack/plugins/maps/public/classes/fields/field.ts b/x-pack/plugins/maps/public/classes/fields/field.ts
index 014d75caf90b6..dcf6ac54dc836 100644
--- a/x-pack/plugins/maps/public/classes/fields/field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/field.ts
@@ -22,19 +22,22 @@ export interface IField {
   isValid(): boolean;
   getExtendedStatsFieldMetaRequest(): Promise<unknown | null>;
   getPercentilesFieldMetaRequest(percentiles: number[]): Promise<unknown | null>;
-  getCategoricalFieldMetaRequest(size: number): Promise<unknown>;
+  getCategoricalFieldMetaRequest(size: number): Promise<unknown | null>;
+
+  /*
+   * IField.supportsFieldMetaFromLocalData returns boolean indicating whether field value domain
+   * can be determined from local data
+   */
+  supportsFieldMetaFromLocalData(): boolean;
+
+  /*
+   * IField.supportsFieldMetaFromEs returns boolean indicating whether field value domain
+   * can be determined from Elasticsearch.
+   * When true, getExtendedStatsFieldMetaRequest, getPercentilesFieldMetaRequest, and getCategoricalFieldMetaRequest
+   * can not return null
+   */
+  supportsFieldMetaFromEs(): boolean;
 
-  // Whether Maps-app can automatically determine the domain of the field-values
-  // if this is not the case (e.g. for .mvt tiled data),
-  // then styling properties that require the domain to be known cannot use this property.
-  supportsAutoDomain(): boolean;
-
-  // Whether Maps-app can automatically determine the domain of the field-values
-  // _without_ having to retrieve the data as GeoJson
-  // e.g. for ES-sources, this would use the extended_stats API
-  supportsFieldMeta(): boolean;
-
-  canReadFromGeoJson(): boolean;
   isEqual(field: IField): boolean;
 }
 
@@ -47,6 +50,14 @@ export class AbstractField implements IField {
     this._origin = origin || FIELD_ORIGIN.SOURCE;
   }
 
+  supportsFieldMetaFromEs(): boolean {
+    throw new Error('must implement AbstractField#supportsFieldMetaFromEs');
+  }
+
+  supportsFieldMetaFromLocalData(): boolean {
+    throw new Error('must implement AbstractField#supportsFieldMetaFromLocalData');
+  }
+
   getName(): string {
     return this._fieldName;
   }
@@ -64,7 +75,7 @@ export class AbstractField implements IField {
   }
 
   getSource(): IVectorSource {
-    throw new Error('must implement Field#getSource');
+    throw new Error('must implement AbstractField#getSource');
   }
 
   isValid(): boolean {
@@ -88,10 +99,6 @@ export class AbstractField implements IField {
     return this._origin;
   }
 
-  supportsFieldMeta(): boolean {
-    return false;
-  }
-
   async getExtendedStatsFieldMetaRequest(): Promise<unknown> {
     return null;
   }
@@ -104,14 +111,6 @@ export class AbstractField implements IField {
     return null;
   }
 
-  supportsAutoDomain(): boolean {
-    return true;
-  }
-
-  canReadFromGeoJson(): boolean {
-    return true;
-  }
-
   isEqual(field: IField) {
     return this._origin === field.getOrigin() && this._fieldName === field.getName();
   }
diff --git a/x-pack/plugins/maps/public/classes/fields/inline_field.ts b/x-pack/plugins/maps/public/classes/fields/inline_field.ts
index 17892d122c539..1c81d1399f24b 100644
--- a/x-pack/plugins/maps/public/classes/fields/inline_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/inline_field.ts
@@ -29,6 +29,14 @@ export class InlineField<T extends IVectorSource> extends AbstractField implemen
     this._dataType = dataType;
   }
 
+  supportsFieldMetaFromEs(): boolean {
+    return false;
+  }
+
+  supportsFieldMetaFromLocalData(): boolean {
+    return true;
+  }
+
   getSource(): IVectorSource {
     return this._source;
   }
diff --git a/x-pack/plugins/maps/public/classes/fields/mvt_field.ts b/x-pack/plugins/maps/public/classes/fields/mvt_field.ts
index ed2955a1cc16f..7eff8943f42c1 100644
--- a/x-pack/plugins/maps/public/classes/fields/mvt_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/mvt_field.ts
@@ -30,6 +30,14 @@ export class MVTField extends AbstractField implements IField {
     this._type = type;
   }
 
+  supportsFieldMetaFromEs(): boolean {
+    return false;
+  }
+
+  supportsFieldMetaFromLocalData(): boolean {
+    return false;
+  }
+
   getMVTFieldDescriptor(): MVTFieldDescriptor {
     return {
       type: this._type,
@@ -54,12 +62,4 @@ export class MVTField extends AbstractField implements IField {
   async getLabel(): Promise<string> {
     return this.getName();
   }
-
-  supportsAutoDomain() {
-    return false;
-  }
-
-  canReadFromGeoJson(): boolean {
-    return false;
-  }
 }
diff --git a/x-pack/plugins/maps/public/classes/layers/create_basemap_layer_descriptor.ts b/x-pack/plugins/maps/public/classes/layers/create_basemap_layer_descriptor.ts
index 033b0de025ee1..d285d3a36f66a 100644
--- a/x-pack/plugins/maps/public/classes/layers/create_basemap_layer_descriptor.ts
+++ b/x-pack/plugins/maps/public/classes/layers/create_basemap_layer_descriptor.ts
@@ -13,7 +13,6 @@ import { getEMSSettings } from '../../kibana_services';
 import { KibanaTilemapSource } from '../sources/kibana_tilemap_source';
 import { TileLayer } from './tile_layer/tile_layer';
 import { VectorTileLayer } from './vector_tile_layer/vector_tile_layer';
-// @ts-expect-error
 import { EMSTMSSource } from '../sources/ems_tms_source';
 
 export function createBasemapLayerDescriptor(): LayerDescriptor | null {
diff --git a/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.test.ts b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.test.ts
index 16e36fff03f86..43cc69687ffb7 100644
--- a/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.test.ts
+++ b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.test.ts
@@ -8,7 +8,8 @@
 import { ITileLayerArguments, TileLayer } from './tile_layer';
 import { SOURCE_TYPES } from '../../../../common/constants';
 import { XYZTMSSourceDescriptor } from '../../../../common/descriptor_types';
-import { ITMSSource, AbstractTMSSource } from '../../sources/tms_source';
+import { AbstractSource } from '../../sources/source';
+import { ITMSSource } from '../../sources/tms_source';
 import { ILayer } from '../layer';
 
 const sourceDescriptor: XYZTMSSourceDescriptor = {
@@ -17,7 +18,7 @@ const sourceDescriptor: XYZTMSSourceDescriptor = {
   id: 'foobar',
 };
 
-class MockTileSource extends AbstractTMSSource implements ITMSSource {
+class MockTileSource extends AbstractSource implements ITMSSource {
   readonly _descriptor: XYZTMSSourceDescriptor;
   constructor(descriptor: XYZTMSSourceDescriptor) {
     super(descriptor, {});
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
index 675bacb10cde9..cd5ab99aeda56 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
@@ -820,65 +820,20 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
     mvtSourceLayer?: string,
     timesliceMaskConfig?: TimesliceMaskConfig
   ) {
+    const sourceId = this.getId();
     const pointLayerId = this._getMbPointLayerId();
     const symbolLayerId = this._getMbSymbolLayerId();
+    const textLayerId = this._getMbTextLayerId();
     const pointLayer = mbMap.getLayer(pointLayerId);
     const symbolLayer = mbMap.getLayer(symbolLayerId);
+    const textLayer = mbMap.getLayer(textLayerId);
 
-    // Point layers symbolized as circles require 2 mapbox layers because
-    // "circle" layers do not support "text" style properties
-    // Point layers symbolized as icons only contain a single mapbox layer.
-    let markerLayerId;
-    let textLayerId;
-    if (this.getCurrentStyle().arePointsSymbolizedAsCircles()) {
-      markerLayerId = pointLayerId;
-      textLayerId = this._getMbTextLayerId();
-      if (symbolLayer) {
-        mbMap.setLayoutProperty(symbolLayerId, 'visibility', 'none');
-      }
-      this._setMbCircleProperties(mbMap, mvtSourceLayer, timesliceMaskConfig);
-    } else {
-      markerLayerId = symbolLayerId;
-      textLayerId = symbolLayerId;
-      if (pointLayer) {
-        mbMap.setLayoutProperty(pointLayerId, 'visibility', 'none');
-        mbMap.setLayoutProperty(this._getMbTextLayerId(), 'visibility', 'none');
-      }
-      this._setMbSymbolProperties(mbMap, mvtSourceLayer, timesliceMaskConfig);
-    }
-
-    this.syncVisibilityWithMb(mbMap, markerLayerId);
-    mbMap.setLayerZoomRange(markerLayerId, this.getMinZoom(), this.getMaxZoom());
-    if (markerLayerId !== textLayerId) {
-      this.syncVisibilityWithMb(mbMap, textLayerId);
-      mbMap.setLayerZoomRange(textLayerId, this.getMinZoom(), this.getMaxZoom());
-    }
-  }
-
-  _setMbCircleProperties(
-    mbMap: MbMap,
-    mvtSourceLayer?: string,
-    timesliceMaskConfig?: TimesliceMaskConfig
-  ) {
-    const sourceId = this.getId();
-    const pointLayerId = this._getMbPointLayerId();
-    const pointLayer = mbMap.getLayer(pointLayerId);
-    if (!pointLayer) {
-      const mbLayer: MbLayer = {
-        id: pointLayerId,
-        type: 'circle',
-        source: sourceId,
-        paint: {},
-      };
-
-      if (mvtSourceLayer) {
-        mbLayer['source-layer'] = mvtSourceLayer;
-      }
-      mbMap.addLayer(mbLayer);
-    }
+    // Point layers require 2 mapbox layers
 
-    const textLayerId = this._getMbTextLayerId();
-    const textLayer = mbMap.getLayer(textLayerId);
+    //
+    // Create label layer
+    // label layer - "symbol" layer type for labels. Can not use same layer label and marker layers because of conflicting styling requirements
+    //
     if (!textLayer) {
       const mbLayer: MbLayer = {
         id: textLayerId,
@@ -891,62 +846,78 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
       mbMap.addLayer(mbLayer);
     }
 
-    const filterExpr = getPointFilterExpression(this.hasJoins(), timesliceMaskConfig);
-    if (!_.isEqual(filterExpr, mbMap.getFilter(pointLayerId))) {
-      mbMap.setFilter(pointLayerId, filterExpr);
-      mbMap.setFilter(textLayerId, filterExpr);
-    }
-
-    this.getCurrentStyle().setMBPaintPropertiesForPoints({
-      alpha: this.getAlpha(),
-      mbMap,
-      pointLayerId,
-    });
-
-    this.getCurrentStyle().setMBPropertiesForLabelText({
-      alpha: this.getAlpha(),
-      mbMap,
-      textLayerId,
-    });
-  }
-
-  _setMbSymbolProperties(
-    mbMap: MbMap,
-    mvtSourceLayer?: string,
-    timesliceMaskConfig?: TimesliceMaskConfig
-  ) {
-    const sourceId = this.getId();
-    const symbolLayerId = this._getMbSymbolLayerId();
-    const symbolLayer = mbMap.getLayer(symbolLayerId);
-
-    if (!symbolLayer) {
-      const mbLayer: MbLayer = {
-        id: symbolLayerId,
-        type: 'symbol',
-        source: sourceId,
-      };
-      if (mvtSourceLayer) {
-        mbLayer['source-layer'] = mvtSourceLayer;
+    //
+    // Create marker layer
+    // "circle" layer type for points
+    // "symbol" layer type for icons
+    //
+    let markerLayerId;
+    if (this.getCurrentStyle().arePointsSymbolizedAsCircles()) {
+      markerLayerId = pointLayerId;
+      if (!pointLayer) {
+        const mbLayer: MbLayer = {
+          id: pointLayerId,
+          type: 'circle',
+          source: sourceId,
+          paint: {},
+        };
+
+        if (mvtSourceLayer) {
+          mbLayer['source-layer'] = mvtSourceLayer;
+        }
+        mbMap.addLayer(mbLayer, textLayerId);
+      }
+      if (symbolLayer) {
+        mbMap.setLayoutProperty(symbolLayerId, 'visibility', 'none');
+      }
+    } else {
+      markerLayerId = symbolLayerId;
+      if (!symbolLayer) {
+        const mbLayer: MbLayer = {
+          id: symbolLayerId,
+          type: 'symbol',
+          source: sourceId,
+        };
+        if (mvtSourceLayer) {
+          mbLayer['source-layer'] = mvtSourceLayer;
+        }
+        mbMap.addLayer(mbLayer, textLayerId);
+      }
+      if (pointLayer) {
+        mbMap.setLayoutProperty(pointLayerId, 'visibility', 'none');
       }
-      mbMap.addLayer(mbLayer);
     }
 
     const filterExpr = getPointFilterExpression(this.hasJoins(), timesliceMaskConfig);
-    if (!_.isEqual(filterExpr, mbMap.getFilter(symbolLayerId))) {
-      mbMap.setFilter(symbolLayerId, filterExpr);
+    if (!_.isEqual(filterExpr, mbMap.getFilter(markerLayerId))) {
+      mbMap.setFilter(markerLayerId, filterExpr);
+      mbMap.setFilter(textLayerId, filterExpr);
     }
 
-    this.getCurrentStyle().setMBSymbolPropertiesForPoints({
-      alpha: this.getAlpha(),
-      mbMap,
-      symbolLayerId,
-    });
+    if (this.getCurrentStyle().arePointsSymbolizedAsCircles()) {
+      this.getCurrentStyle().setMBPaintPropertiesForPoints({
+        alpha: this.getAlpha(),
+        mbMap,
+        pointLayerId: markerLayerId,
+      });
+    } else {
+      this.getCurrentStyle().setMBSymbolPropertiesForPoints({
+        alpha: this.getAlpha(),
+        mbMap,
+        symbolLayerId: markerLayerId,
+      });
+    }
 
     this.getCurrentStyle().setMBPropertiesForLabelText({
       alpha: this.getAlpha(),
       mbMap,
-      textLayerId: symbolLayerId,
+      textLayerId,
     });
+
+    this.syncVisibilityWithMb(mbMap, markerLayerId);
+    mbMap.setLayerZoomRange(markerLayerId, this.getMinZoom(), this.getMaxZoom());
+    this.syncVisibilityWithMb(mbMap, textLayerId);
+    mbMap.setLayerZoomRange(textLayerId, this.getMinZoom(), this.getMaxZoom());
   }
 
   _setMbLinePolygonProperties(
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_tile_layer/vector_tile_layer.test.ts b/x-pack/plugins/maps/public/classes/layers/vector_tile_layer/vector_tile_layer.test.ts
index c15a0e1cf2fb8..d094e53c59a92 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_tile_layer/vector_tile_layer.test.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_tile_layer/vector_tile_layer.test.ts
@@ -8,7 +8,8 @@
 import { ITileLayerArguments } from '../tile_layer/tile_layer';
 import { SOURCE_TYPES } from '../../../../common/constants';
 import { DataFilters, XYZTMSSourceDescriptor } from '../../../../common/descriptor_types';
-import { ITMSSource, AbstractTMSSource } from '../../sources/tms_source';
+import { AbstractSource } from '../../sources/source';
+import { ITMSSource } from '../../sources/tms_source';
 import { ILayer } from '../layer';
 import { VectorTileLayer } from './vector_tile_layer';
 import { DataRequestContext } from '../../../actions';
@@ -19,7 +20,7 @@ const sourceDescriptor: XYZTMSSourceDescriptor = {
   id: 'mockSourceId',
 };
 
-class MockTileSource extends AbstractTMSSource implements ITMSSource {
+class MockTileSource extends AbstractSource implements ITMSSource {
   readonly _descriptor: XYZTMSSourceDescriptor;
   constructor(descriptor: XYZTMSSourceDescriptor) {
     super(descriptor, {});
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/create_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/create_source_editor.tsx
index 16e4986f4d8a6..569e0aee6df0f 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/create_source_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/create_source_editor.tsx
@@ -21,7 +21,7 @@ export class CreateSourceEditor extends Component<Props, State> {
   state: State = {};
 
   componentDidMount() {
-    this._onTileSelect({ id: null, isAutoSelect: true });
+    this._onTileSelect({ isAutoSelect: true });
   }
 
   _onTileSelect = (config: EmsTmsSourceConfig) => {
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.test.js b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.test.js
deleted file mode 100644
index 833e4b0fff95e..0000000000000
--- a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.test.js
+++ /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.
- */
-
-jest.mock('../../../kibana_services', () => {
-  return {
-    getEmsTileLayerId: () => {
-      return {
-        bright: 'road_map',
-        desaturated: 'road_map_desaturated',
-        dark: 'dark_map',
-      };
-    },
-  };
-});
-
-jest.mock('../../../util', () => {
-  return {
-    getEmsTmsServices: () => {
-      class MockTMSService {
-        constructor(config) {
-          this._config = config;
-        }
-        getMarkdownAttribution() {
-          return this._config.attributionMarkdown;
-        }
-        getId() {
-          return this._config.id;
-        }
-      }
-
-      return [
-        new MockTMSService({
-          id: 'road_map',
-          attributionMarkdown: '[foobar](http://foobar.org)  | [foobaz](http://foobaz.org)',
-        }),
-        new MockTMSService({
-          id: 'satellite',
-          attributionMarkdown: '[satellite](http://satellite.org)',
-        }),
-      ];
-    },
-  };
-});
-
-import { EMSTMSSource } from './ems_tms_source';
-
-describe('EMSTMSSource', () => {
-  it('should get attribution from markdown (tiles v2 legacy format)', async () => {
-    const emsTmsSource = new EMSTMSSource({
-      id: 'road_map',
-    });
-
-    const attributionProvider = emsTmsSource.getAttributionProvider();
-    const attributions = await attributionProvider();
-    expect(attributions).toEqual([
-      {
-        label: 'foobar',
-        url: 'http://foobar.org',
-      },
-      {
-        label: 'foobaz',
-        url: 'http://foobaz.org',
-      },
-    ]);
-  });
-});
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.js b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.tsx
similarity index 78%
rename from x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.js
rename to x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.tsx
index 2acb0578f6152..da36b9bf0b7e6 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.tsx
@@ -6,18 +6,21 @@
  */
 
 import React from 'react';
-import { AbstractTMSSource } from '../tms_source';
+import { Adapters } from 'src/plugins/inspector/public';
+import { i18n } from '@kbn/i18n';
+import { AbstractSource, SourceEditorArgs } from '../source';
+import { ITMSSource } from '../tms_source';
 import { getEmsTmsServices } from '../../../util';
 import { UpdateSourceEditor } from './update_source_editor';
-import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
 import { SOURCE_TYPES } from '../../../../common/constants';
+import { EMSTMSSourceDescriptor } from '../../../../common/descriptor_types';
 import { getEmsTileLayerId, getIsDarkMode, getEMSSettings } from '../../../kibana_services';
 import { registerSource } from '../source_registry';
 import { getEmsUnavailableMessage } from '../../../components/ems_unavailable_message';
 import { LICENSED_FEATURES } from '../../../licensed_features';
 
-function getErrorInfo(emsTileLayerId) {
+function getErrorInfo(emsTileLayerId: string) {
   return i18n.translate('xpack.maps.source.emsTile.unableToFindTileIdErrorMessage', {
     defaultMessage: `Unable to find EMS tile configuration for id: {id}. {info}`,
     values: { id: emsTileLayerId, info: getEmsUnavailableMessage() },
@@ -37,8 +40,8 @@ export function getSourceTitle() {
   }
 }
 
-export class EMSTMSSource extends AbstractTMSSource {
-  static createDescriptor(descriptor) {
+export class EMSTMSSource extends AbstractSource implements ITMSSource {
+  static createDescriptor(descriptor: Partial<EMSTMSSourceDescriptor>): EMSTMSSourceDescriptor {
     return {
       type: SOURCE_TYPES.EMS_TMS,
       id: descriptor.id,
@@ -51,12 +54,15 @@ export class EMSTMSSource extends AbstractTMSSource {
     };
   }
 
-  constructor(descriptor, inspectorAdapters) {
-    descriptor = EMSTMSSource.createDescriptor(descriptor);
-    super(descriptor, inspectorAdapters);
+  readonly _descriptor: EMSTMSSourceDescriptor;
+
+  constructor(descriptor: Partial<EMSTMSSourceDescriptor>, inspectorAdapters?: Adapters) {
+    const emsTmsDescriptor = EMSTMSSource.createDescriptor(descriptor);
+    super(emsTmsDescriptor, inspectorAdapters);
+    this._descriptor = emsTmsDescriptor;
   }
 
-  renderSourceSettingsEditor({ onChange }) {
+  renderSourceSettingsEditor({ onChange }: SourceEditorArgs) {
     return <UpdateSourceEditor onChange={onChange} config={this._descriptor} />;
   }
 
@@ -100,12 +106,12 @@ export class EMSTMSSource extends AbstractTMSSource {
     } catch (e) {
       throw new Error(`${getErrorInfo(emsTileLayerId)} - ${e.message}`);
     }
-    const tmsService = emsTMSServices.find((tmsService) => tmsService.getId() === emsTileLayerId);
-    if (tmsService) {
-      return tmsService;
+    const tmsService = emsTMSServices.find((service) => service.getId() === emsTileLayerId);
+    if (!tmsService) {
+      throw new Error(getErrorInfo(emsTileLayerId));
     }
 
-    throw new Error(getErrorInfo(emsTileLayerId));
+    return tmsService;
   }
 
   async getDisplayName() {
@@ -120,15 +126,11 @@ export class EMSTMSSource extends AbstractTMSSource {
   getAttributionProvider() {
     return async () => {
       const emsTMSService = await this._getEMSTMSService();
-      const markdown = emsTMSService.getMarkdownAttribution();
-      if (!markdown) {
-        return [];
-      }
-      return this.convertMarkdownLinkToObjectArr(markdown);
+      return emsTMSService.getAttributions();
     };
   }
 
-  async getUrlTemplate() {
+  async getUrlTemplate(): Promise<string> {
     const emsTMSService = await this._getEMSTMSService();
     return await emsTMSService.getUrlTemplate();
   }
@@ -137,13 +139,13 @@ export class EMSTMSSource extends AbstractTMSSource {
     return 'ems/' + this.getTileLayerId();
   }
 
-  async getVectorStyleSheetAndSpriteMeta(isRetina) {
+  async getVectorStyleSheetAndSpriteMeta(isRetina: boolean) {
     const emsTMSService = await this._getEMSTMSService();
     const styleSheet = await emsTMSService.getVectorStyleSheet();
     const spriteMeta = await emsTMSService.getSpriteSheetMeta(isRetina);
     return {
       vectorStyleSheet: styleSheet,
-      spriteMeta: spriteMeta,
+      spriteMeta,
     };
   }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/index.js b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/index.ts
similarity index 100%
rename from x-pack/plugins/maps/public/classes/sources/ems_tms_source/index.js
rename to x-pack/plugins/maps/public/classes/sources/ems_tms_source/index.ts
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/tile_service_select.tsx b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/tile_service_select.tsx
index 60c047b13bb7a..c2f86a2cdb161 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/tile_service_select.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/tile_service_select.tsx
@@ -9,15 +9,13 @@ import React, { ChangeEvent, Component } from 'react';
 import { EuiSelect, EuiSelectOption, EuiFormRow } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
+import { EMSTMSSourceDescriptor } from '../../../../common/descriptor_types';
 import { getEmsTmsServices } from '../../../util';
 import { getEmsUnavailableMessage } from '../../../components/ems_unavailable_message';
 
 const AUTO_SELECT = 'auto_select';
 
-export interface EmsTmsSourceConfig {
-  id: string | null;
-  isAutoSelect: boolean;
-}
+export type EmsTmsSourceConfig = Pick<EMSTMSSourceDescriptor, 'id' | 'isAutoSelect'>;
 
 interface Props {
   config?: EmsTmsSourceConfig;
@@ -72,7 +70,7 @@ export class TileServiceSelect extends Component<Props, State> {
     const value = e.target.value;
     const isAutoSelect = value === AUTO_SELECT;
     this.props.onTileSelect({
-      id: isAutoSelect ? null : value,
+      id: isAutoSelect ? undefined : value,
       isAutoSelect,
     });
   };
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/update_source_editor.tsx
similarity index 71%
rename from x-pack/plugins/maps/public/classes/sources/ems_tms_source/update_source_editor.js
rename to x-pack/plugins/maps/public/classes/sources/ems_tms_source/update_source_editor.tsx
index 1fc9addd1f08e..6e1d5d9660eea 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_tms_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/update_source_editor.tsx
@@ -8,10 +8,16 @@
 import React, { Fragment } from 'react';
 import { EuiTitle, EuiPanel, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { TileServiceSelect } from './tile_service_select';
+import { EmsTmsSourceConfig, TileServiceSelect } from './tile_service_select';
+import { OnSourceChangeArgs } from '../source';
 
-export function UpdateSourceEditor({ onChange, config }) {
-  const _onTileSelect = ({ id, isAutoSelect }) => {
+interface Props {
+  onChange: (...args: OnSourceChangeArgs[]) => Promise<void>;
+  config: EmsTmsSourceConfig;
+}
+
+export function UpdateSourceEditor({ onChange, config }: Props) {
+  const _onTileSelect = ({ id, isAutoSelect }: EmsTmsSourceConfig) => {
     onChange({ propName: 'id', value: id });
     onChange({ propName: 'isAutoSelect', value: isAutoSelect });
   };
diff --git a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
index dc9637c7a7637..419ba12ed9d26 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
@@ -30,7 +30,6 @@ export interface IESAggSource extends IESSource {
 
 export abstract class AbstractESAggSource extends AbstractESSource implements IESAggSource {
   private readonly _metricFields: IESAggField[];
-  private readonly _canReadFromGeoJson: boolean;
 
   static createDescriptor(
     descriptor: Partial<AbstractESAggSourceDescriptor>
@@ -44,23 +43,13 @@ export abstract class AbstractESAggSource extends AbstractESSource implements IE
     };
   }
 
-  constructor(
-    descriptor: AbstractESAggSourceDescriptor,
-    inspectorAdapters?: Adapters,
-    canReadFromGeoJson = true
-  ) {
+  constructor(descriptor: AbstractESAggSourceDescriptor, inspectorAdapters?: Adapters) {
     super(descriptor, inspectorAdapters);
     this._metricFields = [];
-    this._canReadFromGeoJson = canReadFromGeoJson;
     if (descriptor.metrics) {
       descriptor.metrics.forEach((aggDescriptor: AggDescriptor) => {
         this._metricFields.push(
-          ...esAggFieldsFactory(
-            aggDescriptor,
-            this,
-            this.getOriginForField(),
-            this._canReadFromGeoJson
-          )
+          ...esAggFieldsFactory(aggDescriptor, this, this.getOriginForField())
         );
       });
     }
@@ -89,12 +78,7 @@ export abstract class AbstractESAggSource extends AbstractESSource implements IE
     const metrics = this._metricFields.filter((esAggField) => esAggField.isValid());
     // Handle case where metrics is empty because older saved object state is empty array or there are no valid aggs.
     return metrics.length === 0
-      ? esAggFieldsFactory(
-          { type: AGG_TYPE.COUNT },
-          this,
-          this.getOriginForField(),
-          this._canReadFromGeoJson
-        )
+      ? esAggFieldsFactory({ type: AGG_TYPE.COUNT }, this, this.getOriginForField())
       : metrics;
   }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
index 777787d8213f3..88ccfafe6f28f 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
@@ -83,11 +83,7 @@ export class ESGeoGridSource extends AbstractESAggSource implements ITiledSingle
 
   constructor(descriptor: Partial<ESGeoGridSourceDescriptor>, inspectorAdapters?: Adapters) {
     const sourceDescriptor = ESGeoGridSource.createDescriptor(descriptor);
-    super(
-      sourceDescriptor,
-      inspectorAdapters,
-      descriptor.resolution !== GRID_RESOLUTION.SUPER_FINE
-    );
+    super(sourceDescriptor, inspectorAdapters);
     this._descriptor = sourceDescriptor;
   }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
index b2201a545d5cb..19a561caf094a 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx
@@ -85,7 +85,7 @@ export class ESGeoLineSource extends AbstractESAggSource {
 
   constructor(descriptor: Partial<ESGeoLineSourceDescriptor>, inspectorAdapters?: Adapters) {
     const sourceDescriptor = ESGeoLineSource.createDescriptor(descriptor);
-    super(sourceDescriptor, inspectorAdapters, true);
+    super(sourceDescriptor, inspectorAdapters);
     this._descriptor = sourceDescriptor;
   }
 
@@ -140,7 +140,6 @@ export class ESGeoLineSource extends AbstractESAggSource {
       fieldName: this._descriptor.splitField,
       source: this,
       origin: FIELD_ORIGIN.SOURCE,
-      canReadFromGeoJson: true,
     });
   }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
index aad377ef53649..baee5b78f75f3 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
@@ -152,20 +152,4 @@ describe('ESSearchSource', () => {
       );
     });
   });
-
-  describe('getFields', () => {
-    it('default', () => {
-      const esSearchSource = new ESSearchSource(mockDescriptor);
-      const docField = esSearchSource.createField({ fieldName: 'prop1' });
-      expect(docField.canReadFromGeoJson()).toBe(true);
-    });
-    it('mvt', () => {
-      const esSearchSource = new ESSearchSource({
-        ...mockDescriptor,
-        scalingType: SCALING_TYPES.MVT,
-      });
-      const docField = esSearchSource.createField({ fieldName: 'prop1' });
-      expect(docField.canReadFromGeoJson()).toBe(false);
-    });
-  });
 });
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
index 31cc07d03549a..5a08db3656136 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
@@ -154,7 +154,6 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
       fieldName,
       source: this,
       origin: FIELD_ORIGIN.SOURCE,
-      canReadFromGeoJson: this._descriptor.scalingType !== SCALING_TYPES.MVT,
     });
   }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/extract_attributions.test.ts b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/extract_attributions.test.ts
new file mode 100644
index 0000000000000..f8f7618b9cfc0
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/extract_attributions.test.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.
+ */
+
+import { extractAttributions } from './extract_attributions';
+
+test('Should extract attributions from markdown', () => {
+  const markdown =
+    '[OpenStreetMap contributors](https://www.openstreetmap.org/copyright)|[OpenMapTiles](https://openmaptiles.org)|[Elastic Maps Service](https://www.elastic.co/elastic-maps-service)';
+  const attributions = extractAttributions(markdown);
+  expect(attributions).toEqual([
+    {
+      label: 'OpenStreetMap contributors',
+      url: 'https://www.openstreetmap.org/copyright',
+    },
+    {
+      label: 'OpenMapTiles',
+      url: 'https://openmaptiles.org',
+    },
+    {
+      label: 'Elastic Maps Service',
+      url: 'https://www.elastic.co/elastic-maps-service',
+    },
+  ]);
+});
diff --git a/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/extract_attributions.ts b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/extract_attributions.ts
new file mode 100644
index 0000000000000..86268f5c8c5cf
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/extract_attributions.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 { Attribution } from '../../../../common/descriptor_types';
+
+export function extractAttributions(markdown: string): Attribution[] {
+  const attributions: Attribution[] = [];
+  markdown.split('|').forEach((attribution: string) => {
+    attribution = attribution.trim();
+    // this assumes attribution is plain markdown link
+    const extractLink = /\[(.*)\]\((.*)\)/;
+    const result = extractLink.exec(attribution);
+    if (result && result?.length >= 3 && result[1] && result[2]) {
+      attributions.push({
+        label: result[1],
+        url: result[2],
+      });
+    }
+  });
+  return attributions;
+}
diff --git a/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/kibana_tilemap_source.js b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/kibana_tilemap_source.js
index cceb3ddd1fcc0..db0b5359ca56e 100644
--- a/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/kibana_tilemap_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/kibana_tilemap_source.js
@@ -5,19 +5,20 @@
  * 2.0.
  */
 
-import { AbstractTMSSource } from '../tms_source';
+import { AbstractSource } from '../source';
 import { getKibanaTileMap } from '../../../util';
 import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
 import _ from 'lodash';
 import { SOURCE_TYPES } from '../../../../common/constants';
 import { registerSource } from '../source_registry';
+import { extractAttributions } from './extract_attributions';
 
 export const sourceTitle = i18n.translate('xpack.maps.source.kbnTMSTitle', {
   defaultMessage: 'Configured Tile Map Service',
 });
 
-export class KibanaTilemapSource extends AbstractTMSSource {
+export class KibanaTilemapSource extends AbstractSource {
   static type = SOURCE_TYPES.KIBANA_TILEMAP;
 
   static createDescriptor() {
@@ -57,8 +58,7 @@ export class KibanaTilemapSource extends AbstractTMSSource {
     return async () => {
       const tilemap = getKibanaTileMap();
       const markdown = _.get(tilemap, 'options.attribution', '');
-      const objArr = this.convertMarkdownLinkToObjectArr(markdown);
-      return objArr;
+      return extractAttributions(markdown);
     };
   }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/tms_source/index.ts b/x-pack/plugins/maps/public/classes/sources/tms_source/index.ts
index cc416cc94027b..b3d88670469b1 100644
--- a/x-pack/plugins/maps/public/classes/sources/tms_source/index.ts
+++ b/x-pack/plugins/maps/public/classes/sources/tms_source/index.ts
@@ -5,4 +5,8 @@
  * 2.0.
  */
 
-export * from './tms_source';
+import { ISource } from '../source';
+
+export interface ITMSSource extends ISource {
+  getUrlTemplate(): Promise<string>;
+}
diff --git a/x-pack/plugins/maps/public/classes/sources/tms_source/tms_source.d.ts b/x-pack/plugins/maps/public/classes/sources/tms_source/tms_source.d.ts
deleted file mode 100644
index edd335fd5507b..0000000000000
--- a/x-pack/plugins/maps/public/classes/sources/tms_source/tms_source.d.ts
+++ /dev/null
@@ -1,16 +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 { AbstractSource, ISource } from '../source';
-
-export interface ITMSSource extends ISource {
-  getUrlTemplate(): Promise<string>;
-}
-
-export class AbstractTMSSource extends AbstractSource implements ITMSSource {
-  getUrlTemplate(): Promise<string>;
-}
diff --git a/x-pack/plugins/maps/public/classes/sources/tms_source/tms_source.js b/x-pack/plugins/maps/public/classes/sources/tms_source/tms_source.js
deleted file mode 100644
index 9b45e77468db6..0000000000000
--- a/x-pack/plugins/maps/public/classes/sources/tms_source/tms_source.js
+++ /dev/null
@@ -1,27 +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 { AbstractSource } from '../source';
-
-export class AbstractTMSSource extends AbstractSource {
-  async getUrlTemplate() {
-    throw new Error('Should implement TMSSource#getUrlTemplate');
-  }
-
-  convertMarkdownLinkToObjectArr(markdown) {
-    return markdown.split('|').map((attribution) => {
-      attribution = attribution.trim();
-      //this assumes attribution is plain markdown link
-      const extractLink = /\[(.*)\]\((.*)\)/;
-      const result = extractLink.exec(attribution);
-      return {
-        label: result ? result[1] : null,
-        url: result ? result[2] : null,
-      };
-    });
-  }
-}
diff --git a/x-pack/plugins/maps/public/classes/sources/wms_source/wms_source.js b/x-pack/plugins/maps/public/classes/sources/wms_source/wms_source.js
index 0077602c9e00b..b884785d348aa 100644
--- a/x-pack/plugins/maps/public/classes/sources/wms_source/wms_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/wms_source/wms_source.js
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AbstractTMSSource } from '../tms_source';
+import { AbstractSource } from '../source';
 import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel, getUrlLabel } from '../../../../common/i18n_getters';
 import { WmsClient } from './wms_client';
@@ -16,7 +16,7 @@ export const sourceTitle = i18n.translate('xpack.maps.source.wmsTitle', {
   defaultMessage: 'Web Map Service',
 });
 
-export class WMSSource extends AbstractTMSSource {
+export class WMSSource extends AbstractSource {
   static type = SOURCE_TYPES.WMS;
 
   static createDescriptor({ serviceUrl, layers, styles }) {
diff --git a/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_source.ts b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_source.ts
index 4dd81b77668f4..01f77e4a45c38 100644
--- a/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_source.ts
@@ -9,16 +9,16 @@ import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel, getUrlLabel } from '../../../../common/i18n_getters';
 import { SOURCE_TYPES } from '../../../../common/constants';
 import { registerSource } from '../source_registry';
-import { AbstractTMSSource } from '../tms_source';
+import { ITMSSource } from '../tms_source';
 import { XYZTMSSourceDescriptor } from '../../../../common/descriptor_types';
-import { ImmutableSourceProperty } from '../source';
+import { AbstractSource, ImmutableSourceProperty } from '../source';
 import { XYZTMSSourceConfig } from './xyz_tms_editor';
 
 export const sourceTitle = i18n.translate('xpack.maps.source.ems_xyzTitle', {
   defaultMessage: 'Tile Map Service',
 });
 
-export class XYZTMSSource extends AbstractTMSSource {
+export class XYZTMSSource extends AbstractSource implements ITMSSource {
   static type = SOURCE_TYPES.EMS_XYZ;
 
   readonly _descriptor: XYZTMSSourceDescriptor;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/categorical_data_mapping_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/categorical_data_mapping_popover.tsx
index 3fb36364bee4c..ee2cabb7c0794 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/categorical_data_mapping_popover.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/categorical_data_mapping_popover.tsx
@@ -15,6 +15,7 @@ import { FieldMetaOptions } from '../../../../../../common/descriptor_types';
 interface Props<DynamicOptions> {
   fieldMetaOptions: FieldMetaOptions;
   onChange: (updatedOptions: DynamicOptions) => void;
+  supportsFieldMetaFromLocalData: boolean;
 }
 
 export function CategoricalDataMappingPopover<DynamicOptions>(props: Props<DynamicOptions>) {
@@ -38,6 +39,7 @@ export function CategoricalDataMappingPopover<DynamicOptions>(props: Props<Dynam
             })}
             checked={props.fieldMetaOptions.isEnabled}
             onChange={onIsEnabledChange}
+            disabled={!props.supportsFieldMetaFromLocalData}
             compressed
           />{' '}
           <EuiToolTip
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/ordinal_data_mapping_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/ordinal_data_mapping_popover.tsx
index 628a5aac5c070..f9fa5be10a23e 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/ordinal_data_mapping_popover.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/ordinal_data_mapping_popover.tsx
@@ -81,6 +81,7 @@ interface Props<DynamicOptions> {
   onChange: (updatedOptions: DynamicOptions) => void;
   dataMappingFunction: DATA_MAPPING_FUNCTION;
   supportedDataMappingFunctions: DATA_MAPPING_FUNCTION[];
+  supportsFieldMetaFromLocalData: boolean;
 }
 
 export function OrdinalDataMappingPopover<DynamicOptions>(props: Props<DynamicOptions>) {
@@ -167,6 +168,7 @@ export function OrdinalDataMappingPopover<DynamicOptions>(props: Props<DynamicOp
               })}
               checked={props.fieldMetaOptions.isEnabled}
               onChange={onIsEnabledChange}
+              disabled={!props.supportsFieldMetaFromLocalData}
               compressed
             />{' '}
             <EuiToolTip
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/dynamic_icon_form.js b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/dynamic_icon_form.js
index 2ed42f84776f1..c7d6928884183 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/dynamic_icon_form.js
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/dynamic_icon_form.js
@@ -45,7 +45,7 @@ export function DynamicIconForm({
         {...styleOptions}
         styleProperty={styleProperty}
         onChange={onIconMapChange}
-        isCustomOnly={!field.supportsAutoDomain()}
+        isCustomOnly={!field.supportsFieldMetaFromLocalData() && !field.supportsFieldMetaFromEs()}
       />
     );
   }
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx
index 4ec4948170c9c..b89f4ee0b2aa0 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx
@@ -28,7 +28,11 @@ jest.mock('../../../../kibana_services', () => {
   };
 });
 
-class MockField extends AbstractField {}
+class MockField extends AbstractField {
+  supportsFieldMetaFromLocalData(): boolean {
+    return true;
+  }
+}
 
 function createLayerMock(numFields: number, supportedShapeTypes: VECTOR_SHAPE_TYPE[]) {
   const fields: IField[] = [];
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap
index 5b43c5fb95560..58af4d009e43a 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap
@@ -16,6 +16,7 @@ exports[`renderDataMappingPopover Should render OrdinalDataMappingPopover 1`] =
       "PERCENTILES",
     ]
   }
+  supportsFieldMetaFromLocalData={true}
 />
 `;
 
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
index 9aaa71a11f8f1..e0ccb80273c9d 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
@@ -18,6 +18,7 @@ import { Feature, Point } from 'geojson';
 import { DynamicColorProperty } from './dynamic_color_property';
 import {
   COLOR_MAP_TYPE,
+  FIELD_ORIGIN,
   RawValue,
   DATA_MAPPING_FUNCTION,
   VECTOR_STYLES,
@@ -291,17 +292,27 @@ describe('supportsFieldMeta', () => {
     expect(styleProp.supportsFieldMeta()).toEqual(true);
   });
 
-  test('should not support fieldMeta when field does not support fieldMeta', () => {
-    const field = Object.create(mockField);
-    field.supportsFieldMeta = function () {
-      return false;
-    };
-
-    const dynamicStyleOptions = {
+  test('should not support fieldMeta when field does not support fieldMeta from ES', () => {
+    const field = {
+      supportsFieldMetaFromEs() {
+        return false;
+      },
+    } as unknown as IField;
+    const layer = {} as unknown as IVectorLayer;
+    const options = {
       type: COLOR_MAP_TYPE.ORDINAL,
-      fieldMetaOptions,
+      fieldMetaOptions: { isEnabled: true },
     };
-    const styleProp = makeProperty(dynamicStyleOptions, undefined, field);
+
+    const styleProp = new DynamicColorProperty(
+      options,
+      VECTOR_STYLES.LINE_COLOR,
+      field,
+      layer,
+      () => {
+        return (value: RawValue) => value + '_format';
+      }
+    );
 
     expect(styleProp.supportsFieldMeta()).toEqual(false);
   });
@@ -382,12 +393,50 @@ describe('get mapbox color expression (via internal _getMbColor)', () => {
         expect(colorProperty._getMbColor()).toBeNull();
       });
       test('should return mapbox expression for color ramp', async () => {
-        const dynamicStyleOptions = {
+        const field = {
+          getMbFieldName: () => {
+            return 'foobar';
+          },
+          getName: () => {
+            return 'foobar';
+          },
+          getOrigin: () => {
+            return FIELD_ORIGIN.SOURCE;
+          },
+          supportsFieldMetaFromEs: () => {
+            return true;
+          },
+          getSource: () => {
+            return {
+              isMvt: () => {
+                return false;
+              },
+            };
+          },
+        } as unknown as IField;
+        const options = {
           type: COLOR_MAP_TYPE.ORDINAL,
           color: 'Blues',
-          fieldMetaOptions,
+          fieldMetaOptions: { isEnabled: true },
         };
-        const colorProperty = makeProperty(dynamicStyleOptions);
+
+        const colorProperty = new DynamicColorProperty(
+          options,
+          VECTOR_STYLES.LINE_COLOR,
+          field,
+          {} as unknown as IVectorLayer,
+          () => {
+            return (value: RawValue) => value + '_format';
+          }
+        );
+        colorProperty.getRangeFieldMeta = () => {
+          return {
+            min: 0,
+            max: 100,
+            delta: 100,
+          };
+        };
+
         expect(colorProperty._getMbColor()).toEqual([
           'interpolate',
           ['linear'],
@@ -445,17 +494,40 @@ describe('get mapbox color expression (via internal _getMbColor)', () => {
         expect(colorProperty._getMbColor()).toBeNull();
       });
 
-      test('should use `feature-state` by default', async () => {
-        const dynamicStyleOptions = {
+      test('should use `feature-state` for geojson source', async () => {
+        const field = {
+          getMbFieldName: () => {
+            return 'foobar';
+          },
+          getSource: () => {
+            return {
+              isMvt: () => {
+                return false;
+              },
+            };
+          },
+        } as unknown as IField;
+        const layer = {} as unknown as IVectorLayer;
+        const options = {
           type: COLOR_MAP_TYPE.ORDINAL,
           useCustomColorRamp: true,
           customColorRamp: [
             { stop: 10, color: '#f7faff' },
             { stop: 100, color: '#072f6b' },
           ],
-          fieldMetaOptions,
+          fieldMetaOptions: { isEnabled: true },
         };
-        const colorProperty = makeProperty(dynamicStyleOptions);
+
+        const colorProperty = new DynamicColorProperty(
+          options,
+          VECTOR_STYLES.LINE_COLOR,
+          field,
+          layer,
+          () => {
+            return (value: RawValue) => value + '_format';
+          }
+        );
+
         expect(colorProperty._getMbColor()).toEqual([
           'step',
           [
@@ -476,21 +548,40 @@ describe('get mapbox color expression (via internal _getMbColor)', () => {
         ]);
       });
 
-      test('should use `get` when source cannot return raw geojson', async () => {
-        const field = Object.create(mockField);
-        field.canReadFromGeoJson = function () {
-          return false;
-        };
-        const dynamicStyleOptions = {
+      test('should use `get` for MVT source', async () => {
+        const field = {
+          getMbFieldName: () => {
+            return 'foobar';
+          },
+          getSource: () => {
+            return {
+              isMvt: () => {
+                return true;
+              },
+            };
+          },
+        } as unknown as IField;
+        const layer = {} as unknown as IVectorLayer;
+        const options = {
           type: COLOR_MAP_TYPE.ORDINAL,
           useCustomColorRamp: true,
           customColorRamp: [
             { stop: 10, color: '#f7faff' },
             { stop: 100, color: '#072f6b' },
           ],
-          fieldMetaOptions,
+          fieldMetaOptions: { isEnabled: true },
         };
-        const colorProperty = makeProperty(dynamicStyleOptions, undefined, field);
+
+        const colorProperty = new DynamicColorProperty(
+          options,
+          VECTOR_STYLES.LINE_COLOR,
+          field,
+          layer,
+          () => {
+            return (value: RawValue) => value + '_format';
+          }
+        );
+
         expect(colorProperty._getMbColor()).toEqual([
           'step',
           [
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx
index bff053fc469a0..cfb5d54720ce7 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx
@@ -101,7 +101,7 @@ export class DynamicColorProperty extends DynamicStyleProperty<ColorDynamicOptio
   }
 
   supportsFieldMeta() {
-    if (!this.isComplete() || !this._field || !this._field.supportsFieldMeta()) {
+    if (!this.isComplete() || !this._field || !this._field.supportsFieldMetaFromEs()) {
       return false;
     }
 
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.test.tsx
index 107cf430113dc..4e6b8ea73beae 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.test.tsx
@@ -14,13 +14,10 @@ jest.mock('../components/vector_style_editor', () => ({
 import React from 'react';
 import { shallow } from 'enzyme';
 
-// @ts-ignore
 import { DynamicSizeProperty } from './dynamic_size_property';
-import { RawValue, VECTOR_STYLES } from '../../../../../common/constants';
+import { FIELD_ORIGIN, RawValue, VECTOR_STYLES } from '../../../../../common/constants';
 import { IField } from '../../../fields/field';
 import type { Map as MbMap } from '@kbn/mapbox-gl';
-import { SizeDynamicOptions } from '../../../../../common/descriptor_types';
-import { mockField, MockLayer, MockStyle } from './test_helpers/test_util';
 import { IVectorLayer } from '../../../layers/vector_layer';
 
 export class MockMbMap {
@@ -38,31 +35,40 @@ export class MockMbMap {
   }
 }
 
-const makeProperty = (
-  options: SizeDynamicOptions,
-  mockStyle: MockStyle,
-  field: IField = mockField
-) => {
-  return new DynamicSizeProperty(
-    options,
-    VECTOR_STYLES.ICON_SIZE,
-    field,
-    new MockLayer(mockStyle) as unknown as IVectorLayer,
-    () => {
-      return (value: RawValue) => value + '_format';
-    },
-    false
-  );
-};
-
-const fieldMetaOptions = { isEnabled: true };
-
 describe('renderLegendDetailRow', () => {
   test('Should render as range', async () => {
-    const sizeProp = makeProperty(
-      { minSize: 0, maxSize: 10, fieldMetaOptions },
-      new MockStyle({ min: 0, max: 100 })
+    const field = {
+      getLabel: async () => {
+        return 'foobar_label';
+      },
+      getName: () => {
+        return 'foodbar';
+      },
+      getOrigin: () => {
+        return FIELD_ORIGIN.SOURCE;
+      },
+      supportsFieldMetaFromEs: () => {
+        return true;
+      },
+    } as unknown as IField;
+    const sizeProp = new DynamicSizeProperty(
+      { minSize: 0, maxSize: 10, fieldMetaOptions: { isEnabled: true } },
+      VECTOR_STYLES.ICON_SIZE,
+      field,
+      {} as unknown as IVectorLayer,
+      () => {
+        return (value: RawValue) => value + '_format';
+      },
+      false
     );
+    sizeProp.getRangeFieldMeta = () => {
+      return {
+        min: 0,
+        max: 100,
+        delta: 100,
+      };
+    };
+
     const legendRow = sizeProp.renderLegendDetailRow();
     const component = shallow(legendRow);
 
@@ -76,10 +82,47 @@ describe('renderLegendDetailRow', () => {
 
 describe('syncSize', () => {
   test('Should sync with circle-radius prop', async () => {
-    const sizeProp = makeProperty(
-      { minSize: 8, maxSize: 32, fieldMetaOptions },
-      new MockStyle({ min: 0, max: 100 })
+    const field = {
+      isValid: () => {
+        return true;
+      },
+      getName: () => {
+        return 'foodbar';
+      },
+      getMbFieldName: () => {
+        return 'foobar';
+      },
+      getOrigin: () => {
+        return FIELD_ORIGIN.SOURCE;
+      },
+      getSource: () => {
+        return {
+          isMvt: () => {
+            return false;
+          },
+        };
+      },
+      supportsFieldMetaFromEs: () => {
+        return true;
+      },
+    } as unknown as IField;
+    const sizeProp = new DynamicSizeProperty(
+      { minSize: 8, maxSize: 32, fieldMetaOptions: { isEnabled: true } },
+      VECTOR_STYLES.ICON_SIZE,
+      field,
+      {} as unknown as IVectorLayer,
+      () => {
+        return (value: RawValue) => value + '_format';
+      },
+      false
     );
+    sizeProp.getRangeFieldMeta = () => {
+      return {
+        min: 0,
+        max: 100,
+        delta: 100,
+      };
+    };
     const mockMbMap = new MockMbMap() as unknown as MbMap;
 
     sizeProp.syncCircleRadiusWithMb('foobar', mockMbMap);
@@ -112,10 +155,47 @@ describe('syncSize', () => {
   });
 
   test('Should truncate interpolate expression to max when no delta', async () => {
-    const sizeProp = makeProperty(
-      { minSize: 8, maxSize: 32, fieldMetaOptions },
-      new MockStyle({ min: 100, max: 100 })
+    const field = {
+      isValid: () => {
+        return true;
+      },
+      getName: () => {
+        return 'foobar';
+      },
+      getMbFieldName: () => {
+        return 'foobar';
+      },
+      getOrigin: () => {
+        return FIELD_ORIGIN.SOURCE;
+      },
+      getSource: () => {
+        return {
+          isMvt: () => {
+            return false;
+          },
+        };
+      },
+      supportsFieldMetaFromEs: () => {
+        return true;
+      },
+    } as unknown as IField;
+    const sizeProp = new DynamicSizeProperty(
+      { minSize: 8, maxSize: 32, fieldMetaOptions: { isEnabled: true } },
+      VECTOR_STYLES.ICON_SIZE,
+      field,
+      {} as unknown as IVectorLayer,
+      () => {
+        return (value: RawValue) => value + '_format';
+      },
+      false
     );
+    sizeProp.getRangeFieldMeta = () => {
+      return {
+        min: 100,
+        max: 100,
+        delta: 0,
+      };
+    };
     const mockMbMap = new MockMbMap() as unknown as MbMap;
 
     sizeProp.syncCircleRadiusWithMb('foobar', mockMbMap);
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
index 54e3744472fa1..adf92a307a552 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
@@ -260,7 +260,7 @@ export class DynamicStyleProperty<T>
   }
 
   supportsFieldMeta() {
-    return this.isComplete() && !!this._field && this._field.supportsFieldMeta();
+    return this.isComplete() && !!this._field && this._field.supportsFieldMetaFromEs();
   }
 
   async getFieldMetaRequest() {
@@ -287,7 +287,7 @@ export class DynamicStyleProperty<T>
   }
 
   supportsMbFeatureState() {
-    return !!this._field && this._field.canReadFromGeoJson();
+    return !!this._field && !this._field.getSource().isMvt();
   }
 
   getMbLookupFunction(): MB_LOOKUP_FUNCTION {
@@ -466,13 +466,14 @@ export class DynamicStyleProperty<T>
   }
 
   renderDataMappingPopover(onChange: (updatedOptions: Partial<T>) => void) {
-    if (!this.supportsFieldMeta()) {
+    if (!this._field || !this.supportsFieldMeta()) {
       return null;
     }
     return this.isCategorical() ? (
       <CategoricalDataMappingPopover<T>
         fieldMetaOptions={this.getFieldMetaOptions()}
         onChange={onChange}
+        supportsFieldMetaFromLocalData={this._field.supportsFieldMetaFromLocalData()}
       />
     ) : (
       <OrdinalDataMappingPopover<T>
@@ -481,6 +482,7 @@ export class DynamicStyleProperty<T>
         onChange={onChange}
         dataMappingFunction={this.getDataMappingFunction()}
         supportedDataMappingFunctions={this._getSupportedDataMappingFunctions()}
+        supportsFieldMetaFromLocalData={this._field.supportsFieldMetaFromLocalData()}
       />
     );
   }
@@ -502,7 +504,7 @@ export class DynamicStyleProperty<T>
       // They just re-use the original property-name
       targetName = this._field.getName();
     } else {
-      if (this._field.canReadFromGeoJson() && this._field.supportsAutoDomain()) {
+      if (!this._field.getSource().isMvt() && this._field.supportsFieldMetaFromLocalData()) {
         // Geojson-sources can support rewrite
         // e.g. field-formatters will create duplicate field
         targetName = getComputedFieldName(this.getStyleName(), this._field.getName());
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_text_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_text_property.test.tsx
index 2b90292ccc75a..1dce8934e325d 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_text_property.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_text_property.test.tsx
@@ -18,7 +18,7 @@ import { DynamicTextProperty } from './dynamic_text_property';
 import { RawValue, VECTOR_STYLES } from '../../../../../common/constants';
 import { IField } from '../../../fields/field';
 import type { Map as MbMap } from '@kbn/mapbox-gl';
-import { mockField, MockLayer, MockStyle } from './test_helpers/test_util';
+import { MockLayer, MockStyle } from './test_helpers/test_util';
 import { IVectorLayer } from '../../../layers/vector_layer';
 
 export class MockMbMap {
@@ -49,22 +49,37 @@ export class MockMbMap {
   }
 }
 
-const makeProperty = (mockStyle: MockStyle, field: IField | null) => {
-  return new DynamicTextProperty(
-    {},
-    VECTOR_STYLES.LABEL_TEXT,
-    field,
-    new MockLayer(mockStyle) as unknown as IVectorLayer,
-    () => {
-      return (value: RawValue) => value + '_format';
-    }
-  );
-};
-
 describe('syncTextFieldWithMb', () => {
   describe('with field', () => {
-    test('Should set', async () => {
-      const dynamicTextProperty = makeProperty(new MockStyle({ min: 0, max: 100 }), mockField);
+    test('Should set text-field', async () => {
+      const field = {
+        isValid: () => {
+          return true;
+        },
+        getName: () => {
+          return 'foobar';
+        },
+        getSource: () => {
+          return {
+            isMvt: () => {
+              return false;
+            },
+          };
+        },
+        supportsFieldMetaFromLocalData: () => {
+          return true;
+        },
+      } as unknown as IField;
+      const dynamicTextProperty = new DynamicTextProperty(
+        {},
+        VECTOR_STYLES.LABEL_TEXT,
+        field,
+        new MockLayer(new MockStyle({ min: 0, max: 100 })) as unknown as IVectorLayer,
+        () => {
+          return (value: RawValue) => value + '_format';
+        }
+      );
+
       const mockMbMap = new MockMbMap() as unknown as MbMap;
 
       dynamicTextProperty.syncTextFieldWithMb('foobar', mockMbMap);
@@ -77,8 +92,17 @@ describe('syncTextFieldWithMb', () => {
   });
 
   describe('without field', () => {
-    test('Should clear', async () => {
-      const dynamicTextProperty = makeProperty(new MockStyle({ min: 0, max: 100 }), null);
+    test('Should clear text-field', async () => {
+      const dynamicTextProperty = new DynamicTextProperty(
+        {},
+        VECTOR_STYLES.LABEL_TEXT,
+        null,
+        new MockLayer(new MockStyle({ min: 0, max: 100 })) as unknown as IVectorLayer,
+        () => {
+          return (value: RawValue) => value + '_format';
+        }
+      );
+
       const mockMbMap = new MockMbMap([
         'foobar',
         ['coalesce', ['get', '__kbn__dynamic__foobar__labelText'], ''],
@@ -90,14 +114,22 @@ describe('syncTextFieldWithMb', () => {
       expect(mockMbMap.getPaintPropertyCalls()).toEqual([['foobar', undefined]]);
     });
 
-    test('Should not clear when already cleared', async () => {
+    test('Should not set or clear text-field', async () => {
       // This verifies a weird edge-case in mapbox-gl, where setting the `text-field` layout-property to null causes tiles to be invalidated.
       // This triggers a refetch of the tile during panning and zooming
       // This affects vector-tile rendering in tiled_vector_layers with custom vector_styles
       // It does _not_ affect EMS, since that does not have a code-path where a `text-field` need to be resynced.
       // Do not remove this logic without verifying that mapbox-gl does not re-issue tile-requests for previously requested tiles
 
-      const dynamicTextProperty = makeProperty(new MockStyle({ min: 0, max: 100 }), null);
+      const dynamicTextProperty = new DynamicTextProperty(
+        {},
+        VECTOR_STYLES.LABEL_TEXT,
+        null,
+        new MockLayer(new MockStyle({ min: 0, max: 100 })) as unknown as IVectorLayer,
+        () => {
+          return (value: RawValue) => value + '_format';
+        }
+      );
       const mockMbMap = new MockMbMap(undefined) as unknown as MbMap;
 
       dynamicTextProperty.syncTextFieldWithMb('foobar', mockMbMap);
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/test_helpers/test_util.ts b/x-pack/plugins/maps/public/classes/styles/vector/properties/test_helpers/test_util.ts
index ff2811f2b3df0..9d6560ecb8888 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/test_helpers/test_util.ts
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/test_helpers/test_util.ts
@@ -19,22 +19,22 @@ import { IStyle } from '../../../style';
 
 export class MockField extends AbstractField {
   private readonly _dataType: string;
-  private readonly _supportsAutoDomain: boolean;
+  private readonly _supportsFieldMetaFromLocalData: boolean;
 
   constructor({
     fieldName,
     origin = FIELD_ORIGIN.SOURCE,
     dataType = 'string',
-    supportsAutoDomain = true,
+    supportsFieldMetaFromLocalData = true,
   }: {
     fieldName: string;
     origin?: FIELD_ORIGIN;
     dataType?: string;
-    supportsAutoDomain?: boolean;
+    supportsFieldMetaFromLocalData?: boolean;
   }) {
     super({ fieldName, origin });
     this._dataType = dataType;
-    this._supportsAutoDomain = supportsAutoDomain;
+    this._supportsFieldMetaFromLocalData = supportsFieldMetaFromLocalData;
   }
 
   async getLabel(): Promise<string> {
@@ -45,11 +45,11 @@ export class MockField extends AbstractField {
     return this._dataType;
   }
 
-  supportsAutoDomain(): boolean {
-    return this._supportsAutoDomain;
+  supportsFieldMetaFromLocalData(): boolean {
+    return this._supportsFieldMetaFromLocalData;
   }
 
-  supportsFieldMeta(): boolean {
+  supportsFieldMetaFromEs(): boolean {
     return true;
   }
 }
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.test.ts b/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.test.ts
index 4407620f09ce5..2b9d37fdba78b 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.test.ts
+++ b/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.test.ts
@@ -7,45 +7,76 @@
 
 import { FIELD_ORIGIN, VECTOR_STYLES } from '../../../../common/constants';
 import { createStyleFieldsHelper, StyleFieldsHelper } from './style_fields_helper';
-import { AbstractField, IField } from '../../fields/field';
-
-class MockField extends AbstractField {
-  private readonly _dataType: string;
-  private readonly _supportsAutoDomain: boolean;
-  constructor({ dataType, supportsAutoDomain }: { dataType: string; supportsAutoDomain: boolean }) {
-    super({ fieldName: 'foobar_' + dataType, origin: FIELD_ORIGIN.SOURCE });
-    this._dataType = dataType;
-    this._supportsAutoDomain = supportsAutoDomain;
-  }
-  async getDataType() {
-    return this._dataType;
-  }
-
-  supportsAutoDomain(): boolean {
-    return this._supportsAutoDomain;
-  }
-}
+import { IField } from '../../fields/field';
 
 describe('StyleFieldHelper', () => {
   describe('isFieldDataTypeCompatibleWithStyleType', () => {
-    async function createHelper(supportsAutoDomain: boolean): Promise<{
+    async function createHelper(supportsFieldMetaFromLocalData: boolean): Promise<{
       styleFieldHelper: StyleFieldsHelper;
       stringField: IField;
       numberField: IField;
       dateField: IField;
     }> {
-      const stringField = new MockField({
-        dataType: 'string',
-        supportsAutoDomain,
-      });
-      const numberField = new MockField({
-        dataType: 'number',
-        supportsAutoDomain,
-      });
-      const dateField = new MockField({
-        dataType: 'date',
-        supportsAutoDomain,
-      });
+      const stringField = {
+        getDataType: async () => {
+          return 'string';
+        },
+        getLabel: async () => {
+          return 'foobar_string_label';
+        },
+        getName: () => {
+          return 'foobar_string';
+        },
+        getOrigin: () => {
+          return FIELD_ORIGIN.SOURCE;
+        },
+        supportsFieldMetaFromLocalData: () => {
+          return supportsFieldMetaFromLocalData;
+        },
+        supportsFieldMetaFromEs: () => {
+          return false;
+        },
+      } as unknown as IField;
+      const numberField = {
+        getDataType: async () => {
+          return 'number';
+        },
+        getLabel: async () => {
+          return 'foobar_number_label';
+        },
+        getName: () => {
+          return 'foobar_number';
+        },
+        getOrigin: () => {
+          return FIELD_ORIGIN.SOURCE;
+        },
+        supportsFieldMetaFromLocalData: () => {
+          return supportsFieldMetaFromLocalData;
+        },
+        supportsFieldMetaFromEs: () => {
+          return false;
+        },
+      } as unknown as IField;
+      const dateField = {
+        getDataType: async () => {
+          return 'date';
+        },
+        getLabel: async () => {
+          return 'foobar_date_label';
+        },
+        getName: () => {
+          return 'foobar_date';
+        },
+        getOrigin: () => {
+          return FIELD_ORIGIN.SOURCE;
+        },
+        supportsFieldMetaFromLocalData: () => {
+          return supportsFieldMetaFromLocalData;
+        },
+        supportsFieldMetaFromEs: () => {
+          return false;
+        },
+      } as unknown as IField;
       return {
         styleFieldHelper: await createStyleFieldsHelper([stringField, numberField, dateField]),
         stringField,
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.ts b/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.ts
index 125d6bd9cb3c2..9a1cb67c7bfd9 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.ts
+++ b/x-pack/plugins/maps/public/classes/styles/vector/style_fields_helper.ts
@@ -28,7 +28,7 @@ export async function createStyleFieldsHelper(fields: IField[]): Promise<StyleFi
       name: field.getName(),
       origin: field.getOrigin(),
       type: await field.getDataType(),
-      supportsAutoDomain: field.supportsAutoDomain(),
+      supportsAutoDomain: field.supportsFieldMetaFromLocalData() || field.supportsFieldMetaFromEs(),
     };
   });
   const styleFields = await Promise.all(promises);
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js
index 9057d0dfd5c7f..33125019ecc0b 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js
+++ b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js
@@ -107,11 +107,27 @@ describe('getDescriptorWithUpdatedStyleProps', () => {
       const vectorStyle = new VectorStyle({ properties }, new MockSource());
 
       const nextFields = [
-        new MockField({
-          fieldName: previousFieldName,
-          dataType: 'number',
-          supportsAutoDomain: false,
-        }),
+        {
+          getDataType: async () => {
+            return 'number';
+          },
+          getLabel: async () => {
+            return previousFieldName + '_label';
+          },
+          getName: () => {
+            return previousFieldName;
+          },
+          getOrigin: () => {
+            return FIELD_ORIGIN.SOURCE;
+          },
+          // ordinal field must support auto domain
+          supportsFieldMetaFromLocalData: () => {
+            return false;
+          },
+          supportsFieldMetaFromEs: () => {
+            return false;
+          },
+        },
       ];
       const { hasChanges, nextStyleDescriptor } =
         await vectorStyle.getDescriptorWithUpdatedStyleProps(nextFields, previousFields, mapColors);
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
index 058ee0db08d35..0f17cfb18446a 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
@@ -865,8 +865,6 @@ export class VectorStyle implements IVectorStyle {
     mbMap: MbMap;
     textLayerId: string;
   }) {
-    mbMap.setLayoutProperty(textLayerId, 'icon-allow-overlap', true);
-    mbMap.setLayoutProperty(textLayerId, 'text-allow-overlap', true);
     this._labelStyleProperty.syncTextFieldWithMb(textLayerId, mbMap);
     this._labelColorStyleProperty.syncLabelColorWithMb(textLayerId, mbMap, alpha);
     this._labelSizeStyleProperty.syncLabelSizeWithMb(textLayerId, mbMap);
@@ -885,6 +883,7 @@ export class VectorStyle implements IVectorStyle {
   }) {
     mbMap.setLayoutProperty(symbolLayerId, 'icon-ignore-placement', true);
     mbMap.setPaintProperty(symbolLayerId, 'icon-opacity', alpha);
+    mbMap.setLayoutProperty(symbolLayerId, 'icon-allow-overlap', true);
 
     this._iconStyleProperty.syncIconWithMb(
       symbolLayerId,
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/_toolbar_overlay.scss b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/_toolbar_overlay.scss
index 511de91e964b9..b929582c2479e 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/_toolbar_overlay.scss
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/_toolbar_overlay.scss
@@ -10,17 +10,6 @@
   position: relative;
   transition: transform $euiAnimSpeedNormal ease-in-out, background $euiAnimSpeedNormal ease-in-out;
 
-  @include kbnThemeStyle($theme: 'v7') {
-    // Overrides the .euiPanel default border
-    // sass-lint:disable-block no-important
-    border: none !important;
-
-    // Overrides the .euiPanel--hasShadow
-    &.euiPanel.euiPanel--hasShadow {
-      @include euiBottomShadowLarge;
-    }
-  }
-
   .euiButtonIcon:not(.euiButtonIcon--fill) {
     color: $euiTextColor !important;
   }
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx
index 9dd4c5c42cca7..8b7109d87a866 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx
@@ -7,6 +7,7 @@
 
 import React, { FC, Fragment, useEffect, useState } from 'react';
 import { EuiCallOut, EuiFormRow, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
+import { isEqual } from 'lodash';
 // @ts-ignore no declaration
 import { LEFT_ALIGNMENT, CENTER_ALIGNMENT, SortableProperties } from '@elastic/eui/lib/services';
 import { i18n } from '@kbn/i18n';
@@ -90,167 +91,182 @@ export const AnalysisFieldsTable: FC<{
   tableItems: FieldSelectionItem[];
   unsupportedFieldsError?: string;
   setUnsupportedFieldsError: React.Dispatch<React.SetStateAction<any>>;
-}> = ({
-  dependentVariable,
-  includes,
-  setFormState,
-  minimumFieldsRequiredMessage,
-  setMinimumFieldsRequiredMessage,
-  tableItems,
-  unsupportedFieldsError,
-  setUnsupportedFieldsError,
-}) => {
-  const [sortableProperties, setSortableProperties] = useState();
-  const [currentPaginationData, setCurrentPaginationData] = useState<{
-    pageIndex: number;
-    itemsPerPage: number;
-  }>({ pageIndex: 0, itemsPerPage: 5 });
+}> = React.memo(
+  ({
+    dependentVariable,
+    includes,
+    setFormState,
+    minimumFieldsRequiredMessage,
+    setMinimumFieldsRequiredMessage,
+    tableItems,
+    unsupportedFieldsError,
+    setUnsupportedFieldsError,
+  }) => {
+    const [sortableProperties, setSortableProperties] = useState();
+    const [currentPaginationData, setCurrentPaginationData] = useState<{
+      pageIndex: number;
+      itemsPerPage: number;
+    }>({ pageIndex: 0, itemsPerPage: 5 });
 
-  useEffect(() => {
-    if (includes.length === 0 && tableItems.length > 0) {
-      const includedFields: string[] = [];
-      tableItems.forEach((field) => {
-        if (field.is_included === true) {
-          includedFields.push(field.name);
-        }
-      });
-      setFormState({ includes: includedFields });
-    } else if (includes.length > 0) {
-      setFormState({ includes });
-    }
-    setMinimumFieldsRequiredMessage(undefined);
-  }, [tableItems]);
-
-  useEffect(() => {
-    let sortablePropertyItems = [];
-    const defaultSortProperty = 'name';
-
-    sortablePropertyItems = [
-      {
-        name: 'name',
-        getValue: (item: any) => item.name.toLowerCase(),
-        isAscending: true,
-      },
-      {
-        name: 'is_included',
-        getValue: (item: any) => item.is_included,
-        isAscending: true,
-      },
-      {
-        name: 'is_required',
-        getValue: (item: any) => item.is_required,
-        isAscending: true,
-      },
-    ];
-    const sortableProps = new SortableProperties(sortablePropertyItems, defaultSortProperty);
+    useEffect(() => {
+      if (includes.length === 0 && tableItems.length > 0) {
+        const includedFields: string[] = [];
+        tableItems.forEach((field) => {
+          if (field.is_included === true) {
+            includedFields.push(field.name);
+          }
+        });
+        setFormState({ includes: includedFields });
+      } else if (includes.length > 0) {
+        setFormState({
+          includes:
+            dependentVariable && includes.includes(dependentVariable)
+              ? includes
+              : [...includes, dependentVariable],
+        });
+      }
+      setMinimumFieldsRequiredMessage(undefined);
+    }, [tableItems]);
 
-    setSortableProperties(sortableProps);
-  }, []);
+    useEffect(() => {
+      let sortablePropertyItems = [];
+      const defaultSortProperty = 'name';
 
-  const filters = [
-    {
-      type: 'field_value_toggle_group',
-      field: 'is_included',
-      items: [
+      sortablePropertyItems = [
         {
-          value: true,
-          name: i18n.translate('xpack.ml.dataframe.analytics.create.isIncludedOption', {
-            defaultMessage: 'Is included',
-          }),
+          name: 'name',
+          getValue: (item: any) => item.name.toLowerCase(),
+          isAscending: true,
         },
         {
-          value: false,
-          name: i18n.translate('xpack.ml.dataframe.analytics.create.isNotIncludedOption', {
-            defaultMessage: 'Is not included',
-          }),
+          name: 'is_included',
+          getValue: (item: any) => item.is_included,
+          isAscending: true,
         },
-      ],
-    },
-  ];
+        {
+          name: 'is_required',
+          getValue: (item: any) => item.is_required,
+          isAscending: true,
+        },
+      ];
+      const sortableProps = new SortableProperties(sortablePropertyItems, defaultSortProperty);
 
-  return (
-    <Fragment>
-      <EuiFormRow
-        data-test-subj="mlAnalyticsCreateJobWizardIncludesTable"
-        label={i18n.translate('xpack.ml.dataframe.analytics.create.includedFieldsLabel', {
-          defaultMessage: 'Included fields',
-        })}
-        fullWidth
-        isInvalid={
-          minimumFieldsRequiredMessage !== undefined || unsupportedFieldsError !== undefined
-        }
-        error={[
-          ...(minimumFieldsRequiredMessage !== undefined ? [minimumFieldsRequiredMessage] : []),
-          ...(unsupportedFieldsError !== undefined
-            ? [
-                i18n.translate('xpack.ml.dataframe.analytics.create.unsupportedFieldsError', {
-                  defaultMessage: 'Invalid. {message}',
-                  values: { message: unsupportedFieldsError },
-                }),
-              ]
-            : []),
-        ]}
-      >
-        <Fragment />
-      </EuiFormRow>
-      {tableItems.length > 0 && minimumFieldsRequiredMessage === undefined && (
-        <EuiText size="xs">
-          {i18n.translate('xpack.ml.dataframe.analytics.create.includedFieldsCount', {
-            defaultMessage:
-              '{numFields, plural, one {# field} other {# fields}} included in the analysis',
-            values: { numFields: includes.length },
-          })}
-        </EuiText>
-      )}
-      {tableItems.length === 0 && (
-        <EuiCallOut
-          title={i18n.translate('xpack.ml.dataframe.analytics.create.calloutTitle', {
-            defaultMessage: 'Analysis fields not available',
+      setSortableProperties(sortableProps);
+    }, []);
+
+    const filters = [
+      {
+        type: 'field_value_toggle_group',
+        field: 'is_included',
+        items: [
+          {
+            value: true,
+            name: i18n.translate('xpack.ml.dataframe.analytics.create.isIncludedOption', {
+              defaultMessage: 'Is included',
+            }),
+          },
+          {
+            value: false,
+            name: i18n.translate('xpack.ml.dataframe.analytics.create.isNotIncludedOption', {
+              defaultMessage: 'Is not included',
+            }),
+          },
+        ],
+      },
+    ];
+
+    return (
+      <Fragment>
+        <EuiFormRow
+          data-test-subj="mlAnalyticsCreateJobWizardIncludesTable"
+          label={i18n.translate('xpack.ml.dataframe.analytics.create.includedFieldsLabel', {
+            defaultMessage: 'Included fields',
           })}
+          fullWidth
+          isInvalid={
+            minimumFieldsRequiredMessage !== undefined || unsupportedFieldsError !== undefined
+          }
+          error={[
+            ...(minimumFieldsRequiredMessage !== undefined ? [minimumFieldsRequiredMessage] : []),
+            ...(unsupportedFieldsError !== undefined
+              ? [
+                  i18n.translate('xpack.ml.dataframe.analytics.create.unsupportedFieldsError', {
+                    defaultMessage: 'Invalid. {message}',
+                    values: { message: unsupportedFieldsError },
+                  }),
+                ]
+              : []),
+          ]}
         >
-          <FormattedMessage
-            id="xpack.ml.dataframe.analytics.create.calloutMessage"
-            defaultMessage="Additional data required to load analysis fields."
-          />
-        </EuiCallOut>
-      )}
-      {tableItems.length > 0 && (
-        <EuiPanel paddingSize="m" data-test-subj="mlAnalyticsCreateJobWizardIncludesSelect">
-          <CustomSelectionTable
-            currentPage={currentPaginationData.pageIndex}
-            data-test-subj="mlAnalyticsCreationAnalysisFieldsTable"
-            checkboxDisabledCheck={checkboxDisabledCheck}
-            columns={columns}
-            filters={filters}
-            items={tableItems}
-            itemsPerPage={currentPaginationData.itemsPerPage}
-            onTableChange={(selection: string[]) => {
-              // dependent variable must always be in includes
-              if (
-                dependentVariable !== undefined &&
-                dependentVariable !== '' &&
-                selection.length === 0
-              ) {
-                selection = [dependentVariable];
-              }
-              // If includes is empty show minimum fields required message and don't update form yet
-              if (selection.length === 0) {
-                setMinimumFieldsRequiredMessage(minimumFieldsMessage);
-                setUnsupportedFieldsError(undefined);
-              } else {
-                setMinimumFieldsRequiredMessage(undefined);
-                setFormState({ includes: selection });
-              }
-            }}
-            selectedIds={includes}
-            setCurrentPaginationData={setCurrentPaginationData}
-            singleSelection={false}
-            sortableProperties={sortableProperties}
-            tableItemId={'name'}
-          />
-        </EuiPanel>
-      )}
-      <EuiSpacer />
-    </Fragment>
-  );
-};
+          <Fragment />
+        </EuiFormRow>
+        {tableItems.length > 0 && minimumFieldsRequiredMessage === undefined && (
+          <EuiText size="xs">
+            {i18n.translate('xpack.ml.dataframe.analytics.create.includedFieldsCount', {
+              defaultMessage:
+                '{numFields, plural, one {# field} other {# fields}} included in the analysis',
+              values: { numFields: includes.length },
+            })}
+          </EuiText>
+        )}
+        {tableItems.length === 0 && (
+          <EuiCallOut
+            title={i18n.translate('xpack.ml.dataframe.analytics.create.calloutTitle', {
+              defaultMessage: 'Analysis fields not available',
+            })}
+          >
+            <FormattedMessage
+              id="xpack.ml.dataframe.analytics.create.calloutMessage"
+              defaultMessage="Additional data required to load analysis fields."
+            />
+          </EuiCallOut>
+        )}
+        {tableItems.length > 0 && (
+          <EuiPanel paddingSize="m" data-test-subj="mlAnalyticsCreateJobWizardIncludesSelect">
+            <CustomSelectionTable
+              currentPage={currentPaginationData.pageIndex}
+              data-test-subj="mlAnalyticsCreationAnalysisFieldsTable"
+              checkboxDisabledCheck={checkboxDisabledCheck}
+              columns={columns}
+              filters={filters}
+              items={tableItems}
+              itemsPerPage={currentPaginationData.itemsPerPage}
+              onTableChange={(selection: string[]) => {
+                // dependent variable must always be in includes
+                if (
+                  dependentVariable !== undefined &&
+                  dependentVariable !== '' &&
+                  selection.length === 0
+                ) {
+                  selection = [dependentVariable];
+                }
+                // If includes is empty show minimum fields required message and don't update form yet
+                if (selection.length === 0) {
+                  setMinimumFieldsRequiredMessage(minimumFieldsMessage);
+                  setUnsupportedFieldsError(undefined);
+                } else {
+                  setMinimumFieldsRequiredMessage(undefined);
+                  setFormState({ includes: selection });
+                }
+              }}
+              selectedIds={includes}
+              setCurrentPaginationData={setCurrentPaginationData}
+              singleSelection={false}
+              sortableProperties={sortableProperties}
+              tableItemId={'name'}
+            />
+          </EuiPanel>
+        )}
+        <EuiSpacer />
+      </Fragment>
+    );
+  },
+  (prevProps, nextProps) => {
+    return (
+      prevProps.dependentVariable === nextProps.dependentVariable &&
+      isEqual(prevProps.includes, nextProps.includes) &&
+      isEqual(prevProps.tableItems, nextProps.tableItems) &&
+      prevProps.unsupportedFieldsError === nextProps.unsupportedFieldsError
+    );
+  }
+);
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
index df42c5b8eb1ca..9bf751eec797f 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
@@ -88,7 +88,6 @@ function getRuntimeDepVarOptions(jobType: AnalyticsJobType, runtimeMappings: Run
     if (isRuntimeField(field) && shouldAddAsDepVarOption(id, field.type, jobType)) {
       runtimeOptions.push({
         label: id,
-        key: `runtime_mapping_${id}`,
       });
     }
   });
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
index 9137ce42a465c..c49653c5a75c5 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
@@ -144,7 +144,7 @@ export const validateNumTopFeatureImportanceValues = (
 };
 
 export const validateAdvancedEditor = (state: State): State => {
-  const { jobIdEmpty, jobIdValid, jobIdExists, jobType, createIndexPattern, includes } = state.form;
+  const { jobIdEmpty, jobIdValid, jobIdExists, jobType, createIndexPattern } = state.form;
   const { jobConfig } = state;
 
   state.advancedEditorMessages = [];
@@ -160,6 +160,8 @@ export const validateAdvancedEditor = (state: State): State => {
   const destinationIndexPatternTitleExists =
     state.indexPatternsMap[destinationIndexName] !== undefined;
 
+  const analyzedFields = jobConfig?.analyzed_fields?.includes || [];
+
   const resultsFieldEmptyString =
     typeof jobConfig?.dest?.results_field === 'string' &&
     jobConfig?.dest?.results_field.trim() === '';
@@ -189,12 +191,10 @@ export const validateAdvancedEditor = (state: State): State => {
   ) {
     const dependentVariableName = getDependentVar(jobConfig.analysis) || '';
     dependentVariableEmpty = dependentVariableName === '';
-
     if (
       !dependentVariableEmpty &&
-      includes !== undefined &&
-      includes.length > 0 &&
-      !includes.includes(dependentVariableName)
+      analyzedFields.length > 0 &&
+      !analyzedFields.includes(dependentVariableName)
     ) {
       includesValid = false;
 
diff --git a/x-pack/plugins/ml/readme.md b/x-pack/plugins/ml/readme.md
index 8425054d3f648..79ba88e67be8b 100644
--- a/x-pack/plugins/ml/readme.md
+++ b/x-pack/plugins/ml/readme.md
@@ -146,11 +146,11 @@ and Kibana instance that the tests will be run against.
 You can find the ML shared functions in the following files in GitHub:
 
 ```
-https://github.com/elastic/kibana/blob/master/x-pack/plugins/ml/public/shared.ts
+https://github.com/elastic/kibana/blob/main/x-pack/plugins/ml/public/shared.ts
 ```
 
 ```
-https://github.com/elastic/kibana/blob/master/x-pack/plugins/ml/server/shared.ts
+https://github.com/elastic/kibana/blob/main/x-pack/plugins/ml/server/shared.ts
 ```
 
 These functions are shared from the root of the ML plugin, you can import them with an import statement. For example:
diff --git a/x-pack/plugins/monitoring/public/alerts/status.tsx b/x-pack/plugins/monitoring/public/alerts/status.tsx
index a29d85d43c578..28c2ebcce2513 100644
--- a/x-pack/plugins/monitoring/public/alerts/status.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/status.tsx
@@ -64,10 +64,12 @@ export const AlertsStatus: React.FC<Props> = (props: Props) => {
           {showOnlyCount ? (
             count
           ) : (
-            <FormattedMessage
-              id="xpack.monitoring.alerts.status.clearText"
-              defaultMessage="Clear"
-            />
+            <span data-test-subj="alertStatusText">
+              <FormattedMessage
+                id="xpack.monitoring.alerts.status.clearText"
+                defaultMessage="Clear"
+              />
+            </span>
           )}
         </EuiHealth>
       </EuiToolTip>
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/logstash_template.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/logstash_template.tsx
index 12b664129211f..96ac605b1ae54 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/logstash_template.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/logstash_template.tsx
@@ -63,6 +63,7 @@ export const LogstashTemplate: React.FC<LogstashTemplateProps> = ({
           defaultMessage: 'Pipelines',
         }),
         route: `/logstash/node/${instance.nodeSummary?.uuid}/pipelines`,
+        testSubj: 'logstashNodeDetailPipelinesLink',
       });
       tabs.push({
         id: 'advanced',
@@ -70,6 +71,7 @@ export const LogstashTemplate: React.FC<LogstashTemplateProps> = ({
           defaultMessage: 'Advanced',
         }),
         route: `/logstash/node/${instance.nodeSummary?.uuid}/advanced`,
+        testSubj: 'logstashNodeDetailAdvancedLink',
       });
     }
   }
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
index 0d89adeaeadd7..5ac5fe356db9f 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/node_pipelines.tsx
@@ -105,16 +105,18 @@ export const LogStashNodePipelinesPage: React.FC<ComponentProps> = ({ clusters }
       cluster={cluster}
     >
       {data.pipelines && (
-        <PipelineListing
-          className="monitoringLogstashPipelinesTable"
-          onBrush={onBrush}
-          zoomInfo={zoomInfo}
-          stats={data.nodeSummary}
-          data={data.pipelines}
-          statusComponent={DetailStatus}
-          {...getPaginationTableProps()}
-          upgradeMessage={makeUpgradeMessage(data.nodeSummary.version)}
-        />
+        <div data-test-subj="logstashPipelinesListing">
+          <PipelineListing
+            className="monitoringLogstashPipelinesTable"
+            onBrush={onBrush}
+            zoomInfo={zoomInfo}
+            stats={data.nodeSummary}
+            data={data.pipelines}
+            statusComponent={DetailStatus}
+            {...getPaginationTableProps()}
+            upgradeMessage={makeUpgradeMessage(data.nodeSummary.version)}
+          />
+        </div>
       )}
     </LogstashTemplate>
   );
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx
index 4822841cd241c..a603106242082 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/nodes.tsx
@@ -92,7 +92,7 @@ export const LogStashNodesPage: React.FC<ComponentProps> = ({ clusters }) => {
       getPageData={getPageData}
       cluster={cluster}
     >
-      <div>
+      <div data-test-subj="logstashNodesPage">
         <SetupModeRenderer
           productName={LOGSTASH_SYSTEM_ID}
           render={({ setupMode, flyoutComponent, bottomBarComponent }: SetupModeProps) => (
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx
index d1e7faed56cbf..1412f7b9c55fb 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/overview.tsx
@@ -85,10 +85,9 @@ export const LogStashOverviewPage: React.FC<ComponentProps> = ({ clusters }) =>
       title={title}
       pageTitle={pageTitle}
       getPageData={getPageData}
-      data-test-subj="elasticsearchOverviewPage"
       cluster={cluster}
     >
-      <div data-test-subj="elasticsearchOverviewPage">{renderOverview(data)}</div>
+      <div data-test-subj="logstashOverviewPage">{renderOverview(data)}</div>
     </LogstashTemplate>
   );
 };
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
index e3a5deebd6cad..7c876c1e950cb 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/pipelines.tsx
@@ -105,7 +105,6 @@ export const LogStashPipelinesPage: React.FC<ComponentProps> = ({ clusters }) =>
       title={title}
       pageTitle={pageTitle}
       getPageData={getPageData}
-      data-test-subj="logstashPipelinesListing"
       cluster={cluster}
     >
       <div data-test-subj="logstashPipelinesListing">{renderOverview(data)}</div>
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/logstash_panel.js b/x-pack/plugins/monitoring/public/components/cluster/overview/logstash_panel.js
index 1afe75cda4027..217bd1d24ff0e 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/logstash_panel.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/logstash_panel.js
@@ -98,6 +98,7 @@ export function LogstashPanel(props) {
                   setupModeEnabled={setupMode.enabled}
                   setupModeData={setupModeData}
                   href={goToLogstash()}
+                  data-test-subj="lsOverview"
                   aria-label={i18n.translate(
                     'xpack.monitoring.cluster.overview.logstashPanel.overviewLinkAriaLabel',
                     {
diff --git a/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js b/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js
index 04eb6c5957c2d..ddf6a7d7382a2 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js
@@ -66,12 +66,15 @@ export class Listing extends PureComponent {
 
           return (
             <div>
-              <div>
-                <EuiLink href={getSafeForExternalLink(`#/logstash/node/${node.logstash.uuid}`)}>
+              <div data-test-subj="name">
+                <EuiLink
+                  href={getSafeForExternalLink(`#/logstash/node/${node.logstash.uuid}`)}
+                  data-test-subj={`nodeLink-${node.logstash.uuid}`}
+                >
                   {name}
                 </EuiLink>
               </div>
-              <div>{node.logstash.http_address}</div>
+              <div data-test-subj="httpAddress">{node.logstash.http_address}</div>
               {setupModeStatus}
             </div>
           );
@@ -92,7 +95,9 @@ export class Listing extends PureComponent {
         }),
         field: 'cpu_usage',
         sortable: true,
-        render: (value) => formatPercentageUsage(value, 100),
+        render: (value) => (
+          <span data-test-subj="cpuUsage">{formatPercentageUsage(value, 100)}</span>
+        ),
       },
       {
         name: i18n.translate('xpack.monitoring.logstash.nodes.loadAverageTitle', {
@@ -100,7 +105,7 @@ export class Listing extends PureComponent {
         }),
         field: 'load_average',
         sortable: true,
-        render: (value) => formatNumber(value, '0.00'),
+        render: (value) => <span data-test-subj="loadAverage">{formatNumber(value, '0.00')}</span>,
       },
       {
         name: i18n.translate('xpack.monitoring.logstash.nodes.jvmHeapUsedTitle', {
@@ -109,7 +114,9 @@ export class Listing extends PureComponent {
         }),
         field: 'jvm_heap_used',
         sortable: true,
-        render: (value) => formatPercentageUsage(value, 100),
+        render: (value) => (
+          <span data-test-subj="jvmHeapUsed">{formatPercentageUsage(value, 100)}</span>
+        ),
       },
       {
         name: i18n.translate('xpack.monitoring.logstash.nodes.eventsIngestedTitle', {
@@ -117,7 +124,7 @@ export class Listing extends PureComponent {
         }),
         field: 'events_out',
         sortable: true,
-        render: (value) => formatNumber(value, '0.[0]a'),
+        render: (value) => <span data-test-subj="eventsOut">{formatNumber(value, '0.[0]a')}</span>,
       },
       {
         name: i18n.translate('xpack.monitoring.logstash.nodes.configReloadsTitle', {
@@ -126,14 +133,14 @@ export class Listing extends PureComponent {
         sortable: true,
         render: (node) => (
           <div>
-            <div>
+            <div data-test-subj="configReloadsSuccess">
               <FormattedMessage
                 id="xpack.monitoring.logstash.nodes.configReloadsSuccessCountLabel"
                 defaultMessage="{reloadsSuccesses} successes"
                 values={{ reloadsSuccesses: node.reloads.successes }}
               />
             </div>
-            <div>
+            <div data-test-subj="configReloadsFailure">
               <FormattedMessage
                 id="xpack.monitoring.logstash.nodes.configReloadsFailuresCountLabel"
                 defaultMessage="{reloadsFailures} failures"
@@ -149,7 +156,7 @@ export class Listing extends PureComponent {
         }),
         field: 'version',
         sortable: true,
-        render: (value) => formatNumber(value),
+        render: (value) => <span data-test-subj="version">{formatNumber(value)}</span>,
       },
     ];
   }
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts
index dbf36777b536f..ae3d57b3c9652 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_lens_attributes.ts
@@ -91,12 +91,12 @@ export const useLensAttributes = (): TypedLensByValueInput['attributes'] | null
   const theme = useTheme();
 
   return useMemo(() => {
-    if (isEmpty(indexPatterns) || isEmpty(allSeries) || !reportType) {
-      return null;
-    }
-    // we only use the data from url to apply, since that get's updated to apply changes
+    // we only use the data from url to apply, since that gets updated to apply changes
     const allSeriesT: AllSeries = convertAllShortSeries(storage.get(allSeriesKey) ?? []);
 
+    if (isEmpty(indexPatterns) || isEmpty(allSeriesT) || !reportType) {
+      return null;
+    }
     const layerConfigs = getLayerConfigs(allSeriesT, reportType, theme, indexPatterns);
 
     if (layerConfigs.length < 1) {
@@ -106,5 +106,7 @@ export const useLensAttributes = (): TypedLensByValueInput['attributes'] | null
     const lensAttributes = new LensAttributes(layerConfigs);
 
     return lensAttributes.getJSON(lastRefresh);
-  }, [indexPatterns, allSeries, reportType, storage, theme, lastRefresh]);
+    // we also want to check the state on allSeries changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [indexPatterns, reportType, storage, theme, lastRefresh, allSeries]);
 };
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx
index b3ec7ee184f00..b9dced8036eae 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/lens_embeddable.tsx
@@ -65,7 +65,7 @@ export function LensEmbeddable(props: Props) {
     [reportType, setSeries, firstSeries, notifications?.toasts]
   );
 
-  if (!timeRange || !firstSeries) {
+  if (!timeRange || !lensAttributes) {
     return null;
   }
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.test.tsx
index ced4d3af057ff..f33eb3d515c15 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.test.tsx
@@ -54,13 +54,6 @@ describe('OperationTypeSelect', function () {
 
     fireEvent.click(screen.getByTestId('operationTypeSelect'));
 
-    expect(setSeries).toHaveBeenCalledWith(0, {
-      operationType: 'median',
-      dataType: 'ux',
-      time: { from: 'now-15m', to: 'now' },
-      name: 'performance-distribution',
-    });
-
     fireEvent.click(screen.getByText('95th Percentile'));
     expect(setSeries).toHaveBeenCalledWith(0, {
       operationType: '95th',
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx
index a223a74d74aea..5d949b91278fd 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/operation_type_select.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useEffect } from 'react';
+import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSuperSelect } from '@elastic/eui';
 
@@ -30,12 +30,6 @@ export function OperationTypeSelect({
     setSeries(seriesId, { ...series, operationType: value });
   };
 
-  useEffect(() => {
-    setSeries(seriesId, { ...series, operationType: operationType || defaultOperationType });
-    // We only want to call this when defaultOperationType changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [defaultOperationType]);
-
   return (
     <OperationTypeComponent
       onChange={onChange}
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/views/view_actions.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/views/view_actions.test.tsx
new file mode 100644
index 0000000000000..934d8f7fdbfe7
--- /dev/null
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/views/view_actions.test.tsx
@@ -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 React from 'react';
+import { screen, waitFor, fireEvent } from '@testing-library/dom';
+import { render } from '../rtl_helpers';
+import * as hooks from '../hooks/use_series_storage';
+import { ViewActions } from './view_actions';
+import { AllSeries } from '../hooks/use_series_storage';
+
+describe('ViewActions', () => {
+  const applyChanges = jest.fn();
+
+  const mockSeriesStorage = (allSeries: AllSeries, urlAllSeries: AllSeries) => {
+    jest.clearAllMocks();
+    jest.spyOn(hooks, 'useSeriesStorage').mockReturnValue({
+      ...jest.requireActual('../hooks/use_series_storage'),
+      allSeries,
+      applyChanges,
+      storage: { get: jest.fn().mockReturnValue(urlAllSeries) } as any,
+    });
+  };
+
+  const assertApplyIsEnabled = async () => {
+    render(<ViewActions />);
+
+    const applyBtn = screen.getByText(/Apply changes/i);
+
+    const btnComponent = screen.getByTestId('seriesChangesApplyButton');
+
+    expect(btnComponent.classList).not.toContain('euiButton-isDisabled');
+
+    fireEvent.click(applyBtn);
+
+    await waitFor(() => {
+      expect(applyChanges).toBeCalledTimes(1);
+    });
+  };
+
+  it('renders ViewActions', async () => {
+    mockSeriesStorage([], []);
+    render(<ViewActions />);
+
+    expect(screen.getByText(/Apply changes/i)).toBeInTheDocument();
+  });
+
+  it('apply button is disabled when no changes', async () => {
+    mockSeriesStorage([], []);
+
+    render(<ViewActions />);
+    const applyBtn = screen.getByText(/Apply changes/i);
+
+    const btnComponent = screen.getByTestId('seriesChangesApplyButton');
+
+    expect(btnComponent.classList).toContain('euiButton-isDisabled');
+
+    fireEvent.click(applyBtn);
+
+    await waitFor(() => {
+      expect(applyChanges).toBeCalledTimes(0);
+    });
+  });
+
+  it('should call apply changes when series length is different', async function () {
+    mockSeriesStorage([], [{ name: 'testSeries' } as any]);
+
+    await assertApplyIsEnabled();
+  });
+
+  it('should call apply changes when series content is different', async function () {
+    mockSeriesStorage([{ name: 'testSeriesChange' } as any], [{ name: 'testSeries' } as any]);
+
+    await assertApplyIsEnabled();
+  });
+
+  it('should call apply changes when series content is different as in undefined', async function () {
+    mockSeriesStorage(
+      [{ name: undefined } as any],
+      [{ name: 'testSeries', operationType: undefined } as any]
+    );
+
+    await assertApplyIsEnabled();
+  });
+});
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/views/view_actions.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/views/view_actions.tsx
index ee2668aa0c39a..e85ce8ff40c69 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/views/view_actions.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/views/view_actions.tsx
@@ -8,22 +8,41 @@
 import React from 'react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { isEqual } from 'lodash';
+import { isEqual, pickBy } from 'lodash';
 import { allSeriesKey, convertAllShortSeries, useSeriesStorage } from '../hooks/use_series_storage';
 
 interface Props {
   onApply?: () => void;
 }
 
+export function removeUndefinedProps<T extends object>(obj: T): Partial<T> {
+  return pickBy(obj, (value) => value !== undefined);
+}
+
 export function ViewActions({ onApply }: Props) {
   const { allSeries, storage, applyChanges } = useSeriesStorage();
 
-  const noChanges = isEqual(allSeries, convertAllShortSeries(storage.get(allSeriesKey) ?? []));
+  const urlAllSeries = convertAllShortSeries(storage.get(allSeriesKey) ?? []);
+
+  let noChanges = allSeries.length === urlAllSeries.length;
+
+  if (noChanges) {
+    noChanges = !allSeries.some(
+      (series, index) =>
+        !isEqual(removeUndefinedProps(series), removeUndefinedProps(urlAllSeries[index]))
+    );
+  }
 
   return (
     <EuiFlexGroup justifyContent="flexEnd" alignItems="center">
       <EuiFlexItem grow={false}>
-        <EuiButton onClick={() => applyChanges(onApply)} isDisabled={noChanges} fill size="s">
+        <EuiButton
+          onClick={() => applyChanges(onApply)}
+          isDisabled={noChanges}
+          fill
+          size="s"
+          data-test-subj={'seriesChangesApplyButton'}
+        >
           {i18n.translate('xpack.observability.expView.seriesBuilder.apply', {
             defaultMessage: 'Apply changes',
           })}
diff --git a/x-pack/plugins/osquery/README.md b/x-pack/plugins/osquery/README.md
index e0861fab2040b..fde90bb689673 100755
--- a/x-pack/plugins/osquery/README.md
+++ b/x-pack/plugins/osquery/README.md
@@ -6,4 +6,4 @@ This plugin adds extended support to Security Solution Fleet Osquery integration
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap b/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap
index 5ab79e72d7274..8e2b2a9a1f222 100644
--- a/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap
+++ b/x-pack/plugins/security/server/__snapshots__/prompt_page.test.tsx.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PromptPage renders as expected with additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/some/script1.js\\"></script><script src=\\"/mock-basepath/some/script2.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">Some Title</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><div>Some Body</div></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#2</span></div></div></div></div></div></div></body></html>"`;
+exports[`PromptPage renders as expected with additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/some/script1.js\\"></script><script src=\\"/mock-basepath/some/script2.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">Some Title</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><div>Some Body</div></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#2</span></div></div></div></div></div></div></body></html>"`;
 
-exports[`PromptPage renders as expected without additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">Some Title</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><div>Some Body</div></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#2</span></div></div></div></div></div></div></body></html>"`;
+exports[`PromptPage renders as expected without additional scripts 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">Some Title</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><div>Some Body</div></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#1</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span>Action#2</span></div></div></div></div></div></div></body></html>"`;
diff --git a/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap b/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap
index 8e6d6a2677787..62200cb288e09 100644
--- a/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap
+++ b/x-pack/plugins/security/server/authentication/__snapshots__/unauthenticated_page.test.tsx.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`UnauthenticatedPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">We couldn&#x27;t log you in</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><p>We hit an authentication error. Please check your credentials and try again. If you still can&#x27;t log in, contact your system administrator.</p></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiButton euiButton--primary euiButton--fill\\" href=\\"/some/url?some-query=some-value#some-hash\\" rel=\\"noreferrer\\" data-test-subj=\\"logInButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Log in</span></span></a></div></div></div></div></div></div></body></html>"`;
+exports[`UnauthenticatedPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">We couldn&#x27;t log you in</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><p>We hit an authentication error. Please check your credentials and try again. If you still can&#x27;t log in, contact your system administrator.</p></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiButton euiButton--primary euiButton--fill\\" href=\\"/some/url?some-query=some-value#some-hash\\" rel=\\"noreferrer\\" data-test-subj=\\"logInButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Log in</span></span></a></div></div></div></div></div></div></body></html>"`;
diff --git a/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap b/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
index 97cfcd47ade8d..8b882c9a6b442 100644
--- a/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
+++ b/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ResetSessionPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v7.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/internal/security/reset_session_page.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">You do not have permission to access the requested page</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><p>Either go back to the previous page or log in as a different user.</p></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiButton euiButton--primary euiButton--fill\\" href=\\"/path/to/logout\\" rel=\\"noreferrer\\" data-test-subj=\\"ResetSessionButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Log in as different user</span></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" id=\\"goBackButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Go back</span></span></button></div></div></div></div></div></div></body></html>"`;
+exports[`ResetSessionPage renders as expected 1`] = `"<html lang=\\"en\\"><head><title>Elastic</title><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-src/kbn-ui-shared-deps-src.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/100500/bundles/kbn-ui-shared-deps-npm/kbn-ui-shared-deps-npm.v8.light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/node_modules/@kbn/ui-framework/dist/kui_light.css\\" rel=\\"stylesheet\\"/><link href=\\"/mock-server-basepath/ui/legacy_light_theme.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"alternate icon\\" type=\\"image/png\\" href=\\"/mock-server-basepath/ui/favicons/favicon.png\\"/><link rel=\\"icon\\" type=\\"image/svg+xml\\" href=\\"/mock-server-basepath/ui/favicons/favicon.svg\\"/><script src=\\"/mock-basepath/internal/security/reset_session_page.js\\"></script><meta name=\\"theme-color\\" content=\\"#ffffff\\"/><meta name=\\"color-scheme\\" content=\\"light dark\\"/></head><body><div class=\\"euiPage euiPage--grow\\" style=\\"min-height:100vh\\" data-test-subj=\\"promptPage\\"><div class=\\"euiPageBody euiPageBody--borderRadiusNone\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\" role=\\"main\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--m\\"></div><h2 class=\\"euiTitle euiTitle--medium\\">You do not have permission to access the requested page</h2><span class=\\"euiTextColor euiTextColor--subdued\\"><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><p>Either go back to the previous page or log in as a different user.</p></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiButton euiButton--primary euiButton--fill\\" href=\\"/path/to/logout\\" rel=\\"noreferrer\\" data-test-subj=\\"ResetSessionButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Log in as different user</span></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" id=\\"goBackButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Go back</span></span></button></div></div></div></div></div></div></body></html>"`;
diff --git a/x-pack/plugins/security/server/prompt_page.tsx b/x-pack/plugins/security/server/prompt_page.tsx
index eb26e1a4380ae..853ef723ddb98 100644
--- a/x-pack/plugins/security/server/prompt_page.tsx
+++ b/x-pack/plugins/security/server/prompt_page.tsx
@@ -53,7 +53,7 @@ export function PromptPage({
   const regularBundlePath = `${basePath.serverBasePath}/${buildNumber}/bundles`;
   const styleSheetPaths = [
     `${regularBundlePath}/kbn-ui-shared-deps-src/${UiSharedDepsSrc.cssDistFilename}`,
-    `${regularBundlePath}/kbn-ui-shared-deps-npm/${UiSharedDepsNpm.lightCssDistFilename}`,
+    `${regularBundlePath}/kbn-ui-shared-deps-npm/${UiSharedDepsNpm.lightCssDistFilename('v8')}`,
     `${basePath.serverBasePath}/node_modules/@kbn/ui-framework/dist/kui_light.css`,
     `${basePath.serverBasePath}/ui/legacy_light_theme.css`,
   ];
diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts
index 10cde80df4805..c746ed1006e56 100644
--- a/x-pack/plugins/security_solution/common/constants.ts
+++ b/x-pack/plugins/security_solution/common/constants.ts
@@ -225,6 +225,11 @@ export const INTERNAL_RULE_ID_KEY = `${INTERNAL_IDENTIFIER}_rule_id` as const;
 export const INTERNAL_RULE_ALERT_ID_KEY = `${INTERNAL_IDENTIFIER}_rule_alert_id` as const;
 export const INTERNAL_IMMUTABLE_KEY = `${INTERNAL_IDENTIFIER}_immutable` as const;
 
+/**
+ * Internal actions route
+ */
+export const UPDATE_OR_CREATE_LEGACY_ACTIONS = '/internal/api/detection/legacy/notifications';
+
 /**
  * Detection engine routes
  */
diff --git a/x-pack/plugins/security_solution/cypress/README.md b/x-pack/plugins/security_solution/cypress/README.md
index b500091aacc2d..4d9f5d40ffe3e 100644
--- a/x-pack/plugins/security_solution/cypress/README.md
+++ b/x-pack/plugins/security_solution/cypress/README.md
@@ -357,7 +357,7 @@ Note that the command will create the folder if it does not exist.
 
 ### Using an archive from within the Cypress tests
 
-Task [cypress/tasks/es_archiver.ts](https://github.com/elastic/kibana/blob/master/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts) provides helpers such as `esArchiverLoad` and `esArchiverUnload` by means of `es_archiver`'s CLI.
+Task [cypress/tasks/es_archiver.ts](https://github.com/elastic/kibana/blob/main/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts) provides helpers such as `esArchiverLoad` and `esArchiverUnload` by means of `es_archiver`'s CLI.
 
 Because of `cy.exec`, used to invoke `es_archiver`, it's necessary to override its environment with `NODE_TLS_REJECT_UNAUTHORIZED=1`. It indeed would inject `NODE_TLS_REJECT_UNAUTHORIZED=0` and make `es_archive` otherwise abort with the following warning if used over https:
 
@@ -374,7 +374,7 @@ Incorrect handling of the above points might result in false positives, in that
 
 #### Remote data loading
 
-Helpers `esArchiverCCSLoad` and `esArchiverCCSUnload` are provided by [cypress/tasks/es_archiver.ts](https://github.com/elastic/kibana/blob/master/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts):
+Helpers `esArchiverCCSLoad` and `esArchiverCCSUnload` are provided by [cypress/tasks/es_archiver.ts](https://github.com/elastic/kibana/blob/main/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts):
 
 ```javascript
 import { esArchiverCCSLoad, esArchiverCCSUnload } from '../../tasks/es_archiver';
diff --git a/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx
index 84f61c89c4d2f..c4ae10b732ad1 100644
--- a/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.test.tsx
@@ -19,7 +19,7 @@ describe('ImportDataModal', () => {
         importComplete={jest.fn()}
         checkBoxLabel="checkBoxLabel"
         description="description"
-        errorMessage="errorMessage"
+        errorMessage={jest.fn()}
         failedDetailed={jest.fn()}
         importData={jest.fn()}
         showCheckBox={true}
diff --git a/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.tsx b/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.tsx
index 4c3dc2a249b4f..5eeff40fe9ed6 100644
--- a/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/import_data_modal/index.tsx
@@ -23,23 +23,16 @@ import React, { useCallback, useState } from 'react';
 import {
   ImportDataResponse,
   ImportDataProps,
-  ImportRulesResponseError,
-  ImportResponseError,
 } from '../../../detections/containers/detection_engine/rules';
-import {
-  displayErrorToast,
-  displaySuccessToast,
-  useStateToaster,
-  errorToToaster,
-} from '../toasters';
+import { useAppToasts } from '../../hooks/use_app_toasts';
 import * as i18n from './translations';
 
 interface ImportDataModalProps {
   checkBoxLabel: string;
   closeModal: () => void;
   description: string;
-  errorMessage: string;
-  failedDetailed: (id: string, statusCode: number, message: string) => string;
+  errorMessage: (totalCount: number) => string;
+  failedDetailed: (message: string) => string;
   importComplete: () => void;
   importData: (arg: ImportDataProps) => Promise<ImportDataResponse>;
   showCheckBox: boolean;
@@ -50,12 +43,6 @@ interface ImportDataModalProps {
   title: string;
 }
 
-const isImportRulesResponseError = (
-  error: ImportRulesResponseError | ImportResponseError
-): error is ImportRulesResponseError => {
-  return (error as ImportRulesResponseError).rule_id !== undefined;
-};
-
 /**
  * Modal component for importing Rules from a json file
  */
@@ -77,7 +64,7 @@ export const ImportDataModalComponent = ({
   const [selectedFiles, setSelectedFiles] = useState<FileList | null>(null);
   const [isImporting, setIsImporting] = useState(false);
   const [overwrite, setOverwrite] = useState(false);
-  const [, dispatchToaster] = useStateToaster();
+  const { addError, addSuccess } = useAppToasts();
 
   const cleanupAndCloseModal = useCallback(() => {
     setIsImporting(false);
@@ -97,31 +84,39 @@ export const ImportDataModalComponent = ({
           signal: abortCtrl.signal,
         });
 
-        // TODO: Improve error toast details for better debugging failed imports
-        // e.g. When success == true && success_count === 0 that means no rules were overwritten, etc
         if (importResponse.success) {
-          displaySuccessToast(successMessage(importResponse.success_count), dispatchToaster);
+          addSuccess(successMessage(importResponse.success_count));
         }
         if (importResponse.errors.length > 0) {
-          const formattedErrors = importResponse.errors.map((e) =>
-            failedDetailed(
-              isImportRulesResponseError(e) ? e.rule_id : e.id,
-              e.error.status_code,
-              e.error.message
-            )
+          const formattedErrors = importResponse.errors.map((e) => failedDetailed(e.error.message));
+          const error: Error & { raw_network_error?: object } = new Error(
+            formattedErrors.join('. ')
           );
-          displayErrorToast(errorMessage, formattedErrors, dispatchToaster);
+          error.stack = undefined;
+          error.name = 'Network errors';
+          error.raw_network_error = importResponse;
+          addError(error, { title: errorMessage(importResponse.errors.length) });
         }
 
         importComplete();
         cleanupAndCloseModal();
       } catch (error) {
         cleanupAndCloseModal();
-        errorToToaster({ title: errorMessage, error, dispatchToaster });
+        addError(error, { title: errorMessage(1) });
       }
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedFiles, overwrite]);
+  }, [
+    selectedFiles,
+    overwrite,
+    addError,
+    addSuccess,
+    cleanupAndCloseModal,
+    errorMessage,
+    failedDetailed,
+    importComplete,
+    importData,
+    successMessage,
+  ]);
 
   const handleCloseModal = useCallback(() => {
     setSelectedFiles(null);
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx
index 0513f3754d3d5..d40d7c776c0d5 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import { validateSingleAction, validateRuleActionsField } from './schema';
-import { isUuid, getActionTypeName, validateMustache, validateActionParams } from './utils';
+import { getActionTypeName, validateMustache, validateActionParams } from './utils';
 import { actionTypeRegistryMock } from '../../../../../../triggers_actions_ui/public/application/action_type_registry.mock';
 import { FormHook } from '../../../../shared_imports';
 jest.mock('./utils');
@@ -16,7 +16,6 @@ describe('stepRuleActions schema', () => {
 
   describe('validateSingleAction', () => {
     it('should validate single action', async () => {
-      (isUuid as jest.Mock).mockReturnValue(true);
       (validateActionParams as jest.Mock).mockReturnValue([]);
       (validateMustache as jest.Mock).mockReturnValue([]);
 
@@ -34,7 +33,6 @@ describe('stepRuleActions schema', () => {
     });
 
     it('should validate single action with invalid mustache template', async () => {
-      (isUuid as jest.Mock).mockReturnValue(true);
       (validateActionParams as jest.Mock).mockReturnValue([]);
       (validateMustache as jest.Mock).mockReturnValue(['Message is not valid mustache template']);
 
@@ -54,8 +52,7 @@ describe('stepRuleActions schema', () => {
       expect(errors[0]).toEqual('Message is not valid mustache template');
     });
 
-    it('should validate single action with incorrect id', async () => {
-      (isUuid as jest.Mock).mockReturnValue(false);
+    it('should validate single action with non-uuid formatted id', async () => {
       (validateMustache as jest.Mock).mockReturnValue([]);
       (validateActionParams as jest.Mock).mockReturnValue([]);
 
@@ -68,8 +65,7 @@ describe('stepRuleActions schema', () => {
         },
         actionTypeRegistry
       );
-      expect(errors).toHaveLength(1);
-      expect(errors[0]).toEqual('No connector selected');
+      expect(errors).toHaveLength(0);
     });
   });
 
@@ -89,40 +85,8 @@ describe('stepRuleActions schema', () => {
       expect(result).toEqual(undefined);
     });
 
-    it('should validate incorrect rule actions field', async () => {
-      (getActionTypeName as jest.Mock).mockReturnValue('Slack');
-      const validator = validateRuleActionsField(actionTypeRegistry);
-
-      const result = await validator({
-        path: '',
-        value: [
-          {
-            id: '3',
-            group: 'default',
-            actionTypeId: '.slack',
-            params: {},
-          },
-        ],
-        form: {} as FormHook,
-        formData: jest.fn(),
-        errors: [],
-        customData: { value: null, provider: () => Promise.resolve(null) },
-      });
-
-      expect(result).toEqual({
-        code: 'ERR_FIELD_FORMAT',
-        message: `
-**Slack:**
-*   No connector selected
-`,
-        path: '',
-      });
-    });
-
     it('should validate multiple incorrect rule actions field', async () => {
-      (isUuid as jest.Mock).mockReturnValueOnce(false);
       (getActionTypeName as jest.Mock).mockReturnValueOnce('Slack');
-      (isUuid as jest.Mock).mockReturnValueOnce(true);
       (getActionTypeName as jest.Mock).mockReturnValueOnce('Pagerduty');
       (validateActionParams as jest.Mock).mockReturnValue(['Summary is required']);
       (validateMustache as jest.Mock).mockReturnValue(['Component is not valid mustache template']);
@@ -156,7 +120,8 @@ describe('stepRuleActions schema', () => {
         code: 'ERR_FIELD_FORMAT',
         message: `
 **Slack:**
-*   No connector selected
+*   Summary is required
+*   Component is not valid mustache template
 
 
 **Pagerduty:**
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx
index 58202929c49a3..955c357673689 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx
@@ -20,17 +20,12 @@ import {
   ValidationError,
 } from '../../../../shared_imports';
 import { ActionsStepRule } from '../../../pages/detection_engine/rules/types';
-import * as I18n from './translations';
-import { isUuid, getActionTypeName, validateMustache, validateActionParams } from './utils';
+import { getActionTypeName, validateMustache, validateActionParams } from './utils';
 
 export const validateSingleAction = async (
   actionItem: AlertAction,
   actionTypeRegistry: ActionTypeRegistryContract
 ): Promise<string[]> => {
-  if (!isUuid(actionItem.id)) {
-    return [I18n.NO_CONNECTOR_SELECTED];
-  }
-
   const actionParamsErrors = await validateActionParams(actionItem, actionTypeRegistry);
   const mustacheErrors = validateMustache(actionItem.params);
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts
index 7c4ea71c983c8..575791afd110b 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts
@@ -6,19 +6,9 @@
  */
 
 import { actionTypeRegistryMock } from '../../../../../../triggers_actions_ui/public/application/action_type_registry.mock';
-import { isUuid, getActionTypeName, validateMustache, validateActionParams } from './utils';
+import { getActionTypeName, validateMustache, validateActionParams } from './utils';
 
 describe('stepRuleActions utils', () => {
-  describe('isUuidv4', () => {
-    it('should validate proper uuid v4 value', () => {
-      expect(isUuid('817b8bca-91d1-4729-8ee1-3a83aaafd9d4')).toEqual(true);
-    });
-
-    it('should validate incorrect uuid v4 value', () => {
-      expect(isUuid('ad9d4')).toEqual(false);
-    });
-  });
-
   describe('getActionTypeName', () => {
     it('should return capitalized action type name', () => {
       expect(getActionTypeName('.slack')).toEqual('Slack');
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts
index 22363df5164a6..fc9562af83525 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts
@@ -14,10 +14,6 @@ import {
 } from '../../../../../../triggers_actions_ui/public';
 import * as I18n from './translations';
 
-const UUID_REGEX = /^[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i;
-
-export const isUuid = (id: AlertAction['id']) => !!id.match(UUID_REGEX);
-
 export const getActionTypeName = (actionTypeId: AlertAction['actionTypeId']) => {
   if (!actionTypeId) return '';
   const actionType = actionTypeId.split('.')[1];
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx
index 6ca987a8d005c..be2b5161137bb 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx
@@ -174,7 +174,6 @@ export const getColumns = ({
           {value}
         </LinkAnchor>
       ),
-      truncateText: true,
       width: '20%',
       sortable: true,
     },
@@ -186,14 +185,12 @@ export const getColumns = ({
           {value}
         </EuiText>
       ),
-      truncateText: true,
       width: '10%',
     },
     {
       field: 'severity',
       name: i18n.COLUMN_SEVERITY,
       render: (value: Rule['severity']) => <SeverityBadge value={value} />,
-      truncateText: true,
       width: '12%',
     },
     {
@@ -208,7 +205,6 @@ export const getColumns = ({
           </LocalizedDateTooltip>
         );
       },
-      truncateText: true,
       width: '14%',
     },
     {
@@ -224,7 +220,6 @@ export const getColumns = ({
         );
       },
       width: '12%',
-      truncateText: true,
     },
     {
       field: 'updated_at',
@@ -239,7 +234,6 @@ export const getColumns = ({
         );
       },
       sortable: true,
-      truncateText: true,
       width: '14%',
     },
     {
@@ -254,7 +248,6 @@ export const getColumns = ({
           </EuiText>
         );
       },
-      truncateText: true,
       width: '8%',
     },
     {
@@ -266,7 +259,6 @@ export const getColumns = ({
         }
         return getEmptyTagValue();
       },
-      truncateText: true,
       width: '20%',
     },
     {
@@ -344,7 +336,6 @@ export const getMonitoringColumns = (
           </LinkAnchor>
         );
       },
-      truncateText: true,
       width: '24%',
     },
     {
@@ -362,7 +353,6 @@ export const getMonitoringColumns = (
           {value?.length ? sum(value.map(Number)).toFixed() : getEmptyTagValue()}
         </EuiText>
       ),
-      truncateText: true,
       width: '14%',
     },
     {
@@ -380,7 +370,6 @@ export const getMonitoringColumns = (
           {value?.length ? sum(value.map(Number)).toFixed() : getEmptyTagValue()}
         </EuiText>
       ),
-      truncateText: true,
       width: '14%',
     },
     {
@@ -412,7 +401,6 @@ export const getMonitoringColumns = (
           {value ?? getEmptyTagValue()}
         </EuiText>
       ),
-      truncateText: true,
       width: '14%',
     },
     {
@@ -427,7 +415,6 @@ export const getMonitoringColumns = (
           </LocalizedDateTooltip>
         );
       },
-      truncateText: true,
       width: '20%',
     },
     {
@@ -443,7 +430,6 @@ export const getMonitoringColumns = (
         );
       },
       width: '16%',
-      truncateText: true,
     },
     {
       field: 'activate',
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
index 53efe28cba49c..15ff91cac5096 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
@@ -579,19 +579,21 @@ export const SUCCESSFULLY_IMPORTED_RULES = (totalRules: number) =>
     }
   );
 
-export const IMPORT_FAILED = i18n.translate(
-  'xpack.securitySolution.detectionEngine.components.importRuleModal.importFailedTitle',
-  {
-    defaultMessage: 'Failed to import rules',
-  }
-);
+export const IMPORT_FAILED = (totalRules: number) =>
+  i18n.translate(
+    'xpack.securitySolution.detectionEngine.components.importRuleModal.importFailedTitle',
+    {
+      values: { totalRules },
+      defaultMessage: 'Failed to import {totalRules} {totalRules, plural, =1 {rule} other {rules}}',
+    }
+  );
 
-export const IMPORT_FAILED_DETAILED = (ruleId: string, statusCode: number, message: string) =>
+export const IMPORT_FAILED_DETAILED = (message: string) =>
   i18n.translate(
     'xpack.securitySolution.detectionEngine.components.importRuleModal.importFailedDetailedTitle',
     {
-      values: { ruleId, statusCode, message },
-      defaultMessage: 'Rule ID: {ruleId}\n Status Code: {statusCode}\n Message: {message}',
+      values: { message },
+      defaultMessage: '{message}',
     }
   );
 
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.test.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.test.tsx
index 36362463b5ea2..289a8e407000f 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.test.tsx
@@ -65,12 +65,11 @@ describe.each([
     );
   });
 
-  // FLAKY https://github.com/elastic/kibana/issues/113892
-  it.skip('should display dates in expected format', () => {
+  it('should display dates in expected format', () => {
     render();
 
     expect(renderResult.getByTestId('testCard-header-updated').textContent).toEqual(
-      expect.stringMatching(/Last updated(\s seconds? ago|now)/)
+      expect.stringMatching(/Last updated(?:(\s*\d+ seconds? ago)|now)/)
     );
   });
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts
index 957fd2d4485bc..3b796d6aff0b3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/service.ts
@@ -42,8 +42,8 @@ export async function getHostIsolationExceptionItems({
   http,
   perPage,
   page,
-  sortField,
-  sortOrder,
+  sortField = 'created_at',
+  sortOrder = 'desc',
   filter,
 }: {
   http: HttpStart;
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.ts
index 2587fff5bfafd..ad99e86abb231 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/store/middleware.ts
@@ -239,10 +239,18 @@ async function updateHostIsolationExceptionsItem(
       http,
       entry
     );
+
+    // notify the update was correct
     dispatch({
       type: 'hostIsolationExceptionsFormStateChanged',
       payload: createLoadedResourceState(response),
     });
+
+    // clear the form
+    dispatch({
+      type: 'hostIsolationExceptionsFormEntryChanged',
+      payload: undefined,
+    });
   } catch (error) {
     dispatch({
       type: 'hostIsolationExceptionsFormStateChanged',
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx
index e87ac2adeab49..2eeddbaeeb0f3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/components/form_flyout.tsx
@@ -94,7 +94,7 @@ export const HostIsolationExceptionsFormFlyout: React.FC<{}> = memo(() => {
           type: 'hostIsolationExceptionsMarkToEdit',
           payload: { id: location.id },
         });
-      } else {
+      } else if (exception === undefined) {
         setException(exceptionToEdit);
       }
     }
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.test.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.test.ts
index 6a4e0cb840149..2c23c43734869 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.test.ts
@@ -4,33 +4,35 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { useLicense } from '../../../../common/hooks/use_license';
 import { useCanSeeHostIsolationExceptionsMenu } from './hooks';
 import { renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../common/mock';
 import { getHostIsolationExceptionSummary } from '../service';
+import { useEndpointPrivileges } from '../../../../common/components/user_privileges/endpoint';
 
 jest.mock('../../../../common/hooks/use_license');
 jest.mock('../service');
+jest.mock('../../../../common/components/user_privileges/endpoint/use_endpoint_privileges');
 
 const getHostIsolationExceptionSummaryMock = getHostIsolationExceptionSummary as jest.Mock;
 
 describe('host isolation exceptions hooks', () => {
-  const isPlatinumPlusMock = useLicense().isPlatinumPlus as jest.Mock;
+  const useEndpointPrivilegesMock = useEndpointPrivileges as jest.Mock;
   describe('useCanSeeHostIsolationExceptionsMenu', () => {
     beforeEach(() => {
-      isPlatinumPlusMock.mockReset();
+      useEndpointPrivilegesMock.mockReset();
     });
-    it('should return true if the license is platinum plus', () => {
-      isPlatinumPlusMock.mockReturnValue(true);
+
+    it('should return true if has the correct privileges', () => {
+      useEndpointPrivilegesMock.mockReturnValue({ canIsolateHost: true });
       const { result } = renderHook(() => useCanSeeHostIsolationExceptionsMenu(), {
         wrapper: TestProviders,
       });
       expect(result.current).toBe(true);
     });
 
-    it('should return false if the license is lower platinum plus and there are not existing host isolation items', () => {
-      isPlatinumPlusMock.mockReturnValue(false);
+    it('should return false if does not have privileges and there are not existing host isolation items', () => {
+      useEndpointPrivilegesMock.mockReturnValue({ canIsolateHost: false });
       getHostIsolationExceptionSummaryMock.mockReturnValueOnce({ total: 0 });
       const { result } = renderHook(() => useCanSeeHostIsolationExceptionsMenu(), {
         wrapper: TestProviders,
@@ -38,8 +40,8 @@ describe('host isolation exceptions hooks', () => {
       expect(result.current).toBe(false);
     });
 
-    it('should return true if the license is lower platinum plus and there are existing host isolation items', async () => {
-      isPlatinumPlusMock.mockReturnValue(false);
+    it('should return true if does not have privileges and there are existing host isolation items', async () => {
+      useEndpointPrivilegesMock.mockReturnValue({ canIsolateHost: false });
       getHostIsolationExceptionSummaryMock.mockReturnValueOnce({ total: 11 });
       const { result, waitForNextUpdate } = renderHook(
         () => useCanSeeHostIsolationExceptionsMenu(),
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.ts b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.ts
index 4b6129785c84a..50ae96305c4b3 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/hooks.ts
@@ -8,7 +8,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { useHttp } from '../../../../common/lib/kibana/hooks';
-import { useLicense } from '../../../../common/hooks/use_license';
+import { useEndpointPrivileges } from '../../../../common/components/user_privileges/endpoint';
 import { State } from '../../../../common/store';
 import {
   MANAGEMENT_STORE_GLOBAL_NAMESPACE,
@@ -42,30 +42,30 @@ export function useHostIsolationExceptionsNavigateCallback() {
 
 /**
  * Checks if the current user should be able to see the host isolation exceptions
- * menu item based on their current license level and existing excepted items.
+ * menu item based on their current privileges
  */
 export function useCanSeeHostIsolationExceptionsMenu() {
-  const license = useLicense();
   const http = useHttp();
+  const privileges = useEndpointPrivileges();
 
-  const [hasExceptions, setHasExceptions] = useState(license.isPlatinumPlus());
+  const [canSeeMenu, setCanSeeMenu] = useState(privileges.canIsolateHost);
 
   useEffect(() => {
     async function checkIfHasExceptions() {
       try {
         const summary = await getHostIsolationExceptionSummary(http);
         if (summary?.total > 0) {
-          setHasExceptions(true);
+          setCanSeeMenu(true);
         }
       } catch (error) {
         // an error will ocurr if the exception list does not exist
-        setHasExceptions(false);
+        setCanSeeMenu(false);
       }
     }
-    if (!license.isPlatinumPlus()) {
+    if (!privileges.canIsolateHost) {
       checkIfHasExceptions();
     }
-  }, [http, license]);
+  }, [http, privileges.canIsolateHost]);
 
-  return hasExceptions;
+  return canSeeMenu;
 }
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx
index 9a119a58aa802..47d0c00a67986 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.test.tsx
@@ -14,11 +14,11 @@ import { AppContextTestRender, createAppRootMockRenderer } from '../../../../com
 import { isFailedResourceState, isLoadedResourceState } from '../../../state';
 import { getHostIsolationExceptionItems } from '../service';
 import { HostIsolationExceptionsList } from './host_isolation_exceptions_list';
-import { useLicense } from '../../../../common/hooks/use_license';
+import { useEndpointPrivileges } from '../../../../common/components/user_privileges/endpoint';
 
-jest.mock('../../../../common/components/user_privileges/endpoint/use_endpoint_privileges');
 jest.mock('../service');
 jest.mock('../../../../common/hooks/use_license');
+jest.mock('../../../../common/components/user_privileges/endpoint/use_endpoint_privileges');
 
 const getHostIsolationExceptionItemsMock = getHostIsolationExceptionItems as jest.Mock;
 
@@ -29,7 +29,7 @@ describe('When on the host isolation exceptions page', () => {
   let waitForAction: AppContextTestRender['middlewareSpy']['waitForAction'];
   let mockedContext: AppContextTestRender;
 
-  const isPlatinumPlusMock = useLicense().isPlatinumPlus as jest.Mock;
+  const useEndpointPrivilegesMock = useEndpointPrivileges as jest.Mock;
 
   beforeEach(() => {
     getHostIsolationExceptionItemsMock.mockReset();
@@ -129,11 +129,12 @@ describe('When on the host isolation exceptions page', () => {
       });
     });
 
-    describe('is license platinum plus', () => {
+    describe('has canIsolateHost privileges', () => {
       beforeEach(async () => {
-        isPlatinumPlusMock.mockReturnValue(true);
+        useEndpointPrivilegesMock.mockReturnValue({ canIsolateHost: true });
         getHostIsolationExceptionItemsMock.mockImplementation(getFoundExceptionListItemSchemaMock);
       });
+
       it('should show the create flyout when the add button is pressed', async () => {
         render();
         await dataReceived();
@@ -142,6 +143,7 @@ describe('When on the host isolation exceptions page', () => {
         });
         expect(renderResult.getByTestId('hostIsolationExceptionsCreateEditFlyout')).toBeTruthy();
       });
+
       it('should show the create flyout when the show location is create', async () => {
         history.push(`${HOST_ISOLATION_EXCEPTIONS_PATH}?show=create`);
         render();
@@ -151,15 +153,17 @@ describe('When on the host isolation exceptions page', () => {
       });
     });
 
-    describe('is not license platinum plus', () => {
+    describe('does not have canIsolateHost privileges', () => {
       beforeEach(() => {
-        isPlatinumPlusMock.mockReturnValue(false);
+        useEndpointPrivilegesMock.mockReturnValue({ canIsolateHost: false });
       });
+
       it('should not show the create flyout if the user navigates to the create url', () => {
         history.push(`${HOST_ISOLATION_EXCEPTIONS_PATH}?show=create`);
         render();
         expect(renderResult.queryByTestId('hostIsolationExceptionsCreateEditFlyout')).toBeFalsy();
       });
+
       it('should not show the create flyout if the user navigates to the edit url', () => {
         history.push(`${HOST_ISOLATION_EXCEPTIONS_PATH}?show=edit`);
         render();
diff --git a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx
index bf063f4b2508e..26f4369e95601 100644
--- a/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/host_isolation_exceptions/view/host_isolation_exceptions_list.tsx
@@ -13,7 +13,6 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { ExceptionItem } from '../../../../common/components/exceptions/viewer/exception_item';
-import { useLicense } from '../../../../common/hooks/use_license';
 import {
   getCurrentLocation,
   getItemToDelete,
@@ -41,6 +40,7 @@ import {
   EDIT_HOST_ISOLATION_EXCEPTION_LABEL,
 } from './components/translations';
 import { getEndpointListPath } from '../../../common/routing';
+import { useEndpointPrivileges } from '../../../../common/components/user_privileges/endpoint';
 
 type HostIsolationExceptionPaginatedContent = PaginatedContentProps<
   Immutable<ExceptionListItemSchema>,
@@ -58,14 +58,14 @@ export const HostIsolationExceptionsList = () => {
   const itemToDelete = useHostIsolationExceptionsSelector(getItemToDelete);
   const navigateCallback = useHostIsolationExceptionsNavigateCallback();
   const history = useHistory();
-  const license = useLicense();
-  const showFlyout = license.isPlatinumPlus() && !!location.show;
+  const privileges = useEndpointPrivileges();
+  const showFlyout = privileges.canIsolateHost && !!location.show;
 
   useEffect(() => {
-    if (!isLoading && listItems.length === 0 && !license.isPlatinumPlus()) {
+    if (!isLoading && listItems.length === 0 && !privileges.canIsolateHost) {
       history.replace(getEndpointListPath({ name: 'endpointList' }));
     }
-  }, [history, isLoading, license, listItems.length]);
+  }, [history, isLoading, listItems.length, privileges.canIsolateHost]);
 
   const handleOnSearch = useCallback(
     (query: string) => {
@@ -100,7 +100,7 @@ export const HostIsolationExceptionsList = () => {
     return {
       item: element,
       'data-test-subj': `hostIsolationExceptionsCard`,
-      actions: license.isPlatinumPlus() ? [editAction, deleteAction] : [deleteAction],
+      actions: privileges.canIsolateHost ? [editAction, deleteAction] : [deleteAction],
     };
   }
 
@@ -139,7 +139,7 @@ export const HostIsolationExceptionsList = () => {
         />
       }
       actions={
-        license.isPlatinumPlus() && listItems.length > 0 ? (
+        privileges.canIsolateHost && listItems.length > 0 ? (
           <EuiButton
             fill
             iconType="plusInCircle"
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
index 917ffe49c6090..50564c39935fa 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/trusted_apps/list/remove_trusted_app_from_policy_modal.test.tsx
@@ -25,8 +25,7 @@ import {
 import { Immutable } from '../../../../../../../common/endpoint/types';
 import { HttpFetchOptionsWithPath } from 'kibana/public';
 
-// FLAKY https://github.com/elastic/kibana/issues/115100
-describe.skip('When using the RemoveTrustedAppFromPolicyModal component', () => {
+describe('When using the RemoveTrustedAppFromPolicyModal component', () => {
   let appTestContext: AppContextTestRender;
   let renderResult: ReturnType<AppContextTestRender['render']>;
   let render: (waitForLoadedState?: boolean) => Promise<ReturnType<AppContextTestRender['render']>>;
@@ -50,7 +49,7 @@ describe.skip('When using the RemoveTrustedAppFromPolicyModal component', () =>
     mockedApis.responseProvider.trustedAppUpdate.mockDelay.mockImplementation(
       () =>
         new Promise((resolve) => {
-          setTimeout(resolve, 20);
+          setTimeout(resolve, 100);
         })
     );
 
diff --git a/x-pack/plugins/security_solution/public/resolver/documentation/schema.md b/x-pack/plugins/security_solution/public/resolver/documentation/schema.md
index 3870face0d821..61b923d25d3e3 100644
--- a/x-pack/plugins/security_solution/public/resolver/documentation/schema.md
+++ b/x-pack/plugins/security_solution/public/resolver/documentation/schema.md
@@ -12,7 +12,7 @@ for the elastic endpoint and winlogbeat's sysmon data.
 
 ## Schema Format
 
-The predefined schemas are located here <https://github.com/elastic/kibana/blob/master/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts#L34>
+The predefined schemas are located here <https://github.com/elastic/kibana/blob/main/x-pack/plugins/security_solution/server/endpoint/routes/resolver/entity.ts#L34>
 
 ```typescript
 const supportedSchemas: SupportedSchema[] = [
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
index ebb927259535b..b14177b066feb 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
@@ -373,12 +373,15 @@ export const SUCCESSFULLY_IMPORTED_TIMELINES = (totalCount: number) =>
     }
   );
 
-export const IMPORT_FAILED = i18n.translate(
-  'xpack.securitySolution.timelines.components.importTimelineModal.importFailedTitle',
-  {
-    defaultMessage: 'Failed to import',
-  }
-);
+export const IMPORT_FAILED = (totalTimelines: number) =>
+  i18n.translate(
+    'xpack.securitySolution.timelines.components.importTimelineModal.importFailedTitle',
+    {
+      values: { totalTimelines },
+      defaultMessage:
+        'Failed to import {totalTimelines} {totalTimelines, plural, =1 {rule} other {rules}}',
+    }
+  );
 
 export const IMPORT_TIMELINE = i18n.translate(
   'xpack.securitySolution.timelines.components.importTimelineModal.importTitle',
@@ -387,11 +390,11 @@ export const IMPORT_TIMELINE = i18n.translate(
   }
 );
 
-export const IMPORT_FAILED_DETAILED = (id: string, statusCode: number, message: string) =>
+export const IMPORT_FAILED_DETAILED = (message: string) =>
   i18n.translate(
     'xpack.securitySolution.timelines.components.importTimelineModal.importFailedDetailedTitle',
     {
-      values: { id, statusCode, message },
-      defaultMessage: 'Timeline ID: {id}\n Status Code: {statusCode}\n Message: {message}',
+      values: { message },
+      defaultMessage: '{message}',
     }
   );
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/README.md b/x-pack/plugins/security_solution/server/lib/detection_engine/README.md
index 5806df1de0e3d..a2385e15a1bf2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/README.md
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/README.md
@@ -152,8 +152,8 @@ logging.events:
 ```
 
 See these two README.md's pages for more references on the alerting and actions API:
-https://github.com/elastic/kibana/blob/master/x-pack/plugins/alerting/README.md
-https://github.com/elastic/kibana/tree/master/x-pack/plugins/actions
+https://github.com/elastic/kibana/blob/main/x-pack/plugins/alerting/README.md
+https://github.com/elastic/kibana/tree/main/x-pack/plugins/actions
 
 ### Signals API
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.test.ts
new file mode 100644
index 0000000000000..b40f6c6f8a72d
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.test.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { AlertServicesMock, alertsMock } from '../../../../../alerting/server/mocks';
+import { sampleThresholdAlert } from '../rule_types/__mocks__/threshold';
+import {
+  NotificationRuleTypeParams,
+  scheduleNotificationActions,
+} from './schedule_notification_actions';
+
+describe('schedule_notification_actions', () => {
+  const alertServices: AlertServicesMock = alertsMock.createAlertServices();
+  const alertId = 'fb30ddd1-5edc-43e2-9afb-3bcd970b78ee';
+
+  const notificationRuleParams: NotificationRuleTypeParams = {
+    author: ['123'],
+    id: '123',
+    name: 'some name',
+    description: '123',
+    buildingBlockType: undefined,
+    from: '123',
+    ruleId: '123',
+    immutable: false,
+    license: '',
+    falsePositives: ['false positive 1', 'false positive 2'],
+    query: 'user.name: root or user.name: admin',
+    language: 'kuery',
+    savedId: 'savedId-123',
+    timelineId: 'timelineid-123',
+    timelineTitle: 'timeline-title-123',
+    meta: {},
+    filters: [],
+    index: ['index-123'],
+    maxSignals: 100,
+    riskScore: 80,
+    riskScoreMapping: [],
+    ruleNameOverride: undefined,
+    outputIndex: 'output-1',
+    severity: 'high',
+    severityMapping: [],
+    threat: [],
+    timestampOverride: undefined,
+    to: 'now',
+    type: 'query',
+    references: ['http://www.example.com'],
+    namespace: 'a namespace',
+    note: '# sample markdown',
+    version: 1,
+    exceptionsList: [],
+  };
+
+  it('Should schedule actions with unflatted and legacy context', () => {
+    const alertInstance = alertServices.alertInstanceFactory(alertId);
+    const signals = [sampleThresholdAlert._source, sampleThresholdAlert._source];
+    scheduleNotificationActions({
+      alertInstance,
+      signalsCount: 2,
+      resultsLink: '',
+      ruleParams: notificationRuleParams,
+      signals,
+    });
+    expect(alertInstance.scheduleActions).toHaveBeenCalledWith(
+      'default',
+      expect.objectContaining({
+        alerts: [
+          expect.objectContaining({
+            kibana: expect.objectContaining({
+              alert: expect.objectContaining({
+                rule: expect.objectContaining({
+                  uuid: '7a7065d7-6e8b-4aae-8d20-c93613dec9f9',
+                }),
+              }),
+            }),
+            signal: expect.objectContaining({
+              rule: expect.objectContaining({
+                id: '7a7065d7-6e8b-4aae-8d20-c93613dec9f9',
+              }),
+            }),
+          }),
+          expect.objectContaining({
+            kibana: expect.objectContaining({
+              alert: expect.objectContaining({
+                rule: expect.objectContaining({
+                  uuid: '7a7065d7-6e8b-4aae-8d20-c93613dec9f9',
+                }),
+              }),
+            }),
+            signal: expect.objectContaining({
+              rule: expect.objectContaining({
+                id: '7a7065d7-6e8b-4aae-8d20-c93613dec9f9',
+              }),
+            }),
+          }),
+        ],
+      })
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts
index 147c54cd6eb8a..744742f64eb4a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/schedule_notification_actions.ts
@@ -7,13 +7,44 @@
 
 import { mapKeys, snakeCase } from 'lodash/fp';
 import { AlertInstance } from '../../../../../alerting/server';
+import { expandDottedObject } from '../rule_types/utils';
 import { RuleParams } from '../schemas/rule_schemas';
+import aadFieldConversion from '../routes/index/signal_aad_mapping.json';
+import { isRACAlert } from '../signals/utils';
+import { RACAlert } from '../rule_types/types';
 
 export type NotificationRuleTypeParams = RuleParams & {
   id: string;
   name: string;
 };
 
+const convertToLegacyAlert = (alert: RACAlert) =>
+  Object.entries(aadFieldConversion).reduce((acc, [legacyField, aadField]) => {
+    const val = alert[aadField];
+    if (val != null) {
+      return {
+        ...acc,
+        [legacyField]: val,
+      };
+    }
+    return acc;
+  }, {});
+
+/*
+ * Formats alerts before sending to `scheduleActions`. We augment the context with
+ * the equivalent "legacy" alert context so that pre-8.0 actions will continue to work.
+ */
+const formatAlertsForNotificationActions = (alerts: unknown[]) => {
+  return alerts.map((alert) =>
+    isRACAlert(alert)
+      ? {
+          ...expandDottedObject(convertToLegacyAlert(alert)),
+          ...expandDottedObject(alert),
+        }
+      : alert
+  );
+};
+
 interface ScheduleNotificationActions {
   alertInstance: AlertInstance;
   signalsCount: number;
@@ -36,5 +67,5 @@ export const scheduleNotificationActions = ({
     .scheduleActions('default', {
       results_link: resultsLink,
       rule: mapKeys(snakeCase, ruleParams),
-      alerts: signals,
+      alerts: formatAlertsForNotificationActions(signals),
     });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
index 2f5f8ac846954..fc88e7b8b2be0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
@@ -11,6 +11,7 @@ import { coreMock } from 'src/core/server/mocks';
 import { ActionsApiRequestHandlerContext } from '../../../../../../actions/server';
 import { AlertingApiRequestHandlerContext } from '../../../../../../alerting/server';
 import { rulesClientMock } from '../../../../../../alerting/server/mocks';
+import { actionsClientMock } from '../../../../../../actions/server/mocks';
 import { licensingMock } from '../../../../../../licensing/server/mocks';
 import { listMock } from '../../../../../../lists/server/mocks';
 import { ruleRegistryMocks } from '../../../../../../rule_registry/server/mocks';
@@ -44,6 +45,7 @@ const createMockClients = () => {
       exceptionListClient: listMock.getExceptionListClient(core.savedObjects.client),
     },
     rulesClient: rulesClientMock.create(),
+    actionsClient: actionsClientMock.create(),
     ruleDataService: ruleRegistryMocks.createRuleDataService(),
 
     config: createMockConfig(),
@@ -65,7 +67,9 @@ const createRequestContextMock = (
   return {
     core: clients.core,
     securitySolution: createSecuritySolutionRequestContextMock(clients),
-    actions: {} as unknown as jest.Mocked<ActionsApiRequestHandlerContext>,
+    actions: {
+      getActionsClient: jest.fn(() => clients.actionsClient),
+    } as unknown as jest.Mocked<ActionsApiRequestHandlerContext>,
     alerting: {
       getRulesClient: jest.fn(() => clients.rulesClient),
     } as unknown as jest.Mocked<AlertingApiRequestHandlerContext>,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts
index 974d18292a078..0040b5f30afb4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/check_template_version.ts
@@ -43,10 +43,12 @@ export const templateNeedsUpdate = async ({
 
 export const fieldAliasesOutdated = async (esClient: ElasticsearchClient, index: string) => {
   const { body: indexMappings } = await esClient.indices.get({ index });
-  for (const [_, mapping] of Object.entries(indexMappings)) {
-    const aliasesVersion = get(mapping.mappings?._meta, ALIAS_VERSION_FIELD) ?? 0;
-    if (aliasesVersion < SIGNALS_FIELD_ALIASES_VERSION) {
-      return true;
+  for (const [indexName, mapping] of Object.entries(indexMappings)) {
+    if (indexName.startsWith(`${index}-`)) {
+      const aliasesVersion = get(mapping.mappings?._meta, ALIAS_VERSION_FIELD) ?? 0;
+      if (aliasesVersion < SIGNALS_FIELD_ALIASES_VERSION) {
+        return true;
+      }
     }
   }
   return false;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
index 2e377e50530d1..cf40988c1d742 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/create_index_route.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { get } from 'lodash';
+import { chunk, get } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ElasticsearchClient } from 'src/core/server';
 import {
   transformError,
-  getIndexExists,
+  getBootstrapIndexExists,
   getPolicyExists,
   setPolicy,
   createBootstrapIndex,
@@ -25,6 +25,8 @@ import {
   getSignalsTemplate,
   SIGNALS_TEMPLATE_VERSION,
   createBackwardsCompatibilityMapping,
+  ALIAS_VERSION_FIELD,
+  SIGNALS_FIELD_ALIASES_VERSION,
 } from './get_signals_template';
 import { ensureMigrationCleanupPolicy } from '../../migrations/migration_cleanup';
 import signalsPolicy from './signals_policy.json';
@@ -71,7 +73,10 @@ export const createDetectionIndex = async (
   const spaceId = context.getSpaceId();
   const index = siemClient.getSignalsIndex();
 
-  const indexExists = await getIndexExists(esClient, index);
+  const indexExists = await getBootstrapIndexExists(
+    context.core.elasticsearch.client.asInternalUser,
+    index
+  );
   const { ruleRegistryEnabled } = config.experimentalFeatures;
 
   // If using the rule registry implementation, we don't want to create new .siem-signals indices -
@@ -124,6 +129,11 @@ export const createDetectionIndex = async (
   }
 };
 
+// This function can be expensive if there are lots of existing .siem-signals indices
+// because any new backwards compatibility mappings need to be applied to all of them
+// while also preserving the original 'version' of the mapping. To do it somewhat efficiently,
+// we first group the indices by version and exclude any that already have up-to-date
+// aliases. Then we start updating the mappings sequentially in chunks.
 const addFieldAliasesToIndices = async ({
   esClient,
   index,
@@ -132,14 +142,34 @@ const addFieldAliasesToIndices = async ({
   index: string;
 }) => {
   const { body: indexMappings } = await esClient.indices.get({ index });
+  const indicesByVersion: Record<number, string[]> = {};
+  const versions: Set<number> = new Set();
   for (const [indexName, mapping] of Object.entries(indexMappings)) {
-    const currentVersion: number | undefined = get(mapping.mappings?._meta, 'version');
-    const body = createBackwardsCompatibilityMapping(currentVersion ?? 0);
-    await esClient.indices.putMapping({
-      index: indexName,
-      body,
-      allow_no_indices: true,
-    } as estypes.IndicesPutMappingRequest);
+    const version: number = get(mapping.mappings?._meta, 'version') ?? 0;
+    const aliasesVersion: number = get(mapping.mappings?._meta, ALIAS_VERSION_FIELD) ?? 0;
+    // Only attempt to add backwards compatibility mappings to indices whose names start with the alias
+    // This limits us to legacy .siem-signals indices, since alerts as data indices use a different naming
+    // scheme (but have the same alias, so will also be returned by the "get" request)
+    if (
+      indexName.startsWith(`${index}-`) &&
+      isOutdated({ current: aliasesVersion, target: SIGNALS_FIELD_ALIASES_VERSION })
+    ) {
+      indicesByVersion[version] = indicesByVersion[version]
+        ? [...indicesByVersion[version], indexName]
+        : [indexName];
+      versions.add(version);
+    }
+  }
+  for (const version of versions) {
+    const body = createBackwardsCompatibilityMapping(version);
+    const indexNameChunks = chunk(indicesByVersion[version], 20);
+    for (const indexNameChunk of indexNameChunks) {
+      await esClient.indices.putMapping({
+        index: indexNameChunk,
+        body,
+        allow_no_indices: true,
+      } as estypes.IndicesPutMappingRequest);
+    }
   }
 };
 
@@ -152,7 +182,7 @@ const addIndexAliases = async ({
   index: string;
   aadIndexAliasName: string;
 }) => {
-  const { body: indices } = await esClient.indices.getAlias({ name: index });
+  const { body: indices } = await esClient.indices.getAlias({ index: `${index}-*`, name: index });
   const aliasActions = {
     actions: Object.keys(indices).map((concreteIndexName) => {
       return {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts
index 242c78ceed28b..3b1b27176ef88 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/index/read_index_route.ts
@@ -5,12 +5,16 @@
  * 2.0.
  */
 
-import { transformError } from '@kbn/securitysolution-es-utils';
+import { transformError, getBootstrapIndexExists } from '@kbn/securitysolution-es-utils';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 import { DETECTION_ENGINE_INDEX_URL } from '../../../../../common/constants';
 
 import { buildSiemResponse } from '../utils';
 import { RuleDataPluginService } from '../../../../../../rule_registry/server';
+import { fieldAliasesOutdated } from './check_template_version';
+import { getIndexVersion } from './get_index_version';
+import { isOutdated } from '../../migrations/helpers';
+import { SIGNALS_TEMPLATE_VERSION } from './get_signals_template';
 
 export const readIndexRoute = (
   router: SecuritySolutionPluginRouter,
@@ -29,6 +33,7 @@ export const readIndexRoute = (
 
       try {
         const siemClient = context.securitySolution?.getAppClient();
+        const esClient = context.core.elasticsearch.client.asCurrentUser;
 
         if (!siemClient) {
           return siemResponse.error({ statusCode: 404 });
@@ -37,12 +42,47 @@ export const readIndexRoute = (
         const spaceId = context.securitySolution.getSpaceId();
         const indexName = ruleDataService.getResourceName(`security.alerts-${spaceId}`);
 
-        return response.ok({
-          body: {
-            name: indexName,
-            index_mapping_outdated: false,
-          },
-        });
+        const index = siemClient.getSignalsIndex();
+        const indexExists = await getBootstrapIndexExists(
+          context.core.elasticsearch.client.asInternalUser,
+          index
+        );
+
+        if (indexExists) {
+          let mappingOutdated: boolean | null = null;
+          let aliasesOutdated: boolean | null = null;
+          try {
+            const indexVersion = await getIndexVersion(esClient, index);
+            mappingOutdated = isOutdated({
+              current: indexVersion,
+              target: SIGNALS_TEMPLATE_VERSION,
+            });
+            aliasesOutdated = await fieldAliasesOutdated(esClient, index);
+          } catch (err) {
+            const error = transformError(err);
+            // Some users may not have the view_index_metadata permission necessary to check the index mapping version
+            // so just continue and return null for index_mapping_outdated if the error is a 403
+            if (error.statusCode !== 403) {
+              return siemResponse.error({
+                body: error.message,
+                statusCode: error.statusCode,
+              });
+            }
+          }
+          return response.ok({
+            body: {
+              name: indexName,
+              index_mapping_outdated: mappingOutdated || aliasesOutdated,
+            },
+          });
+        } else {
+          return response.ok({
+            body: {
+              name: indexName,
+              index_mapping_outdated: false,
+            },
+          });
+        }
       } catch (err) {
         const error = transformError(err);
         return siemResponse.error({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
index 23779afdc5410..86be61e8f9c99 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
@@ -53,6 +53,7 @@ describe.each([
     clients.rulesClient.update.mockResolvedValue(
       getAlertMock(isRuleRegistryEnabled, getQueryRuleParams())
     );
+    clients.actionsClient.getAll.mockResolvedValue([]);
     context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
       elasticsearchClientMock.createSuccessTransportRequestPromise(getBasicEmptySearchResponse())
     );
@@ -77,21 +78,6 @@ describe.each([
         status_code: 500,
       });
     });
-
-    test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getRulesClient = jest.fn();
-      const response = await server.inject(request, context);
-      expect(response.status).toEqual(404);
-      expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
-    });
-
-    it('returns 404 if siem client is unavailable', async () => {
-      const { securitySolution, ...contextWithoutSecuritySolution } = context;
-      // @ts-expect-error
-      const response = await server.inject(request, contextWithoutSecuritySolution);
-      expect(response.status).toEqual(404);
-      expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
-    });
   });
 
   describe('unhappy paths', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
index 3752128d3daa3..187de40d33df0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
@@ -41,7 +41,7 @@ import {
 
 import { patchRules } from '../../rules/patch_rules';
 import { legacyMigrate } from '../../rules/utils';
-import { getTupleDuplicateErrorsAndUniqueRules } from './utils';
+import { getTupleDuplicateErrorsAndUniqueRules, getInvalidConnectors } from './utils';
 import { createRulesStreamFromNdJson } from '../../rules/create_rules_stream_from_ndjson';
 import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
 import { HapiReadableStream } from '../../rules/types';
@@ -78,14 +78,11 @@ export const importRulesRoute = (
       const siemResponse = buildSiemResponse(response);
 
       try {
-        const rulesClient = context.alerting?.getRulesClient();
+        const rulesClient = context.alerting.getRulesClient();
+        const actionsClient = context.actions.getActionsClient();
         const esClient = context.core.elasticsearch.client;
         const savedObjectsClient = context.core.savedObjects.client;
-        const siemClient = context.securitySolution?.getAppClient();
-
-        if (!siemClient || !rulesClient) {
-          return siemResponse.error({ statusCode: 404 });
-        }
+        const siemClient = context.securitySolution.getAppClient();
 
         const mlAuthz = buildMlAuthz({
           license: context.licensing.license,
@@ -103,6 +100,7 @@ export const importRulesRoute = (
             body: `Invalid file extension ${fileExtension}`,
           });
         }
+
         const signalsIndex = siemClient.getSignalsIndex();
         const indexExists = await getIndexExists(esClient.asCurrentUser, signalsIndex);
         if (!isRuleRegistryEnabled && !indexExists) {
@@ -118,14 +116,24 @@ export const importRulesRoute = (
           request.body.file as HapiReadableStream,
           ...readStream,
         ]);
-        const [duplicateIdErrors, uniqueParsedObjects] = getTupleDuplicateErrorsAndUniqueRules(
-          parsedObjects,
-          request.query.overwrite
+
+        const [duplicateIdErrors, parsedObjectsWithoutDuplicateErrors] =
+          getTupleDuplicateErrorsAndUniqueRules(parsedObjects, request.query.overwrite);
+
+        const [nonExistentActionErrors, uniqueParsedObjects] = await getInvalidConnectors(
+          parsedObjectsWithoutDuplicateErrors,
+          actionsClient
         );
 
         const chunkParseObjects = chunk(CHUNK_PARSED_OBJECT_SIZE, uniqueParsedObjects);
         let importRuleResponse: ImportRuleResponse[] = [];
 
+        // If we had 100% errors and no successful rule could be imported we still have to output an error.
+        // otherwise we would output we are success importing 0 rules.
+        if (chunkParseObjects.length === 0) {
+          importRuleResponse = [...nonExistentActionErrors, ...duplicateIdErrors];
+        }
+
         while (chunkParseObjects.length) {
           const batchParseObjects = chunkParseObjects.shift() ?? [];
           const newImportRuleResponse = await Promise.all(
@@ -362,6 +370,7 @@ export const importRulesRoute = (
             }, [])
           );
           importRuleResponse = [
+            ...nonExistentActionErrors,
             ...duplicateIdErrors,
             ...importRuleResponse,
             ...newImportRuleResponse,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
index d8b7e8cb2b724..067f7b80dfca1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
@@ -78,7 +78,7 @@ export const updateRulesBulkRoute = (
               id: payloadRule.id,
             });
 
-            await legacyMigrate({
+            const migratedRule = await legacyMigrate({
               rulesClient,
               savedObjectsClient,
               rule: existingRule,
@@ -88,8 +88,9 @@ export const updateRulesBulkRoute = (
               spaceId: context.securitySolution.getSpaceId(),
               rulesClient,
               ruleStatusClient,
-              savedObjectsClient,
               defaultOutputIndex: siemClient.getSignalsIndex(),
+              existingRule,
+              migratedRule,
               ruleUpdate: payloadRule,
               isRuleRegistryEnabled,
             });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts
index cf443e3293510..543591c415a6b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts
@@ -69,7 +69,7 @@ export const updateRulesRoute = (
           id: request.body.id,
         });
 
-        await legacyMigrate({
+        const migratedRule = await legacyMigrate({
           rulesClient,
           savedObjectsClient,
           rule: existingRule,
@@ -79,7 +79,8 @@ export const updateRulesRoute = (
           isRuleRegistryEnabled,
           rulesClient,
           ruleStatusClient,
-          savedObjectsClient,
+          existingRule,
+          migratedRule,
           ruleUpdate: request.body,
           spaceId: context.securitySolution.getSpaceId(),
         });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
index 366ae607f0ba8..2dfc98fd3ba2f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
@@ -18,6 +18,7 @@ import {
   transformAlertsToRules,
   getDuplicates,
   getTupleDuplicateErrorsAndUniqueRules,
+  getInvalidConnectors,
 } from './utils';
 import { getAlertMock } from '../__mocks__/request_responses';
 import { INTERNAL_IDENTIFIER } from '../../../../../common/constants';
@@ -36,6 +37,8 @@ import {
   getQueryRuleParams,
   getThreatRuleParams,
 } from '../../schemas/rule_schemas.mock';
+import { requestContextMock } from '../__mocks__';
+
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRulesActionsSavedObject } from '../../rule_actions/legacy_get_rule_actions_saved_object';
 // eslint-disable-next-line no-restricted-imports
@@ -47,6 +50,8 @@ describe.each([
   ['Legacy', false],
   ['RAC', true],
 ])('utils - %s', (_, isRuleRegistryEnabled) => {
+  const { clients } = requestContextMock.createTools();
+
   describe('transformAlertToRule', () => {
     test('should work with a full data set', () => {
       const fullRule = getAlertMock(isRuleRegistryEnabled, getQueryRuleParams());
@@ -529,6 +534,7 @@ describe.each([
 
   describe('getTupleDuplicateErrorsAndUniqueRules', () => {
     test('returns tuple of empty duplicate errors array and rule array with instance of Syntax Error when imported rule contains parse error', async () => {
+      // This is a string because we have a double "::" below to make an error happen on purpose.
       const multipartPayload =
         '{"name"::"Simple Rule Query","description":"Simple Rule Query","risk_score":1,"rule_id":"rule-1","severity":"high","type":"query","query":"user.name: root or user.name: admin"}\n';
       const ndJsonStream = new Readable({
@@ -645,4 +651,469 @@ describe.each([
       expect(errors.length).toEqual(0);
     });
   });
+
+  describe('getInvalidConnectors', () => {
+    beforeEach(() => {
+      clients.actionsClient.getAll.mockReset();
+    });
+
+    test('returns empty errors array and rule array with instance of Syntax Error when imported rule contains parse error', async () => {
+      // This is a string because we have a double "::" below to make an error happen on purpose.
+      const multipartPayload =
+        '{"name"::"Simple Rule Query","description":"Simple Rule Query","risk_score":1,"rule_id":"rule-1","severity":"high","type":"query","query":"user.name: root or user.name: admin"}\n';
+      const ndJsonStream = new Readable({
+        read() {
+          this.push(multipartPayload);
+          this.push(null);
+        },
+      });
+      const rulesObjectsStream = createRulesStreamFromNdJson(1000);
+      const parsedObjects = await createPromiseFromStreams<PromiseFromStreams[]>([
+        ndJsonStream,
+        ...rulesObjectsStream,
+      ]);
+      clients.actionsClient.getAll.mockResolvedValue([]);
+      const [errors, output] = await getInvalidConnectors(parsedObjects, clients.actionsClient);
+      const isInstanceOfError = output[0] instanceof Error;
+
+      expect(isInstanceOfError).toEqual(true);
+      expect(errors.length).toEqual(0);
+    });
+
+    test('creates error with a rule has an action that does not exist within the actions client', async () => {
+      const rule: ReturnType<typeof getCreateRulesSchemaMock> = {
+        ...getCreateRulesSchemaMock('rule-1'),
+        actions: [
+          {
+            group: 'default',
+            id: '123',
+            action_type_id: '456',
+            params: {},
+          },
+        ],
+      };
+      const ndJsonStream = new Readable({
+        read() {
+          this.push(`${JSON.stringify(rule)}\n`);
+          this.push(null);
+        },
+      });
+      const rulesObjectsStream = createRulesStreamFromNdJson(1000);
+      const parsedObjects = await createPromiseFromStreams<PromiseFromStreams[]>([
+        ndJsonStream,
+        ...rulesObjectsStream,
+      ]);
+      clients.actionsClient.getAll.mockResolvedValue([]);
+      const [errors, output] = await getInvalidConnectors(parsedObjects, clients.actionsClient);
+      expect(output.length).toEqual(0);
+      expect(errors).toEqual<BulkError[]>([
+        {
+          error: {
+            message: '1 connector is missing. Connector id missing is: 123',
+            status_code: 404,
+          },
+          rule_id: 'rule-1',
+        },
+      ]);
+    });
+
+    test('creates output with no errors if 1 rule with an action exists within the actions client', async () => {
+      const rule: ReturnType<typeof getCreateRulesSchemaMock> = {
+        ...getCreateRulesSchemaMock('rule-1'),
+        actions: [
+          {
+            group: 'default',
+            id: '123',
+            action_type_id: '456',
+            params: {},
+          },
+        ],
+      };
+      const ndJsonStream = new Readable({
+        read() {
+          this.push(`${JSON.stringify(rule)}\n`);
+          this.push(null);
+        },
+      });
+      const rulesObjectsStream = createRulesStreamFromNdJson(1000);
+      const parsedObjects = await createPromiseFromStreams<PromiseFromStreams[]>([
+        ndJsonStream,
+        ...rulesObjectsStream,
+      ]);
+      clients.actionsClient.getAll.mockResolvedValue([
+        {
+          id: '123',
+          referencedByCount: 1,
+          actionTypeId: 'default',
+          name: 'name',
+          isPreconfigured: false,
+        },
+      ]);
+      const [errors, output] = await getInvalidConnectors(parsedObjects, clients.actionsClient);
+      expect(errors.length).toEqual(0);
+      expect(output.length).toEqual(1);
+      expect(output[0]).toEqual<PromiseFromStreams[]>(expect.objectContaining(rule));
+    });
+
+    test('creates output with no errors if 1 rule with 2 actions exists within the actions client', async () => {
+      const rule: ReturnType<typeof getCreateRulesSchemaMock> = {
+        ...getCreateRulesSchemaMock('rule-1'),
+        actions: [
+          {
+            group: 'default',
+            id: '123',
+            action_type_id: '456',
+            params: {},
+          },
+          {
+            group: 'default',
+            id: '789',
+            action_type_id: '101112',
+            params: {},
+          },
+        ],
+      };
+      const ndJsonStream = new Readable({
+        read() {
+          this.push(`${JSON.stringify(rule)}\n`);
+          this.push(null);
+        },
+      });
+      const rulesObjectsStream = createRulesStreamFromNdJson(1000);
+      const parsedObjects = await createPromiseFromStreams<PromiseFromStreams[]>([
+        ndJsonStream,
+        ...rulesObjectsStream,
+      ]);
+      clients.actionsClient.getAll.mockResolvedValue([
+        {
+          id: '123',
+          referencedByCount: 1,
+          actionTypeId: 'default',
+          name: 'name',
+          isPreconfigured: false,
+        },
+        {
+          id: '789',
+          referencedByCount: 1,
+          actionTypeId: 'default',
+          name: 'name',
+          isPreconfigured: false,
+        },
+      ]);
+      const [errors, output] = await getInvalidConnectors(parsedObjects, clients.actionsClient);
+      expect(errors.length).toEqual(0);
+      expect(output.length).toEqual(1);
+      expect(output[0]).toEqual<PromiseFromStreams[]>(expect.objectContaining(rule));
+    });
+
+    test('creates output with no errors if 2 rules with 1 action each exists within the actions client', async () => {
+      const rule1: ReturnType<typeof getCreateRulesSchemaMock> = {
+        ...getCreateRulesSchemaMock('rule-1'),
+        actions: [
+          {
+            group: 'default',
+            id: '123',
+            action_type_id: '456',
+            params: {},
+          },
+        ],
+      };
+      const rule2: ReturnType<typeof getCreateRulesSchemaMock> = {
+        ...getCreateRulesSchemaMock('rule-2'),
+        actions: [
+          {
+            group: 'default',
+            id: '123',
+            action_type_id: '456',
+            params: {},
+          },
+        ],
+      };
+      const ndJsonStream = new Readable({
+        read() {
+          this.push(`${JSON.stringify(rule1)}\n`);
+          this.push(`${JSON.stringify(rule2)}\n`);
+          this.push(null);
+        },
+      });
+      const rulesObjectsStream = createRulesStreamFromNdJson(1000);
+      const parsedObjects = await createPromiseFromStreams<PromiseFromStreams[]>([
+        ndJsonStream,
+        ...rulesObjectsStream,
+      ]);
+      clients.actionsClient.getAll.mockResolvedValue([
+        {
+          id: '123',
+          referencedByCount: 1,
+          actionTypeId: 'default',
+          name: 'name',
+          isPreconfigured: false,
+        },
+        {
+          id: '789',
+          referencedByCount: 1,
+          actionTypeId: 'default',
+          name: 'name',
+          isPreconfigured: false,
+        },
+      ]);
+      const [errors, output] = await getInvalidConnectors(parsedObjects, clients.actionsClient);
+      expect(errors.length).toEqual(0);
+      expect(output.length).toEqual(2);
+      expect(output[0]).toEqual<PromiseFromStreams[]>(expect.objectContaining(rule1));
+      expect(output[1]).toEqual<PromiseFromStreams[]>(expect.objectContaining(rule2));
+    });
+
+    test('creates output with 1 error if 2 rules with 1 action each exists within the actions client but 1 has a nonexistent action', async () => {
+      const rule1: ReturnType<typeof getCreateRulesSchemaMock> = {
+        ...getCreateRulesSchemaMock('rule-1'),
+        actions: [
+          {
+            group: 'default',
+            id: '123',
+            action_type_id: '456',
+            params: {},
+          },
+        ],
+      };
+      const rule2: ReturnType<typeof getCreateRulesSchemaMock> = {
+        ...getCreateRulesSchemaMock('rule-2'),
+        actions: [
+          {
+            group: 'default',
+            id: '123',
+            action_type_id: '456',
+            params: {},
+          },
+          {
+            group: 'default',
+            id: '456', // <--- Non-existent that triggers the error.
+            action_type_id: '456',
+            params: {},
+          },
+        ],
+      };
+      const ndJsonStream = new Readable({
+        read() {
+          this.push(`${JSON.stringify(rule1)}\n`);
+          this.push(`${JSON.stringify(rule2)}\n`);
+          this.push(null);
+        },
+      });
+      const rulesObjectsStream = createRulesStreamFromNdJson(1000);
+      const parsedObjects = await createPromiseFromStreams<PromiseFromStreams[]>([
+        ndJsonStream,
+        ...rulesObjectsStream,
+      ]);
+      clients.actionsClient.getAll.mockResolvedValue([
+        {
+          id: '123',
+          referencedByCount: 1,
+          actionTypeId: 'default',
+          name: 'name',
+          isPreconfigured: false,
+        },
+        {
+          id: '789',
+          referencedByCount: 1,
+          actionTypeId: 'default',
+          name: 'name',
+          isPreconfigured: false,
+        },
+      ]);
+      const [errors, output] = await getInvalidConnectors(parsedObjects, clients.actionsClient);
+      expect(errors.length).toEqual(1);
+      expect(output.length).toEqual(1);
+      expect(output[0]).toEqual<PromiseFromStreams[]>(expect.objectContaining(rule1));
+      expect(errors).toEqual<BulkError[]>([
+        {
+          error: {
+            message: '1 connector is missing. Connector id missing is: 456',
+            status_code: 404,
+          },
+          rule_id: 'rule-2',
+        },
+      ]);
+    });
+
+    test('creates output with error if 1 rule with 2 actions but 1 action does not exist within the actions client', async () => {
+      const rule: ReturnType<typeof getCreateRulesSchemaMock> = {
+        ...getCreateRulesSchemaMock('rule-1'),
+        actions: [
+          {
+            group: 'default',
+            id: '123',
+            action_type_id: '456',
+            params: {},
+          },
+          {
+            group: 'default',
+            id: '789',
+            action_type_id: '101112',
+            params: {},
+          },
+          {
+            group: 'default',
+            id: '101112', // <-- Does not exist
+            action_type_id: '101112',
+            params: {},
+          },
+        ],
+      };
+      const ndJsonStream = new Readable({
+        read() {
+          this.push(`${JSON.stringify(rule)}\n`);
+          this.push(null);
+        },
+      });
+      const rulesObjectsStream = createRulesStreamFromNdJson(1000);
+      const parsedObjects = await createPromiseFromStreams<PromiseFromStreams[]>([
+        ndJsonStream,
+        ...rulesObjectsStream,
+      ]);
+      clients.actionsClient.getAll.mockResolvedValue([
+        {
+          id: '123',
+          referencedByCount: 1,
+          actionTypeId: 'default',
+          name: 'name',
+          isPreconfigured: false,
+        },
+        {
+          id: '789',
+          referencedByCount: 1,
+          actionTypeId: 'default',
+          name: 'name',
+          isPreconfigured: false,
+        },
+      ]);
+      const [errors, output] = await getInvalidConnectors(parsedObjects, clients.actionsClient);
+      expect(errors.length).toEqual(1);
+      expect(output.length).toEqual(0);
+      expect(errors).toEqual<BulkError[]>([
+        {
+          error: {
+            message: '1 connector is missing. Connector id missing is: 101112',
+            status_code: 404,
+          },
+          rule_id: 'rule-1',
+        },
+      ]);
+    });
+
+    test('creates output with 2 errors if 3 rules with actions but 1 action does not exist within the actions client', async () => {
+      const rule1: ReturnType<typeof getCreateRulesSchemaMock> = {
+        ...getCreateRulesSchemaMock('rule-1'),
+        actions: [
+          {
+            group: 'default',
+            id: '123',
+            action_type_id: '456',
+            params: {},
+          },
+          {
+            group: 'default',
+            id: '789',
+            action_type_id: '101112',
+            params: {},
+          },
+          {
+            group: 'default',
+            id: '101112', // <-- Does not exist
+            action_type_id: '101112',
+            params: {},
+          },
+        ],
+      };
+      const rule2: ReturnType<typeof getCreateRulesSchemaMock> = {
+        ...getCreateRulesSchemaMock('rule-1'),
+        actions: [
+          {
+            group: 'default',
+            id: '123',
+            action_type_id: '456',
+            params: {},
+          },
+          {
+            group: 'default',
+            id: '789',
+            action_type_id: '101112',
+            params: {},
+          },
+        ],
+      };
+      const rule3: ReturnType<typeof getCreateRulesSchemaMock> = {
+        ...getCreateRulesSchemaMock('rule-1'),
+        actions: [
+          {
+            group: 'default',
+            id: '123',
+            action_type_id: '456',
+            params: {},
+          },
+          {
+            group: 'default',
+            id: '789',
+            action_type_id: '101112',
+            params: {},
+          },
+          {
+            group: 'default',
+            id: '101112', // <-- Does not exist
+            action_type_id: '101112',
+            params: {},
+          },
+        ],
+      };
+      const ndJsonStream = new Readable({
+        read() {
+          this.push(`${JSON.stringify(rule1)}\n`);
+          this.push(`${JSON.stringify(rule2)}\n`);
+          this.push(`${JSON.stringify(rule3)}\n`);
+          this.push(null);
+        },
+      });
+      const rulesObjectsStream = createRulesStreamFromNdJson(1000);
+      const parsedObjects = await createPromiseFromStreams<PromiseFromStreams[]>([
+        ndJsonStream,
+        ...rulesObjectsStream,
+      ]);
+      clients.actionsClient.getAll.mockResolvedValue([
+        {
+          id: '123',
+          referencedByCount: 1,
+          actionTypeId: 'default',
+          name: 'name',
+          isPreconfigured: false,
+        },
+        {
+          id: '789',
+          referencedByCount: 1,
+          actionTypeId: 'default',
+          name: 'name',
+          isPreconfigured: false,
+        },
+      ]);
+      const [errors, output] = await getInvalidConnectors(parsedObjects, clients.actionsClient);
+      expect(errors.length).toEqual(2);
+      expect(output.length).toEqual(1);
+      expect(output[0]).toEqual<PromiseFromStreams[]>(expect.objectContaining(rule2));
+      expect(errors).toEqual<BulkError[]>([
+        {
+          error: {
+            message: '1 connector is missing. Connector id missing is: 101112',
+            status_code: 404,
+          },
+          rule_id: 'rule-1',
+        },
+        {
+          error: {
+            message: '1 connector is missing. Connector id missing is: 101112',
+            status_code: 404,
+          },
+          rule_id: 'rule-1',
+        },
+      ]);
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts
index bb2e35d189ca1..7472d41b9ab77 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts
@@ -13,6 +13,7 @@ import { RulesSchema } from '../../../../../common/detection_engine/schemas/resp
 import { ImportRulesSchemaDecoded } from '../../../../../common/detection_engine/schemas/request/import_rules_schema';
 import { CreateRulesBulkSchema } from '../../../../../common/detection_engine/schemas/request/create_rules_bulk_schema';
 import { PartialAlert, FindResult } from '../../../../../../alerting/server';
+import { ActionsClient } from '../../../../../../actions/server';
 import { INTERNAL_IDENTIFIER } from '../../../../../common/constants';
 import {
   RuleAlertType,
@@ -194,3 +195,57 @@ export const getTupleDuplicateErrorsAndUniqueRules = (
 
   return [Array.from(errors.values()), Array.from(rulesAcc.values())];
 };
+
+/**
+ * Given a set of rules and an actions client this will return connectors that are invalid
+ * such as missing connectors and filter out the rules that have invalid connectors.
+ * @param rules The rules to check for invalid connectors
+ * @param actionsClient The actions client to get all the connectors.
+ * @returns An array of connector errors if it found any and then the promise stream of valid and invalid connectors.
+ */
+export const getInvalidConnectors = async (
+  rules: PromiseFromStreams[],
+  actionsClient: ActionsClient
+): Promise<[BulkError[], PromiseFromStreams[]]> => {
+  const actionsFind = await actionsClient.getAll();
+  const actionIds = new Set(actionsFind.map((action) => action.id));
+  const { errors, rulesAcc } = rules.reduce(
+    (acc, parsedRule) => {
+      if (parsedRule instanceof Error) {
+        acc.rulesAcc.set(uuid.v4(), parsedRule);
+      } else {
+        const { rule_id: ruleId, actions } = parsedRule;
+        const missingActionIds = actions.flatMap((action) => {
+          if (!actionIds.has(action.id)) {
+            return [action.id];
+          } else {
+            return [];
+          }
+        });
+        if (missingActionIds.length === 0) {
+          acc.rulesAcc.set(ruleId, parsedRule);
+        } else {
+          const errorMessage =
+            missingActionIds.length > 1
+              ? 'connectors are missing. Connector ids missing are:'
+              : 'connector is missing. Connector id missing is:';
+          acc.errors.set(
+            uuid.v4(),
+            createBulkErrorObject({
+              ruleId,
+              statusCode: 404,
+              message: `${missingActionIds.length} ${errorMessage} ${missingActionIds.join(', ')}`,
+            })
+          );
+        }
+      }
+      return acc;
+    }, // using map (preserves ordering)
+    {
+      errors: new Map<string, BulkError>(),
+      rulesAcc: new Map<string, PromiseFromStreams>(),
+    }
+  );
+
+  return [Array.from(errors.values()), Array.from(rulesAcc.values())];
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
index 1b6d85540f91b..c472494138b7f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/create_security_rule_type_wrapper.ts
@@ -302,7 +302,7 @@ export const createSecurityRuleTypeWrapper: CreateSecurityRuleTypeWrapper =
                   ?.kibana_siem_app_url,
               });
 
-              logger.info(
+              logger.debug(
                 buildRuleMessage(`Found ${createdSignalsCount} signals for notification.`)
               );
 
@@ -353,8 +353,7 @@ export const createSecurityRuleTypeWrapper: CreateSecurityRuleTypeWrapper =
               });
             }
 
-            // adding this log line so we can get some information from cloud
-            logger.info(
+            logger.debug(
               buildRuleMessage(
                 `[+] Finished indexing ${createdSignalsCount} ${
                   !isEmpty(tuples)
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/expand_dotted.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/expand_dotted.test.ts
new file mode 100644
index 0000000000000..efdaf2377872c
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/expand_dotted.test.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { expandDottedObject } from './expand_dotted';
+
+describe('Expand Dotted', () => {
+  it('expands simple dotted fields to nested objects', () => {
+    const simpleDottedObj = {
+      'kibana.test.1': 'the spice must flow',
+      'kibana.test.2': 2,
+      'kibana.test.3': null,
+    };
+    expect(expandDottedObject(simpleDottedObj)).toEqual({
+      kibana: {
+        test: {
+          1: 'the spice must flow',
+          2: 2,
+          3: null,
+        },
+      },
+    });
+  });
+
+  it('expands complex dotted fields to nested objects', () => {
+    const complexDottedObj = {
+      'kibana.test.1': 'the spice must flow',
+      'kibana.test.2': ['a', 'b', 'c', 'd'],
+      'kibana.test.3': null,
+      'signal.test': {
+        key: 'val',
+      },
+      'kibana.alert.ancestors': [
+        {
+          name: 'ancestor1',
+        },
+        {
+          name: 'ancestor2',
+        },
+      ],
+      flat: 'yep',
+    };
+    expect(expandDottedObject(complexDottedObj)).toEqual({
+      kibana: {
+        alert: {
+          ancestors: [
+            {
+              name: 'ancestor1',
+            },
+            {
+              name: 'ancestor2',
+            },
+          ],
+        },
+        test: {
+          1: 'the spice must flow',
+          2: ['a', 'b', 'c', 'd'],
+          3: null,
+        },
+      },
+      signal: {
+        test: {
+          key: 'val',
+        },
+      },
+      flat: 'yep',
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/expand_dotted.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/expand_dotted.ts
new file mode 100644
index 0000000000000..69a9cb8236cbc
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/expand_dotted.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 { merge } from '@kbn/std';
+
+const expandDottedField = (dottedFieldName: string, val: unknown): object => {
+  const parts = dottedFieldName.split('.');
+  if (parts.length === 1) {
+    return { [parts[0]]: val };
+  } else {
+    return { [parts[0]]: expandDottedField(parts.slice(1).join('.'), val) };
+  }
+};
+
+/*
+ * Expands an object with "dotted" fields to a nested object with unflattened fields.
+ *
+ * Example:
+ *   expandDottedObject({
+ *     "kibana.alert.depth": 1,
+ *     "kibana.alert.ancestors": [{
+ *       id: "d5e8eb51-a6a0-456d-8a15-4b79bfec3d71",
+ *       type: "event",
+ *       index: "signal_index",
+ *       depth: 0,
+ *     }],
+ *   })
+ *
+ *   => {
+ *     kibana: {
+ *       alert: {
+ *         ancestors: [
+ *           id: "d5e8eb51-a6a0-456d-8a15-4b79bfec3d71",
+ *           type: "event",
+ *           index: "signal_index",
+ *           depth: 0,
+ *         ],
+ *         depth: 1,
+ *       },
+ *     },
+ *   }
+ */
+export const expandDottedObject = (dottedObj: object) => {
+  return Object.entries(dottedObj).reduce(
+    (acc, [key, val]) => merge(acc, expandDottedField(key, val)),
+    {}
+  );
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts
index 03cdcc6ef5c52..d60a190f94d19 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/index.ts
@@ -23,3 +23,6 @@ export const createResultObject = <TState extends AlertTypeState>(state: TState)
   };
   return result;
 };
+
+export * from './expand_dotted';
+export * from './get_list_client';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_timelines/README.md b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_timelines/README.md
index 1b8516ee16012..09257371bca60 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_timelines/README.md
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_timelines/README.md
@@ -4,7 +4,7 @@
 
 
 
-1.  [Have the env params set up](https://github.com/elastic/kibana/blob/master/x-pack/plugins/security_solution/server/lib/detection_engine/README.md)
+1.  [Have the env params set up](https://github.com/elastic/kibana/blob/main/x-pack/plugins/security_solution/server/lib/detection_engine/README.md)
 
 2. Create a new timelines template into `x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_timelines`
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts
index dafb99c6df970..037f85091bfcc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts
@@ -274,8 +274,9 @@ export interface UpdateRulesOptions {
   ruleStatusClient: IRuleExecutionLogClient;
   rulesClient: RulesClient;
   defaultOutputIndex: string;
+  existingRule: SanitizedAlert<RuleParams> | null | undefined;
+  migratedRule: SanitizedAlert<RuleParams> | null | undefined;
   ruleUpdate: UpdateRulesSchema;
-  savedObjectsClient: SavedObjectsClientContract;
 }
 
 export interface PatchRulesOptions {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts
index 9a7711fcc8987..b98a95ed1aabc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts
@@ -12,6 +12,8 @@ import {
   getUpdateRulesSchemaMock,
 } from '../../../../common/detection_engine/schemas/request/rule_schemas.mock';
 import { ruleExecutionLogClientMock } from '../rule_execution_log/__mocks__/rule_execution_log_client';
+import { getAlertMock } from '../routes/__mocks__/request_responses';
+import { getQueryRuleParams } from '../schemas/rule_schemas.mock';
 
 export const getUpdateRulesOptionsMock = (isRuleRegistryEnabled: boolean) => ({
   spaceId: 'default',
@@ -19,6 +21,8 @@ export const getUpdateRulesOptionsMock = (isRuleRegistryEnabled: boolean) => ({
   ruleStatusClient: ruleExecutionLogClientMock.create(),
   savedObjectsClient: savedObjectsClientMock.create(),
   defaultOutputIndex: '.siem-signals-default',
+  existingRule: getAlertMock(isRuleRegistryEnabled, getQueryRuleParams()),
+  migratedRule: getAlertMock(isRuleRegistryEnabled, getQueryRuleParams()),
   ruleUpdate: getUpdateRulesSchemaMock(),
   isRuleRegistryEnabled,
 });
@@ -29,6 +33,8 @@ export const getUpdateMlRulesOptionsMock = (isRuleRegistryEnabled: boolean) => (
   ruleStatusClient: ruleExecutionLogClientMock.create(),
   savedObjectsClient: savedObjectsClientMock.create(),
   defaultOutputIndex: '.siem-signals-default',
+  existingRule: getAlertMock(isRuleRegistryEnabled, getQueryRuleParams()),
+  migratedRule: getAlertMock(isRuleRegistryEnabled, getQueryRuleParams()),
   ruleUpdate: getUpdateMachineLearningSchemaMock(),
   isRuleRegistryEnabled,
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts
index 4268ed9014066..ae16d0435e3dc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts
@@ -10,13 +10,19 @@ import { validate } from '@kbn/securitysolution-io-ts-utils';
 import { DEFAULT_MAX_SIGNALS } from '../../../../common/constants';
 import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
 import { PartialAlert } from '../../../../../alerting/server';
-import { readRules } from './read_rules';
+
 import { UpdateRulesOptions } from './types';
 import { addTags } from './add_tags';
 import { typeSpecificSnakeToCamel } from '../schemas/rule_converters';
 import { internalRuleUpdate, RuleParams } from '../schemas/rule_schemas';
 import { enableRule } from './enable_rule';
-import { maybeMute, transformToAlertThrottle, transformToNotifyWhen } from './utils';
+import {
+  maybeMute,
+  transformToAlertThrottle,
+  transformToNotifyWhen,
+  updateActions,
+  updateThrottleNotifyWhen,
+} from './utils';
 
 class UpdateError extends Error {
   public readonly statusCode: number;
@@ -27,20 +33,14 @@ class UpdateError extends Error {
 }
 
 export const updateRules = async ({
-  isRuleRegistryEnabled,
   spaceId,
   rulesClient,
   ruleStatusClient,
   defaultOutputIndex,
+  existingRule,
+  migratedRule,
   ruleUpdate,
-  savedObjectsClient,
 }: UpdateRulesOptions): Promise<PartialAlert<RuleParams> | null> => {
-  const existingRule = await readRules({
-    isRuleRegistryEnabled,
-    rulesClient,
-    ruleId: ruleUpdate.rule_id,
-    id: ruleUpdate.id,
-  });
   if (existingRule == null) {
     return null;
   }
@@ -86,9 +86,24 @@ export const updateRules = async ({
       ...typeSpecificParams,
     },
     schedule: { interval: ruleUpdate.interval ?? '5m' },
-    actions: ruleUpdate.actions != null ? ruleUpdate.actions.map(transformRuleToAlertAction) : [],
-    throttle: transformToAlertThrottle(ruleUpdate.throttle),
-    notifyWhen: transformToNotifyWhen(ruleUpdate.throttle),
+    actions: updateActions(
+      transformRuleToAlertAction,
+      migratedRule?.actions,
+      existingRule.actions,
+      ruleUpdate?.actions
+    ),
+    throttle: updateThrottleNotifyWhen(
+      transformToAlertThrottle,
+      migratedRule?.throttle,
+      existingRule.throttle,
+      ruleUpdate?.throttle
+    ),
+    notifyWhen: updateThrottleNotifyWhen(
+      transformToNotifyWhen,
+      migratedRule?.notifyWhen,
+      existingRule.notifyWhen,
+      ruleUpdate?.throttle
+    ),
   };
 
   const [validated, errors] = validate(newInternalRule, internalRuleUpdate);
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts
index a558024a73e34..c9e00486dc130 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { pickBy, isEmpty } from 'lodash/fp';
+import { pickBy, isEmpty, isEqual } from 'lodash/fp';
 import type {
   FromOrUndefined,
   MachineLearningJobIdOrUndefined,
@@ -64,10 +64,14 @@ import { RulesClient } from '../../../../../alerting/server';
 // eslint-disable-next-line no-restricted-imports
 import { LegacyRuleActions } from '../rule_actions/legacy_types';
 import { FullResponseSchema } from '../../../../common/detection_engine/schemas/request';
-import { transformAlertToRuleAction } from '../../../../common/detection_engine/transform_actions';
+import {
+  transformAlertToRuleAction,
+  transformRuleToAlertAction,
+} from '../../../../common/detection_engine/transform_actions';
 // eslint-disable-next-line no-restricted-imports
 import { legacyRuleActionsSavedObjectType } from '../rule_actions/legacy_saved_object_mappings';
 import { LegacyMigrateParams } from './types';
+import { RuleAlertAction } from '../../../../common/detection_engine/types';
 
 export const calculateInterval = (
   interval: string | undefined,
@@ -331,6 +335,10 @@ export const legacyMigrate = async ({
     }),
     savedObjectsClient.find({
       type: legacyRuleActionsSavedObjectType,
+      hasReference: {
+        type: 'alert',
+        id: rule.id,
+      },
     }),
   ]);
 
@@ -344,8 +352,10 @@ export const legacyMigrate = async ({
           )
         : null,
     ]);
+
+    const { id, ...restOfRule } = rule;
     const migratedRule = {
-      ...rule,
+      ...restOfRule,
       actions: siemNotification.data[0].actions,
       throttle: siemNotification.data[0].schedule.interval,
       notifyWhen: transformToNotifyWhen(siemNotification.data[0].throttle),
@@ -354,7 +364,39 @@ export const legacyMigrate = async ({
       id: rule.id,
       data: migratedRule,
     });
-    return migratedRule;
+    return { id: rule.id, ...migratedRule };
   }
   return rule;
 };
+
+export const updateThrottleNotifyWhen = (
+  transform: typeof transformToAlertThrottle | typeof transformToNotifyWhen,
+  migratedRuleThrottle: string | null | undefined,
+  existingRuleThrottle: string | null | undefined,
+  ruleUpdateThrottle: string | null | undefined
+) => {
+  if (existingRuleThrottle == null && ruleUpdateThrottle == null && migratedRuleThrottle != null) {
+    return migratedRuleThrottle;
+  }
+  return transform(ruleUpdateThrottle);
+};
+
+export const updateActions = (
+  transform: typeof transformRuleToAlertAction,
+  migratedRuleActions: AlertAction[] | null | undefined,
+  existingRuleActions: AlertAction[] | null | undefined,
+  ruleUpdateActions: RuleAlertAction[] | null | undefined
+) => {
+  // if the existing rule actions and the rule update actions are equivalent (aka no change)
+  // but the migrated actions and the ruleUpdateActions (or existing rule actions, associatively)
+  // are not equivalent, we know that the rules' actions were migrated and we need to apply
+  // that change to the update request so it is not overwritten by the rule update payload
+  if (
+    existingRuleActions?.length === 0 &&
+    ruleUpdateActions == null &&
+    !isEqual(existingRuleActions, migratedRuleActions)
+  ) {
+    return migratedRuleActions;
+  }
+  return ruleUpdateActions != null ? ruleUpdateActions.map(transform) : [];
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_action_instances.sh b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_action_instances.sh
index 01248d32cf025..90c7529c29802 100755
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_action_instances.sh
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_action_instances.sh
@@ -11,7 +11,7 @@ set -e
 ./check_env_variables.sh
 
 # Example: ./get_action_instances.sh
-# https://github.com/elastic/kibana/blob/master/x-pack/plugins/actions/README.md#get-apiaction_find-find-actions
+# https://github.com/elastic/kibana/blob/main/x-pack/plugins/actions/README.md#get-apiaction_find-find-actions
 curl -s -k \
   -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
   -X GET ${KIBANA_URL}${SPACE_URL}/api/actions \
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_action_types.sh b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_action_types.sh
index 0aa6eeb04c28e..3b7006e02a52d 100755
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_action_types.sh
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_action_types.sh
@@ -11,7 +11,7 @@ set -e
 ./check_env_variables.sh
 
 # Example: ./get_action_types.sh
-# https://github.com/elastic/kibana/blob/master/x-pack/plugins/actions/README.md
+# https://github.com/elastic/kibana/blob/main/x-pack/plugins/actions/README.md
 curl -s -k \
   -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
   -X GET ${KIBANA_URL}${SPACE_URL}/api/actions/connector_types \
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_alert_instances.sh b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_alert_instances.sh
index f5df0c368300c..f2ba9bb70a7c6 100755
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_alert_instances.sh
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_alert_instances.sh
@@ -11,7 +11,7 @@ set -e
 ./check_env_variables.sh
 
 # Example: ./get_alert_instances.sh
-# https://github.com/elastic/kibana/blob/master/x-pack/plugins/alerting/README.md#get-apialert_find-find-alerts
+# https://github.com/elastic/kibana/blob/main/x-pack/plugins/alerting/README.md#get-apialert_find-find-alerts
 curl -s -k \
   -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
   -X GET ${KIBANA_URL}${SPACE_URL}/api/alerts/_find \
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_alert_types.sh b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_alert_types.sh
index 46659766bce16..9b51c289ac2c3 100755
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_alert_types.sh
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/get_alert_types.sh
@@ -11,7 +11,7 @@ set -e
 ./check_env_variables.sh
 
 # Example: ./get_alert_types.sh
-# https://github.com/elastic/kibana/blob/master/x-pack/plugins/alerting/README.md#get-apialerttypes-list-alert-types
+# https://github.com/elastic/kibana/blob/main/x-pack/plugins/alerting/README.md#get-apialerttypes-list-alert-types
 curl -s -k \
   -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
   -X GET ${KIBANA_URL}${SPACE_URL}/api/alerts/list_alert_types \
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts
index 155334709e980..3db8d51ab76ed 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/executors/ml.ts
@@ -104,7 +104,7 @@ export const mlExecutor = async ({
 
   const anomalyCount = filteredAnomalyResults.hits.hits.length;
   if (anomalyCount) {
-    logger.info(buildRuleMessage(`Found ${anomalyCount} signals from ML anomalies.`));
+    logger.debug(buildRuleMessage(`Found ${anomalyCount} signals from ML anomalies.`));
   }
   const { success, errors, bulkCreateDuration, createdItemsCount, createdItems } =
     await bulkCreateMlSignals({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
index cd301511d9ac5..6de039f083ba3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -426,7 +426,7 @@ export const signalRulesAlertType = ({
                 ?.kibana_siem_app_url,
             });
 
-            logger.info(
+            logger.debug(
               buildRuleMessage(`Found ${result.createdSignalsCount} signals for notification.`)
             );
 
@@ -478,8 +478,7 @@ export const signalRulesAlertType = ({
             });
           }
 
-          // adding this log line so we can get some information from cloud
-          logger.info(
+          logger.debug(
             buildRuleMessage(
               `[+] Finished indexing ${result.createdSignalsCount}  ${
                 !isEmpty(tuples)
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
index 684d24738b8f9..7cdcae96490a9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
@@ -58,7 +58,7 @@ import {
   ThreatRuleParams,
   ThresholdRuleParams,
 } from '../schemas/rule_schemas';
-import { WrappedRACAlert } from '../rule_types/types';
+import { RACAlert, WrappedRACAlert } from '../rule_types/types';
 import { SearchTypes } from '../../../../common/detection_engine/types';
 import { IRuleExecutionLogClient } from '../rule_execution_log/types';
 interface SortExceptionsReturn {
@@ -985,6 +985,10 @@ export const isWrappedRACAlert = (event: SimpleHit): event is WrappedRACAlert =>
   return (event as WrappedRACAlert)?._source?.[ALERT_UUID] != null;
 };
 
+export const isRACAlert = (event: unknown): event is RACAlert => {
+  return (event as RACAlert)?.[ALERT_UUID] != null;
+};
+
 export const racFieldMappings: Record<string, string> = {
   'signal.rule.id': ALERT_RULE_UUID,
 };
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/filters.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/filters.test.ts
index 4844a10d99f90..926816149d25c 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/filters.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/filters.test.ts
@@ -10,6 +10,7 @@ import { copyAllowlistedFields } from './filters';
 describe('Security Telemetry filters', () => {
   describe('allowlistEventFields', () => {
     const allowlist = {
+      _id: true,
       a: true,
       b: true,
       c: {
@@ -19,12 +20,14 @@ describe('Security Telemetry filters', () => {
 
     it('filters top level', () => {
       const event = {
+        _id: 'id',
         a: 'a',
         a1: 'a1',
         b: 'b',
         b1: 'b1',
       };
       expect(copyAllowlistedFields(allowlist, event)).toStrictEqual({
+        _id: 'id',
         a: 'a',
         b: 'b',
       });
diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/filters.ts b/x-pack/plugins/security_solution/server/lib/telemetry/filters.ts
index e0955c9508f87..b3316458365d5 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/filters.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/filters.ts
@@ -105,6 +105,7 @@ const allowlistBaseEventFields: AllowlistFields = {
 // blindly. Object contents means that we only copy the fields that appear explicitly in
 // the sub-object.
 export const allowlistEventFields: AllowlistFields = {
+  _id: true,
   '@timestamp': true,
   agent: true,
   Endpoint: true,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/constants.ts b/x-pack/plugins/security_solution/server/lib/timeline/constants.ts
index e38096bc2e82c..916fe726210cd 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/constants.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/constants.ts
@@ -12,7 +12,7 @@ export const SAVED_QUERY_ID_REF_NAME = 'savedQueryId';
 
 /**
  * This needs to match the type of the saved query saved object. That type is defined here:
- * https://github.com/elastic/kibana/blob/master/src/plugins/data/public/query/saved_query/saved_query_service.ts#L54
+ * https://github.com/elastic/kibana/blob/main/src/plugins/data/public/query/saved_query/saved_query_service.ts#L54
  */
 export const SAVED_QUERY_TYPE = 'query';
 
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts
index 1abcd4d28568b..c75b20f44035a 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/__mocks__/index.ts
@@ -2098,8 +2098,8 @@ export const formattedPreviewStrategyResponse = {
       JSON.stringify(
         {
           index: ['.siem-preview-signals-default'],
-          allowNoIndices: true,
-          ignoreUnavailable: true,
+          allow_no_indices: true,
+          ignore_unavailable: true,
           track_total_hits: true,
           body: {
             aggregations: {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/__mocks__/index.ts
index aa8728c97b937..2ff4831616ab9 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/__mocks__/index.ts
@@ -18,8 +18,8 @@ export const mockOptions = {
 
 export const expectedDsl = {
   index: ['.siem-preview-signals-default'],
-  allowNoIndices: true,
-  ignoreUnavailable: true,
+  allow_no_indices: true,
+  ignore_unavailable: true,
   track_total_hits: true,
   body: {
     aggregations: {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.ts
index a98117feadd73..dde09860109b0 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram/preview/query.preview_histogram.dsl.ts
@@ -65,8 +65,8 @@ export const buildPreviewHistogramQuery = ({
 
   const dslQuery = {
     index: defaultIndex,
-    allowNoIndices: true,
-    ignoreUnavailable: true,
+    allow_no_indices: true,
+    ignore_unavailable: true,
     track_total_hits: true,
     body: {
       aggregations: getHistogramAggregation(),
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx
index 988564d0140cc..a9768bea9d1ed 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.test.tsx
@@ -112,8 +112,7 @@ const setup = async (opts: SetupOpts = {}) => {
   return { wrapper, onClose, mockSpacesManager, mockToastNotifications, savedObjectToCopy };
 };
 
-// flaky https://github.com/elastic/kibana/issues/96708
-describe.skip('CopyToSpaceFlyout', () => {
+describe('CopyToSpaceFlyout', () => {
   it('waits for spaces to load', async () => {
     const { wrapper } = await setup({ returnBeforeSpacesLoad: true });
 
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx
index 7697780c352c9..3ff72e131aa66 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_internal.tsx
@@ -75,7 +75,7 @@ export const CopyToSpaceFlyoutInternal = (props: CopyToSpaceFlyoutProps) => {
           isLoading: false,
           spaces: [...spacesMap.values()].filter(
             ({ isActiveSpace, isAuthorizedForPurpose }) =>
-              isActiveSpace || isAuthorizedForPurpose('copySavedObjectsIntoSpace')
+              !isActiveSpace && isAuthorizedForPurpose('copySavedObjectsIntoSpace')
           ),
         });
       })
diff --git a/x-pack/plugins/telemetry_collection_xpack/README.md b/x-pack/plugins/telemetry_collection_xpack/README.md
index 6c205bb17c663..b055719c19585 100644
--- a/x-pack/plugins/telemetry_collection_xpack/README.md
+++ b/x-pack/plugins/telemetry_collection_xpack/README.md
@@ -6,4 +6,4 @@ Gathers all usage collection, retrieving them from both: OSS and X-Pack plugins.
 
 ## Development
 
-See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions on how to set up your development environment.
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions on how to set up your development environment.
diff --git a/x-pack/plugins/translations/README.asciidoc b/x-pack/plugins/translations/README.asciidoc
index 3690297a097cb..52ab4b4fda8b8 100644
--- a/x-pack/plugins/translations/README.asciidoc
+++ b/x-pack/plugins/translations/README.asciidoc
@@ -2,4 +2,4 @@
 == Translations plugin
 
 Contains Elastic-supported translations. Owned by the Localizations team.
-For adding localizations and instrument a ui to support translated content, see https://github.com/elastic/kibana/tree/master/packages/kbn-i18n[kbn-i18n]
+For adding localizations and instrument a ui to support translated content, see https://github.com/elastic/kibana/tree/main/packages/kbn-i18n[kbn-i18n]
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 810f301cb9129..7ab4c7d31d745 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -20556,8 +20556,6 @@
     "xpack.securitySolution.detectionEngine.components.allRules.refreshPromptConfirm": "続行",
     "xpack.securitySolution.detectionEngine.components.allRules.refreshPromptTitle": "応答してください。",
     "xpack.securitySolution.detectionEngine.components.importRuleModal.cancelTitle": "キャンセル",
-    "xpack.securitySolution.detectionEngine.components.importRuleModal.importFailedDetailedTitle": "ルールID：{ruleId}\n ステータスコード：{statusCode}\n メッセージ：{message}",
-    "xpack.securitySolution.detectionEngine.components.importRuleModal.importFailedTitle": "ルールをインポートできませんでした",
     "xpack.securitySolution.detectionEngine.components.importRuleModal.importRuleTitle": "ルールのインポート",
     "xpack.securitySolution.detectionEngine.components.importRuleModal.initialPromptTextDescription": "有効なrules_export.ndjsonファイルを選択するか、ドラッグしてドロップします",
     "xpack.securitySolution.detectionEngine.components.importRuleModal.overwriteDescription": "競合するルールIDで既存の検出を上書き",
@@ -22820,8 +22818,6 @@
     "xpack.securitySolution.timelines.allTimelines.errorFetchingTimelinesTitle": "すべてのタイムラインデータをクエリできませんでした",
     "xpack.securitySolution.timelines.allTimelines.importTimelineTitle": "インポート",
     "xpack.securitySolution.timelines.allTimelines.panelTitle": "すべてのタイムライン",
-    "xpack.securitySolution.timelines.components.importTimelineModal.importFailedDetailedTitle": "タイムライン ID：{id}\n ステータスコード：{statusCode}\n メッセージ：{message}",
-    "xpack.securitySolution.timelines.components.importTimelineModal.importFailedTitle": "インポートできませんでした",
     "xpack.securitySolution.timelines.components.importTimelineModal.importTimelineTitle": "インポート",
     "xpack.securitySolution.timelines.components.importTimelineModal.importTitle": "インポート…",
     "xpack.securitySolution.timelines.components.importTimelineModal.initialPromptTextDescription": "有効な timelines_export.ndjson ファイルを選択するか、またはドラッグアンドドロップします",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 33a39f54ead03..1208277001cb9 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -20871,8 +20871,6 @@
     "xpack.securitySolution.detectionEngine.components.allRules.refreshPromptConfirm": "继续",
     "xpack.securitySolution.detectionEngine.components.allRules.refreshPromptTitle": "您还在吗？",
     "xpack.securitySolution.detectionEngine.components.importRuleModal.cancelTitle": "取消",
-    "xpack.securitySolution.detectionEngine.components.importRuleModal.importFailedDetailedTitle": "规则 ID：{ruleId}\n 状态代码：{statusCode}\n 消息：{message}",
-    "xpack.securitySolution.detectionEngine.components.importRuleModal.importFailedTitle": "无法导入规则",
     "xpack.securitySolution.detectionEngine.components.importRuleModal.importRuleTitle": "导入规则",
     "xpack.securitySolution.detectionEngine.components.importRuleModal.initialPromptTextDescription": "选择或拖放有效 rules_export.ndjson 文件",
     "xpack.securitySolution.detectionEngine.components.importRuleModal.overwriteDescription": "覆盖具有冲突规则 ID 的现有检测规则",
@@ -23193,8 +23191,6 @@
     "xpack.securitySolution.timelines.allTimelines.errorFetchingTimelinesTitle": "无法查询所有时间线数据",
     "xpack.securitySolution.timelines.allTimelines.importTimelineTitle": "导入",
     "xpack.securitySolution.timelines.allTimelines.panelTitle": "所有时间线",
-    "xpack.securitySolution.timelines.components.importTimelineModal.importFailedDetailedTitle": "时间线 ID：{id}\n 状态代码：{statusCode}\n 消息：{message}",
-    "xpack.securitySolution.timelines.components.importTimelineModal.importFailedTitle": "无法导入",
     "xpack.securitySolution.timelines.components.importTimelineModal.importTimelineTitle": "导入",
     "xpack.securitySolution.timelines.components.importTimelineModal.importTitle": "导入……",
     "xpack.securitySolution.timelines.components.importTimelineModal.initialPromptTextDescription": "搜索或拖放有效的 timelines_export.ndjson 文件",
diff --git a/x-pack/plugins/triggers_actions_ui/README.md b/x-pack/plugins/triggers_actions_ui/README.md
index 999d62db304f8..d4967552080fe 100644
--- a/x-pack/plugins/triggers_actions_ui/README.md
+++ b/x-pack/plugins/triggers_actions_ui/README.md
@@ -256,7 +256,7 @@ Each alert type should be defined as `AlertTypeModel` object with the these prop
 |requiresAppContext|Define if alert type is enabled for create and edit in the alerting management UI.|
 
 IMPORTANT: The current UI supports a single action group only. 
-Action groups are mapped from the server API result for [GET /api/alerts/list_alert_types: List alert types](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting#get-apialerttypes-list-alert-types).
+Action groups are mapped from the server API result for [GET /api/alerts/list_alert_types: List alert types](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting#get-apialerttypes-list-alert-types).
 Server side alert type model:
 ```
 export interface AlertType {
@@ -294,7 +294,7 @@ triggersActionsUi.ruleTypeRegistry.register(getSomeNewAlertType());
 
 ## Create and register new alert type UI example
 
-Before registering a UI for a new Alert Type, you should first register the type on the server-side by following the Alerting guide: https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting#example 
+Before registering a UI for a new Alert Type, you should first register the type on the server-side by following the Alerting guide: https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting#example 
 
 Alert type UI is expected to be defined as `AlertTypeModel` object.
 
@@ -1149,7 +1149,7 @@ triggersActionsUi.actionTypeRegistry.register(getSomeNewActionType());
 
 ## Create and register new action type UI
 
-Before starting the UI implementation, the [server side registration](https://github.com/elastic/kibana/tree/master/x-pack/plugins/actions#action-types) should be done first.
+Before starting the UI implementation, the [server side registration](https://github.com/elastic/kibana/tree/main/x-pack/plugins/actions#action-types) should be done first.
 
 Action type UI is expected to be defined as `ActionTypeModel` object.
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts
index 38d65b923b374..91b4f1e343bc7 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts
@@ -8,87 +8,96 @@
 import { httpServiceMock } from '../../../../../../../../src/core/public/mocks';
 import { getIssueTypes, getFieldsByIssueType, getIssues, getIssue } from './api';
 
-const issueTypesResponse = {
-  status: 'ok',
-  data: {
-    projects: [
-      {
-        issuetypes: [
-          {
-            id: '10006',
-            name: 'Task',
-          },
-          {
-            id: '10007',
-            name: 'Bug',
-          },
-        ],
-      },
-    ],
-  },
-  actionId: 'test',
+const issueTypesData = {
+  projects: [
+    {
+      issuetypes: [
+        {
+          id: '10006',
+          name: 'Task',
+        },
+        {
+          id: '10007',
+          name: 'Bug',
+        },
+      ],
+    },
+  ],
 };
 
-const fieldsResponse = {
-  status: 'ok',
-  data: {
-    projects: [
-      {
-        issuetypes: [
-          {
-            id: '10006',
-            name: 'Task',
-            fields: {
-              summary: { fieldId: 'summary' },
-              priority: {
-                fieldId: 'priority',
-                allowedValues: [
-                  {
-                    name: 'Highest',
-                    id: '1',
-                  },
-                  {
-                    name: 'High',
-                    id: '2',
-                  },
-                  {
-                    name: 'Medium',
-                    id: '3',
-                  },
-                  {
-                    name: 'Low',
-                    id: '4',
-                  },
-                  {
-                    name: 'Lowest',
-                    id: '5',
-                  },
-                ],
-                defaultValue: {
+const fieldData = {
+  projects: [
+    {
+      issuetypes: [
+        {
+          id: '10006',
+          name: 'Task',
+          fields: {
+            summary: { fieldId: 'summary' },
+            priority: {
+              fieldId: 'priority',
+              allowedValues: [
+                {
+                  name: 'Highest',
+                  id: '1',
+                },
+                {
+                  name: 'High',
+                  id: '2',
+                },
+                {
                   name: 'Medium',
                   id: '3',
                 },
+                {
+                  name: 'Low',
+                  id: '4',
+                },
+                {
+                  name: 'Lowest',
+                  id: '5',
+                },
+              ],
+              defaultValue: {
+                name: 'Medium',
+                id: '3',
               },
             },
           },
-        ],
-      },
-    ],
-    actionId: 'test',
-  },
+        },
+      ],
+    },
+  ],
+};
+
+const issueTypesResponse = {
+  status: 'ok' as const,
+  connector_id: 'test',
+  data: issueTypesData,
+};
+
+const fieldsResponse = {
+  status: 'ok' as const,
+  data: fieldData,
+  connector_id: 'test',
+};
+
+const singleIssue = {
+  id: '10267',
+  key: 'RJ-107',
+  title: 'some title',
 };
 
 const issueResponse = {
-  status: 'ok',
-  data: {
-    id: '10267',
-    key: 'RJ-107',
-    fields: { summary: 'Test title' },
-  },
-  actionId: 'test',
+  status: 'ok' as const,
+  data: singleIssue,
+  connector_id: 'test',
 };
 
-const issuesResponse = [issueResponse];
+const issuesResponse = {
+  ...issueResponse,
+  data: [singleIssue],
+};
 
 describe('Jira API', () => {
   const http = httpServiceMock.createStartContract();
@@ -100,8 +109,11 @@ describe('Jira API', () => {
       const abortCtrl = new AbortController();
       http.post.mockResolvedValueOnce(issueTypesResponse);
       const res = await getIssueTypes({ http, signal: abortCtrl.signal, connectorId: 'te/st' });
-
-      expect(res).toEqual(issueTypesResponse);
+      expect(res).toEqual({
+        status: 'ok' as const,
+        actionId: 'test',
+        data: issueTypesData,
+      });
       expect(http.post).toHaveBeenCalledWith('/api/actions/connector/te%2Fst/_execute', {
         body: '{"params":{"subAction":"issueTypes","subActionParams":{}}}',
         signal: abortCtrl.signal,
@@ -120,7 +132,7 @@ describe('Jira API', () => {
         id: '10006',
       });
 
-      expect(res).toEqual(fieldsResponse);
+      expect(res).toEqual({ status: 'ok', data: fieldData, actionId: 'test' });
       expect(http.post).toHaveBeenCalledWith('/api/actions/connector/te%2Fst/_execute', {
         body: '{"params":{"subAction":"fieldsByIssueType","subActionParams":{"id":"10006"}}}',
         signal: abortCtrl.signal,
@@ -139,7 +151,11 @@ describe('Jira API', () => {
         title: 'test issue',
       });
 
-      expect(res).toEqual(issuesResponse);
+      expect(res).toEqual({
+        status: 'ok',
+        data: [singleIssue],
+        actionId: 'test',
+      });
       expect(http.post).toHaveBeenCalledWith('/api/actions/connector/te%2Fst/_execute', {
         body: '{"params":{"subAction":"issues","subActionParams":{"title":"test issue"}}}',
         signal: abortCtrl.signal,
@@ -150,7 +166,7 @@ describe('Jira API', () => {
   describe('getIssue', () => {
     test('should call get fields API', async () => {
       const abortCtrl = new AbortController();
-      http.post.mockResolvedValueOnce(issuesResponse);
+      http.post.mockResolvedValueOnce(issueResponse);
       const res = await getIssue({
         http,
         signal: abortCtrl.signal,
@@ -158,7 +174,11 @@ describe('Jira API', () => {
         id: 'RJ-107',
       });
 
-      expect(res).toEqual(issuesResponse);
+      expect(res).toEqual({
+        status: 'ok',
+        data: singleIssue,
+        actionId: 'test',
+      });
       expect(http.post).toHaveBeenCalledWith('/api/actions/connector/te%2Fst/_execute', {
         body: '{"params":{"subAction":"issue","subActionParams":{"id":"RJ-107"}}}',
         signal: abortCtrl.signal,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts
index 83e126ea9d2f6..e9cc583ee44ac 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts
@@ -6,7 +6,10 @@
  */
 
 import { HttpSetup } from 'kibana/public';
+import { ActionTypeExecutorResult } from '../../../../../../actions/common';
 import { BASE_ACTION_API_PATH } from '../../../constants';
+import { ConnectorExecutorResult, rewriteResponseToCamelCase } from '../rewrite_response_body';
+import { Fields, Issue, IssueTypes } from './types';
 
 export async function getIssueTypes({
   http,
@@ -16,8 +19,8 @@ export async function getIssueTypes({
   http: HttpSetup;
   signal: AbortSignal;
   connectorId: string;
-}): Promise<Record<string, any>> {
-  return await http.post(
+}): Promise<ActionTypeExecutorResult<IssueTypes>> {
+  const res = await http.post<ConnectorExecutorResult<IssueTypes>>(
     `${BASE_ACTION_API_PATH}/connector/${encodeURIComponent(connectorId)}/_execute`,
     {
       body: JSON.stringify({
@@ -26,6 +29,7 @@ export async function getIssueTypes({
       signal,
     }
   );
+  return rewriteResponseToCamelCase(res);
 }
 
 export async function getFieldsByIssueType({
@@ -38,8 +42,8 @@ export async function getFieldsByIssueType({
   signal: AbortSignal;
   connectorId: string;
   id: string;
-}): Promise<Record<string, any>> {
-  return await http.post(
+}): Promise<ActionTypeExecutorResult<Fields>> {
+  const res = await http.post<ConnectorExecutorResult<Fields>>(
     `${BASE_ACTION_API_PATH}/connector/${encodeURIComponent(connectorId)}/_execute`,
     {
       body: JSON.stringify({
@@ -48,6 +52,7 @@ export async function getFieldsByIssueType({
       signal,
     }
   );
+  return rewriteResponseToCamelCase(res);
 }
 
 export async function getIssues({
@@ -60,8 +65,8 @@ export async function getIssues({
   signal: AbortSignal;
   connectorId: string;
   title: string;
-}): Promise<Record<string, any>> {
-  return await http.post(
+}): Promise<ActionTypeExecutorResult<Issue[]>> {
+  const res = await http.post<ConnectorExecutorResult<Issue[]>>(
     `${BASE_ACTION_API_PATH}/connector/${encodeURIComponent(connectorId)}/_execute`,
     {
       body: JSON.stringify({
@@ -70,6 +75,7 @@ export async function getIssues({
       signal,
     }
   );
+  return rewriteResponseToCamelCase(res);
 }
 
 export async function getIssue({
@@ -82,8 +88,8 @@ export async function getIssue({
   signal: AbortSignal;
   connectorId: string;
   id: string;
-}): Promise<Record<string, any>> {
-  return await http.post(
+}): Promise<ActionTypeExecutorResult<Issue>> {
+  const res = await http.post<ConnectorExecutorResult<Issue>>(
     `${BASE_ACTION_API_PATH}/connector/${encodeURIComponent(connectorId)}/_execute`,
     {
       body: JSON.stringify({
@@ -92,4 +98,5 @@ export async function getIssue({
       signal,
     }
   );
+  return rewriteResponseToCamelCase(res);
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx
index 1090414104c24..38aed2cfc6f88 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/search_issues.tsx
@@ -8,7 +8,7 @@
 import React, { useMemo, useEffect, useCallback, useState, memo } from 'react';
 import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, IToasts } from 'kibana/public';
 import { ActionConnector } from '../../../../types';
 import { useGetIssues } from './use_get_issues';
 import { useGetSingleIssue } from './use_get_single_issue';
@@ -17,10 +17,7 @@ import * as i18n from './translations';
 interface Props {
   selectedValue?: string | null;
   http: HttpSetup;
-  toastNotifications: Pick<
-    ToastsApi,
-    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
-  >;
+  toastNotifications: IToasts;
   actionConnector?: ActionConnector;
   onChange: (parentIssueKey: string) => void;
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts
index 01165147a7c0e..6073971912acc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/types.ts
@@ -24,3 +24,18 @@ export interface JiraSecrets {
   email: string;
   apiToken: string;
 }
+
+export type IssueTypes = Array<{ id: string; name: string }>;
+
+export interface Issue {
+  id: string;
+  key: string;
+  title: string;
+}
+
+export interface Fields {
+  [key: string]: {
+    allowedValues: Array<{ name: string; id: string }> | [];
+    defaultValue: { name: string; id: string } | {};
+  };
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx
index 61db73c129db6..71dafef4dca2e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_fields_by_issue_type.tsx
@@ -6,24 +6,15 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, IToasts } from 'kibana/public';
 import { ActionConnector } from '../../../../types';
+import { Fields } from './types';
 import { getFieldsByIssueType } from './api';
 import * as i18n from './translations';
 
-interface Fields {
-  [key: string]: {
-    allowedValues: Array<{ name: string; id: string }> | [];
-    defaultValue: { name: string; id: string } | {};
-  };
-}
-
 interface Props {
   http: HttpSetup;
-  toastNotifications: Pick<
-    ToastsApi,
-    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
-  >;
+  toastNotifications: IToasts;
   issueType: string | undefined;
   actionConnector?: ActionConnector;
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx
index 11430c4c372dc..09ed90b296d06 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issue_types.tsx
@@ -6,19 +6,16 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, IToasts } from 'kibana/public';
+
 import { ActionConnector } from '../../../../types';
+import { IssueTypes } from './types';
 import { getIssueTypes } from './api';
 import * as i18n from './translations';
 
-type IssueTypes = Array<{ id: string; name: string }>;
-
 interface Props {
   http: HttpSetup;
-  toastNotifications: Pick<
-    ToastsApi,
-    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
-  >;
+  toastNotifications: IToasts;
   actionConnector?: ActionConnector;
 }
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx
index e0423304325a3..3ad67709f82fb 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_issues.tsx
@@ -7,25 +7,21 @@
 
 import { isEmpty, debounce } from 'lodash/fp';
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, IToasts } from 'kibana/public';
 import { ActionConnector } from '../../../../types';
+import { Issue } from './types';
 import { getIssues } from './api';
 import * as i18n from './translations';
 
-type Issues = Array<{ id: string; key: string; title: string }>;
-
 interface Props {
   http: HttpSetup;
-  toastNotifications: Pick<
-    ToastsApi,
-    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
-  >;
+  toastNotifications: IToasts;
   actionConnector?: ActionConnector;
   query: string | null;
 }
 
 export interface UseGetIssues {
-  issues: Issues;
+  issues: Issue[];
   isLoading: boolean;
 }
 
@@ -36,7 +32,7 @@ export const useGetIssues = ({
   query,
 }: Props): UseGetIssues => {
   const [isLoading, setIsLoading] = useState(false);
-  const [issues, setIssues] = useState<Issues>([]);
+  const [issues, setIssues] = useState<Issue[]>([]);
   const abortCtrl = useRef(new AbortController());
 
   useEffect(() => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx
index e0099e24f2c5d..62ddb8b6e362b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/use_get_single_issue.tsx
@@ -6,23 +6,15 @@
  */
 
 import { useState, useEffect, useRef } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, IToasts } from 'kibana/public';
 import { ActionConnector } from '../../../../types';
+import { Issue } from './types';
 import { getIssue } from './api';
 import * as i18n from './translations';
 
-interface Issue {
-  id: string;
-  key: string;
-  title: string;
-}
-
 interface Props {
   http: HttpSetup;
-  toastNotifications: Pick<
-    ToastsApi,
-    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
-  >;
+  toastNotifications: IToasts;
   id?: string | null;
   actionConnector?: ActionConnector;
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts
index 0d4bf9148a92f..a345a9c81beb0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts
@@ -32,7 +32,6 @@ const incidentTypesResponse = {
     { id: 16, name: 'TBD / Unknown' },
     { id: 15, name: 'Vendor / 3rd party error' },
   ],
-  actionId: 'te/st',
 };
 
 const severityResponse = {
@@ -42,7 +41,6 @@ const severityResponse = {
     { id: 5, name: 'Medium' },
     { id: 6, name: 'High' },
   ],
-  actionId: 'te/st',
 };
 
 describe('Resilient API', () => {
@@ -53,14 +51,14 @@ describe('Resilient API', () => {
   describe('getIncidentTypes', () => {
     test('should call get choices API', async () => {
       const abortCtrl = new AbortController();
-      http.post.mockResolvedValueOnce(incidentTypesResponse);
+      http.post.mockResolvedValueOnce({ ...incidentTypesResponse, connector_id: 'te/st' });
       const res = await getIncidentTypes({
         http,
         signal: abortCtrl.signal,
         connectorId: 'te/st',
       });
 
-      expect(res).toEqual(incidentTypesResponse);
+      expect(res).toEqual({ ...incidentTypesResponse, actionId: 'te/st' });
       expect(http.post).toHaveBeenCalledWith('/api/actions/connector/te%2Fst/_execute', {
         body: '{"params":{"subAction":"incidentTypes","subActionParams":{}}}',
         signal: abortCtrl.signal,
@@ -71,14 +69,15 @@ describe('Resilient API', () => {
   describe('getSeverity', () => {
     test('should call get choices API', async () => {
       const abortCtrl = new AbortController();
-      http.post.mockResolvedValueOnce(severityResponse);
+      http.post.mockResolvedValueOnce({ ...severityResponse, connector_id: 'te/st' });
       const res = await getSeverity({
         http,
         signal: abortCtrl.signal,
         connectorId: 'te/st',
       });
 
-      expect(res).toEqual(severityResponse);
+      expect(res).toEqual({ ...severityResponse, actionId: 'te/st' });
+
       expect(http.post).toHaveBeenCalledWith('/api/actions/connector/te%2Fst/_execute', {
         body: '{"params":{"subAction":"severity","subActionParams":{}}}',
         signal: abortCtrl.signal,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts
index 6bd9c43105cf0..e3a46c5a875c7 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts
@@ -7,6 +7,7 @@
 
 import { HttpSetup } from 'kibana/public';
 import { BASE_ACTION_API_PATH } from '../../../constants';
+import { rewriteResponseToCamelCase } from '../rewrite_response_body';
 
 export async function getIncidentTypes({
   http,
@@ -17,7 +18,7 @@ export async function getIncidentTypes({
   signal: AbortSignal;
   connectorId: string;
 }): Promise<Record<string, any>> {
-  return await http.post(
+  const res = await http.post(
     `${BASE_ACTION_API_PATH}/connector/${encodeURIComponent(connectorId)}/_execute`,
     {
       body: JSON.stringify({
@@ -26,6 +27,7 @@ export async function getIncidentTypes({
       signal,
     }
   );
+  return rewriteResponseToCamelCase(res);
 }
 
 export async function getSeverity({
@@ -37,7 +39,7 @@ export async function getSeverity({
   signal: AbortSignal;
   connectorId: string;
 }): Promise<Record<string, any>> {
-  return await http.post(
+  const res = await http.post(
     `${BASE_ACTION_API_PATH}/connector/${encodeURIComponent(connectorId)}/_execute`,
     {
       body: JSON.stringify({
@@ -46,4 +48,5 @@ export async function getSeverity({
       signal,
     }
   );
+  return rewriteResponseToCamelCase(res);
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/rewrite_response_body.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/rewrite_response_body.ts
new file mode 100644
index 0000000000000..d9bf48c4ab854
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/rewrite_response_body.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 { ActionTypeExecutorResult, RewriteResponseCase } from '../../../../../actions/common';
+
+export type ConnectorExecutorResult<T> = ReturnType<
+  RewriteResponseCase<ActionTypeExecutorResult<T>>
+>;
+
+export const rewriteResponseToCamelCase = <T>({
+  connector_id: actionId,
+  service_message: serviceMessage,
+  ...data
+}: ConnectorExecutorResult<T>): ActionTypeExecutorResult<T> => ({
+  ...data,
+  actionId,
+  ...(serviceMessage && { serviceMessage }),
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts
index 32a2d0296d4c9..13cd3e5313165 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts
@@ -6,11 +6,15 @@
  */
 
 import { HttpSetup } from 'kibana/public';
+
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { snExternalServiceConfig } from '../../../../../../actions/server/builtin_action_types/servicenow/config';
 import { BASE_ACTION_API_PATH } from '../../../constants';
 import { API_INFO_ERROR } from './translations';
 import { AppInfo, RESTApiError } from './types';
+import { ConnectorExecutorResult, rewriteResponseToCamelCase } from '../rewrite_response_body';
+import { ActionTypeExecutorResult } from '../../../../../../actions/common';
+import { Choice } from './types';
 
 export async function getChoices({
   http,
@@ -22,8 +26,8 @@ export async function getChoices({
   signal: AbortSignal;
   connectorId: string;
   fields: string[];
-}): Promise<Record<string, any>> {
-  return await http.post(
+}): Promise<ActionTypeExecutorResult<Choice[]>> {
+  const res = await http.post<ConnectorExecutorResult<Choice[]>>(
     `${BASE_ACTION_API_PATH}/connector/${encodeURIComponent(connectorId)}/_execute`,
     {
       body: JSON.stringify({
@@ -32,6 +36,7 @@ export async function getChoices({
       signal,
     }
   );
+  return rewriteResponseToCamelCase(res);
 }
 
 /**
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.test.tsx
index 48c0fb2109f55..175a80c63d4b7 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.test.tsx
@@ -122,7 +122,7 @@ describe('UseChoices', () => {
   it('it displays an error when service fails', async () => {
     getChoicesMock.mockResolvedValue({
       status: 'error',
-      service_message: 'An error occurred',
+      serviceMessage: 'An error occurred',
     });
 
     const { waitForNextUpdate } = renderHook<UseChoicesProps, UseChoices>(() =>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx
index 5493fdaee8bfa..bfad678f9b24b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_choices.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useCallback, useMemo, useState } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, IToasts } from 'kibana/public';
 
 import { ActionConnector } from '../../../../types';
 import { Choice, Fields } from './types';
@@ -14,10 +14,7 @@ import { useGetChoices } from './use_get_choices';
 
 export interface UseChoicesProps {
   http: HttpSetup;
-  toastNotifications: Pick<
-    ToastsApi,
-    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
-  >;
+  toastNotifications: IToasts;
   actionConnector?: ActionConnector;
   fields: string[];
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.test.tsx
index 532789385e8bd..ecbc9512a4d3a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.test.tsx
@@ -121,7 +121,7 @@ describe('useGetChoices', () => {
   it('it displays an error when service fails', async () => {
     getChoicesMock.mockResolvedValue({
       status: 'error',
-      service_message: 'An error occurred',
+      serviceMessage: 'An error occurred',
     });
 
     const { waitForNextUpdate } = renderHook<UseGetChoicesProps, UseGetChoices>(() =>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx
index f4c881c633cdc..b115c84562ae6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_choices.tsx
@@ -6,7 +6,7 @@
  */
 
 import { useState, useEffect, useRef, useCallback } from 'react';
-import { HttpSetup, ToastsApi } from 'kibana/public';
+import { HttpSetup, IToasts } from 'kibana/public';
 import { ActionConnector } from '../../../../types';
 import { getChoices } from './api';
 import { Choice } from './types';
@@ -14,10 +14,7 @@ import * as i18n from './translations';
 
 export interface UseGetChoicesProps {
   http: HttpSetup;
-  toastNotifications: Pick<
-    ToastsApi,
-    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
-  >;
+  toastNotifications: IToasts;
   actionConnector?: ActionConnector;
   fields: string[];
   onSuccess?: (choices: Choice[]) => void;
@@ -66,7 +63,7 @@ export const useGetChoices = ({
         if (res.status && res.status === 'error') {
           toastNotifications.addDanger({
             title: i18n.CHOICES_API_ERROR,
-            text: `${res.service_message ?? res.message}`,
+            text: `${res.serviceMessage ?? res.message}`,
           });
         } else if (onSuccess) {
           onSuccess(data);
diff --git a/x-pack/plugins/uptime/server/lib/requests/__snapshots__/get_monitor_details.test.ts.snap b/x-pack/plugins/uptime/server/lib/requests/__snapshots__/get_monitor_details.test.ts.snap
new file mode 100644
index 0000000000000..56b7ed25a74ad
--- /dev/null
+++ b/x-pack/plugins/uptime/server/lib/requests/__snapshots__/get_monitor_details.test.ts.snap
@@ -0,0 +1,109 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`getMonitorDetails getMonitorAlerts should use expected filters for the query 1`] = `
+Array [
+  Object {
+    "body": Object {
+      "aggs": Object {
+        "monitors": Object {
+          "terms": Object {
+            "field": "monitor.id",
+            "size": 1000,
+          },
+        },
+      },
+      "query": Object {
+        "bool": Object {
+          "filter": Array [
+            Object {
+              "term": Object {
+                "monitor.id": "fooID",
+              },
+            },
+            Object {
+              "bool": Object {
+                "filter": Array [
+                  Object {
+                    "bool": Object {
+                      "minimum_should_match": 1,
+                      "should": Array [
+                        Object {
+                          "match": Object {
+                            "monitor.type": "http",
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  Object {
+                    "bool": Object {
+                      "minimum_should_match": 1,
+                      "should": Array [
+                        Object {
+                          "match_phrase": Object {
+                            "url.domain": "www.cnn.com",
+                          },
+                        },
+                      ],
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+      "size": 0,
+    },
+    "index": "heartbeat-8*,synthetics-*",
+  },
+]
+`;
+
+exports[`getMonitorDetails getMonitorDetails will provide expected calls 1`] = `
+Array [
+  Object {
+    "body": Object {
+      "_source": Array [
+        "error",
+        "@timestamp",
+      ],
+      "query": Object {
+        "bool": Object {
+          "filter": Array [
+            Object {
+              "range": Object {
+                "@timestamp": Object {
+                  "gte": "now-15m",
+                  "lte": "now",
+                },
+              },
+            },
+            Object {
+              "term": Object {
+                "monitor.id": "fooID",
+              },
+            },
+          ],
+          "must": Array [
+            Object {
+              "exists": Object {
+                "field": "error",
+              },
+            },
+          ],
+        },
+      },
+      "size": 1,
+      "sort": Array [
+        Object {
+          "@timestamp": Object {
+            "order": "desc",
+          },
+        },
+      ],
+    },
+    "index": "heartbeat-8*,synthetics-*",
+  },
+]
+`;
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.test.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.test.ts
new file mode 100644
index 0000000000000..68560faf4f7fe
--- /dev/null
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.test.ts
@@ -0,0 +1,219 @@
+/*
+ * Copyright 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 { mockSearchResult } from './helper';
+import { getMonitorAlerts, getMonitorDetails } from './get_monitor_details';
+import * as statusCheck from '../alerts/status_check';
+
+describe('getMonitorDetails', () => {
+  it('getMonitorDetails will provide expected calls', async () => {
+    expect.assertions(2);
+
+    const uptimeEsClient = mockSearchResult([{ _source: { id: 1 } }]);
+
+    await getMonitorDetails({
+      uptimeEsClient,
+      monitorId: 'fooID',
+      dateStart: 'now-15m',
+      dateEnd: 'now',
+      rulesClient: { find: jest.fn().mockReturnValue({ data: [] }) },
+    });
+    expect(uptimeEsClient.baseESClient.search).toHaveBeenCalledTimes(1);
+
+    expect((uptimeEsClient.baseESClient.search as jest.Mock).mock.calls[0]).toMatchSnapshot();
+  });
+
+  describe('getMonitorAlerts', () => {
+    it('should use expected filters for the query', async function () {
+      const uptimeEsClient = mockSearchResult([{ _source: { id: 1 } }]);
+
+      jest.spyOn(statusCheck, 'formatFilterString').mockImplementation(async () => ({
+        bool: {
+          filter: [
+            {
+              bool: { should: [{ match: { 'monitor.type': 'http' } }], minimum_should_match: 1 },
+            },
+            {
+              bool: {
+                should: [{ match_phrase: { 'url.domain': 'www.cnn.com' } }],
+                minimum_should_match: 1,
+              },
+            },
+          ],
+        },
+      }));
+
+      await getMonitorAlerts({
+        uptimeEsClient,
+        monitorId: 'fooID',
+        rulesClient: {
+          find: jest.fn().mockReturnValue({ data: dummyAlertRules.data }),
+        },
+      });
+      expect(uptimeEsClient.baseESClient.search).toHaveBeenCalledTimes(3);
+
+      const esParams = (uptimeEsClient.baseESClient.search as jest.Mock).mock.calls[0];
+
+      expect(esParams[0].body.query).toEqual({
+        bool: {
+          filter: [
+            {
+              term: {
+                'monitor.id': 'fooID',
+              },
+            },
+            {
+              bool: {
+                filter: [
+                  {
+                    bool: {
+                      minimum_should_match: 1,
+                      should: [
+                        {
+                          match: {
+                            'monitor.type': 'http',
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  {
+                    bool: {
+                      minimum_should_match: 1,
+                      should: [
+                        {
+                          match_phrase: {
+                            'url.domain': 'www.cnn.com',
+                          },
+                        },
+                      ],
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      });
+
+      expect(esParams).toMatchSnapshot();
+    });
+  });
+});
+
+const dummyAlertRules = {
+  page: 1,
+  total: 3,
+  per_page: 10,
+  data: [
+    {
+      id: '9e0cad00-31e7-11ec-b2d2-abfef52bb74d',
+      consumer: 'uptime',
+      tags: [],
+      name: 'browser alerrt',
+      enabled: true,
+      throttle: null,
+      schedule: { interval: '1m' },
+      params: {
+        search: '',
+        numTimes: 5,
+        timerangeUnit: 'm',
+        timerangeCount: 15,
+        shouldCheckStatus: true,
+        shouldCheckAvailability: true,
+        availability: { range: 30, rangeUnit: 'd', threshold: '99' },
+        filters: { tags: [], 'url.port': [], 'observer.geo.name': [], 'monitor.type': ['browser'] },
+      },
+      rule_type_id: 'xpack.uptime.alerts.monitorStatus',
+      created_by: null,
+      updated_by: null,
+      created_at: '2021-10-20T20:52:20.050Z',
+      updated_at: '2021-10-20T20:52:20.050Z',
+      api_key_owner: null,
+      notify_when: 'onActionGroupChange',
+      mute_all: false,
+      muted_alert_ids: [],
+      scheduled_task_id: '9e91bb80-31e7-11ec-b2d2-abfef52bb74d',
+      execution_status: {
+        status: 'active',
+        last_execution_date: '2021-10-21T09:33:22.044Z',
+        last_duration: 414,
+      },
+      actions: [],
+    },
+    {
+      id: 'deb541f0-31e7-11ec-b2d2-abfef52bb74d',
+      consumer: 'alerts',
+      tags: [],
+      name: 'http alert',
+      enabled: true,
+      throttle: null,
+      schedule: { interval: '1m' },
+      params: {
+        search: '',
+        numTimes: 5,
+        timerangeUnit: 'm',
+        timerangeCount: 15,
+        shouldCheckStatus: true,
+        shouldCheckAvailability: true,
+        availability: { range: 30, rangeUnit: 'd', threshold: '99' },
+        filters: { tags: [], 'url.port': [], 'observer.geo.name': [], 'monitor.type': ['http'] },
+      },
+      rule_type_id: 'xpack.uptime.alerts.monitorStatus',
+      created_by: null,
+      updated_by: null,
+      created_at: '2021-10-20T20:54:08.529Z',
+      updated_at: '2021-10-20T20:54:08.529Z',
+      api_key_owner: null,
+      notify_when: 'onActionGroupChange',
+      mute_all: false,
+      muted_alert_ids: [],
+      scheduled_task_id: 'df3e2100-31e7-11ec-b2d2-abfef52bb74d',
+      execution_status: {
+        status: 'ok',
+        last_execution_date: '2021-10-21T09:33:22.044Z',
+        last_duration: 92,
+      },
+      actions: [],
+    },
+    {
+      id: '5bd4f720-31e8-11ec-b2d2-abfef52bb74d',
+      consumer: 'uptime',
+      tags: [],
+      name: 'http rule',
+      enabled: true,
+      throttle: null,
+      schedule: { interval: '1m' },
+      params: {
+        search: 'url.domain : "www.cnn.com" ',
+        numTimes: 5,
+        timerangeUnit: 'm',
+        timerangeCount: 15,
+        shouldCheckStatus: true,
+        shouldCheckAvailability: true,
+        availability: { range: 30, rangeUnit: 'd', threshold: '99' },
+        filters: { tags: [], 'url.port': [], 'observer.geo.name': [], 'monitor.type': ['http'] },
+      },
+      rule_type_id: 'xpack.uptime.alerts.monitorStatus',
+      created_by: null,
+      updated_by: null,
+      created_at: '2021-10-20T20:57:38.451Z',
+      updated_at: '2021-10-20T20:57:38.451Z',
+      api_key_owner: null,
+      notify_when: 'onActionGroupChange',
+      mute_all: false,
+      muted_alert_ids: [],
+      scheduled_task_id: '5bf417e0-31e8-11ec-b2d2-abfef52bb74d',
+      execution_status: {
+        status: 'ok',
+        last_execution_date: '2021-10-21T09:33:22.043Z',
+        last_duration: 87,
+      },
+      actions: [],
+    },
+  ],
+};
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts
index b5994d7e5b1c4..9f77b0833d8b6 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts
@@ -5,10 +5,12 @@
  * 2.0.
  */
 
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { UMElasticsearchQueryFn } from '../adapters';
 import { MonitorDetails, Ping } from '../../../common/runtime_types';
 import { formatFilterString } from '../alerts/status_check';
 import { UptimeESClient } from '../lib';
+import { createEsQuery } from '../../../common/utils/es_search';
 
 export interface GetMonitorDetailsParams {
   monitorId: string;
@@ -17,7 +19,7 @@ export interface GetMonitorDetailsParams {
   rulesClient: any;
 }
 
-const getMonitorAlerts = async ({
+export const getMonitorAlerts = async ({
   uptimeEsClient,
   rulesClient,
   monitorId,
@@ -43,39 +45,48 @@ const getMonitorAlerts = async ({
       monitorAlerts.push(currAlert);
       continue;
     }
-    const esParams = {
-      query: {
-        bool: {
-          filter: [
-            {
-              term: {
-                'monitor.id': monitorId,
+
+    const parsedFilters: QueryDslQueryContainer | undefined = await formatFilterString(
+      uptimeEsClient,
+      currAlert.params.filters,
+      currAlert.params.search
+    );
+
+    const esParams = createEsQuery({
+      body: {
+        query: {
+          bool: {
+            filter: [
+              {
+                term: {
+                  'monitor.id': monitorId,
+                },
               },
-            },
-          ],
+            ] as QueryDslQueryContainer[],
+          },
         },
-      },
-      size: 0,
-      aggs: {
-        monitors: {
-          terms: {
-            field: 'monitor.id',
-            size: 1000,
+        size: 0,
+        aggs: {
+          monitors: {
+            terms: {
+              field: 'monitor.id',
+              size: 1000,
+            },
           },
         },
       },
-    };
+    });
 
-    const parsedFilters = await formatFilterString(
-      uptimeEsClient,
-      currAlert.params.filters,
-      currAlert.params.search
-    );
-    esParams.query.bool = Object.assign({}, esParams.query.bool, parsedFilters?.bool);
+    if (parsedFilters) {
+      esParams.body.query.bool.filter.push(parsedFilters);
+    }
 
-    const { body: result } = await uptimeEsClient.search({ body: esParams });
+    const { body: result } = await uptimeEsClient.search(
+      esParams,
+      `getMonitorsForAlert-${currAlert.name}`
+    );
 
-    if (result.hits.total.value > 0) {
+    if (result?.hits.total.value > 0) {
       monitorAlerts.push(currAlert);
     }
   }
@@ -124,7 +135,7 @@ export const getMonitorDetails: UMElasticsearchQueryFn<GetMonitorDetailsParams,
       ],
     };
 
-    const { body: result } = await uptimeEsClient.search({ body: params });
+    const { body: result } = await uptimeEsClient.search({ body: params }, 'getMonitorDetails');
 
     const data = result.hits.hits[0]?._source as Ping & { '@timestamp': string };
 
diff --git a/x-pack/plugins/uptime/server/lib/requests/helper.ts b/x-pack/plugins/uptime/server/lib/requests/helper.ts
index b12b979d786e6..7e7e661608aa4 100644
--- a/x-pack/plugins/uptime/server/lib/requests/helper.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/helper.ts
@@ -91,8 +91,7 @@ export function mockSearchResult(
 ): UptimeESClient {
   const { esClient: mockEsClient, uptimeEsClient } = getUptimeESMockClient();
 
-  // @ts-expect-error incomplete search response
-  mockEsClient.search.mockResolvedValue({
+  mockEsClient.search = jest.fn().mockResolvedValue({
     body: {
       took: 18,
       timed_out: false,
@@ -113,5 +112,6 @@ export function mockSearchResult(
       aggregations,
     },
   });
+
   return uptimeEsClient;
 }
diff --git a/x-pack/test/apm_api_integration/tests/errors/distribution.ts b/x-pack/test/apm_api_integration/tests/errors/distribution.ts
new file mode 100644
index 0000000000000..4f4b457de86bd
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/errors/distribution.ts
@@ -0,0 +1,204 @@
+/*
+ * Copyright 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 { service, timerange } from '@elastic/apm-synthtrace';
+import expect from '@kbn/expect';
+import { first, last, sumBy } from 'lodash';
+import { isFiniteNumber } from '../../../../plugins/apm/common/utils/is_finite_number';
+import {
+  APIClientRequestParamsOf,
+  APIReturnType,
+} from '../../../../plugins/apm/public/services/rest/createCallApmApi';
+import { RecursivePartial } from '../../../../plugins/apm/typings/common';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { registry } from '../../common/registry';
+
+type ErrorsDistribution =
+  APIReturnType<'GET /internal/apm/services/{serviceName}/errors/distribution'>;
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const apmApiClient = getService('apmApiClient');
+  const synthtraceEsClient = getService('synthtraceEsClient');
+
+  const serviceName = 'synth-go';
+  const start = new Date('2021-01-01T00:00:00.000Z').getTime();
+  const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
+
+  async function callApi(
+    overrides?: RecursivePartial<
+      APIClientRequestParamsOf<'GET /internal/apm/services/{serviceName}/errors/distribution'>['params']
+    >
+  ) {
+    const response = await apmApiClient.readUser({
+      endpoint: 'GET /internal/apm/services/{serviceName}/errors/distribution',
+      params: {
+        path: {
+          serviceName,
+          ...overrides?.path,
+        },
+        query: {
+          start: new Date(start).toISOString(),
+          end: new Date(end).toISOString(),
+          environment: 'ENVIRONMENT_ALL',
+          kuery: '',
+          ...overrides?.query,
+        },
+      },
+    });
+    return response;
+  }
+
+  registry.when('when data is not loaded', { config: 'basic', archives: [] }, () => {
+    it('handles the empty state', async () => {
+      const response = await callApi();
+      expect(response.status).to.be(200);
+      expect(response.body.currentPeriod.length).to.be(0);
+      expect(response.body.previousPeriod.length).to.be(0);
+    });
+  });
+
+  registry.when(
+    'when data is loaded',
+    { config: 'basic', archives: ['apm_mappings_only_8.0.0'] },
+    () => {
+      describe('errors distribution', () => {
+        const appleTransaction = {
+          name: 'GET /apple 🍎 ',
+          successRate: 75,
+          failureRate: 25,
+        };
+        const bananaTransaction = {
+          name: 'GET /banana 🍌',
+          successRate: 50,
+          failureRate: 50,
+        };
+
+        before(async () => {
+          const serviceGoProdInstance = service(serviceName, 'production', 'go').instance(
+            'instance-a'
+          );
+
+          const interval = '1m';
+
+          const indices = [appleTransaction, bananaTransaction]
+            .map((transaction, index) => {
+              return [
+                ...timerange(start, end)
+                  .interval(interval)
+                  .rate(transaction.successRate)
+                  .flatMap((timestamp) =>
+                    serviceGoProdInstance
+                      .transaction(transaction.name)
+                      .timestamp(timestamp)
+                      .duration(1000)
+                      .success()
+                      .serialize()
+                  ),
+                ...timerange(start, end)
+                  .interval(interval)
+                  .rate(transaction.failureRate)
+                  .flatMap((timestamp) =>
+                    serviceGoProdInstance
+                      .transaction(transaction.name)
+                      .errors(
+                        serviceGoProdInstance
+                          .error(`Error ${index}`, transaction.name)
+                          .timestamp(timestamp)
+                      )
+                      .duration(1000)
+                      .timestamp(timestamp)
+                      .failure()
+                      .serialize()
+                  ),
+              ];
+            })
+            .flatMap((_) => _);
+
+          await synthtraceEsClient.index(indices);
+        });
+
+        after(() => synthtraceEsClient.clean());
+
+        describe('without comparison', () => {
+          let errorsDistribution: ErrorsDistribution;
+          before(async () => {
+            const response = await callApi();
+            errorsDistribution = response.body;
+          });
+
+          it('displays combined number of occurrences', () => {
+            const countSum = sumBy(errorsDistribution.currentPeriod, 'y');
+            const numberOfBuckets = 15;
+            expect(countSum).to.equal(
+              (appleTransaction.failureRate + bananaTransaction.failureRate) * numberOfBuckets
+            );
+          });
+        });
+
+        describe('displays occurrences for type "apple transaction" only', () => {
+          let errorsDistribution: ErrorsDistribution;
+          before(async () => {
+            const response = await callApi({
+              query: { kuery: `error.exception.type:"${appleTransaction.name}"` },
+            });
+            errorsDistribution = response.body;
+          });
+          it('displays combined number of occurrences', () => {
+            const countSum = sumBy(errorsDistribution.currentPeriod, 'y');
+            const numberOfBuckets = 15;
+            expect(countSum).to.equal(appleTransaction.failureRate * numberOfBuckets);
+          });
+        });
+
+        describe('with comparison', () => {
+          let errorsDistribution: ErrorsDistribution;
+          before(async () => {
+            const fiveMinutes = 5 * 60 * 1000;
+            const response = await callApi({
+              query: {
+                start: new Date(end - fiveMinutes).toISOString(),
+                end: new Date(end).toISOString(),
+                comparisonStart: new Date(start).toISOString(),
+                comparisonEnd: new Date(start + fiveMinutes).toISOString(),
+              },
+            });
+            errorsDistribution = response.body;
+          });
+          it('returns some data', () => {
+            const hasCurrentPeriodData = errorsDistribution.currentPeriod.some(({ y }) =>
+              isFiniteNumber(y)
+            );
+
+            const hasPreviousPeriodData = errorsDistribution.previousPeriod.some(({ y }) =>
+              isFiniteNumber(y)
+            );
+
+            expect(hasCurrentPeriodData).to.equal(true);
+            expect(hasPreviousPeriodData).to.equal(true);
+          });
+
+          it('has same start time for both periods', () => {
+            expect(first(errorsDistribution.currentPeriod)?.x).to.equal(
+              first(errorsDistribution.previousPeriod)?.x
+            );
+          });
+
+          it('has same end time for both periods', () => {
+            expect(last(errorsDistribution.currentPeriod)?.x).to.equal(
+              last(errorsDistribution.previousPeriod)?.x
+            );
+          });
+
+          it('returns same number of buckets for both periods', () => {
+            expect(errorsDistribution.currentPeriod.length).to.equal(
+              errorsDistribution.previousPeriod.length
+            );
+          });
+        });
+      });
+    }
+  );
+}
diff --git a/x-pack/test/apm_api_integration/tests/index.ts b/x-pack/test/apm_api_integration/tests/index.ts
index 7c709901d53e2..4c1a68ed54039 100644
--- a/x-pack/test/apm_api_integration/tests/index.ts
+++ b/x-pack/test/apm_api_integration/tests/index.ts
@@ -241,6 +241,10 @@ export default function apmApiIntegrationTests(providerContext: FtrProviderConte
       loadTestFile(require.resolve('./latency/service_apis'));
     });
 
+    describe('errors/distribution', function () {
+      loadTestFile(require.resolve('./errors/distribution'));
+    });
+
     registry.run(providerContext);
   });
 }
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_index.ts
new file mode 100644
index 0000000000000..856a9f2b70658
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_index.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 expect from '@kbn/expect';
+import {
+  DEFAULT_ALERTS_INDEX,
+  DETECTION_ENGINE_INDEX_URL,
+} from '../../../../plugins/security_solution/common/constants';
+
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { deleteSignalsIndex } from '../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+  const es = getService('es');
+
+  describe('create_index', () => {
+    afterEach(async () => {
+      await deleteSignalsIndex(supertest);
+    });
+
+    describe('elastic admin', () => {
+      describe('with another index that shares index alias', () => {
+        before(async () => {
+          await esArchiver.load('x-pack/test/functional/es_archives/signals/index_alias_clash');
+        });
+
+        after(async () => {
+          await esArchiver.unload('x-pack/test/functional/es_archives/signals/index_alias_clash');
+        });
+
+        it.skip('should report that signals index does not exist', async () => {
+          const { body } = await supertest.get(DETECTION_ENGINE_INDEX_URL).send().expect(404);
+          expect(body).to.eql({ message: 'index for this space does not exist', status_code: 404 });
+        });
+
+        it('should return 200 for create_index', async () => {
+          const { body } = await supertest
+            .post(DETECTION_ENGINE_INDEX_URL)
+            .set('kbn-xsrf', 'true')
+            .send()
+            .expect(200);
+          expect(body).to.eql({ acknowledged: true });
+        });
+      });
+
+      describe('with an outdated signals index', () => {
+        beforeEach(async () => {
+          await esArchiver.load('x-pack/test/functional/es_archives/endpoint/resolver/signals');
+        });
+
+        afterEach(async () => {
+          await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/resolver/signals');
+        });
+
+        it('should report that signals index is outdated', async () => {
+          const { body } = await supertest.get(DETECTION_ENGINE_INDEX_URL).send().expect(200);
+          expect(body).to.eql({
+            index_mapping_outdated: true,
+            name: `${DEFAULT_ALERTS_INDEX}-default`,
+          });
+        });
+
+        it('should return 200 for create_index and add field aliases', async () => {
+          const { body } = await supertest
+            .post(DETECTION_ENGINE_INDEX_URL)
+            .set('kbn-xsrf', 'true')
+            .send()
+            .expect(200);
+          expect(body).to.eql({ acknowledged: true });
+
+          const mappings = await es.indices.get({
+            index: '.siem-signals-default-000001',
+          });
+          // Make sure that aliases_version has been updated on the existing index
+          expect(mappings['.siem-signals-default-000001'].mappings?._meta?.aliases_version).to.eql(
+            1
+          );
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts
index 03b1beffa7993..0f4c42fd7ab39 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/export_rules.ts
@@ -17,6 +17,7 @@ import {
   deleteSignalsIndex,
   getSimpleRule,
   getSimpleRuleOutput,
+  getWebHookAction,
   removeServerGeneratedProperties,
 } from '../../utils';
 
@@ -109,6 +110,411 @@ export default ({ getService }: FtrProviderContext): void => {
           getSimpleRuleOutput('rule-1'),
         ]);
       });
+
+      it('should export multiple actions attached to 1 rule', async () => {
+        // 1st action
+        const { body: hookAction1 } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+
+        // 2nd action
+        const { body: hookAction2 } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+
+        const action1 = {
+          group: 'default',
+          id: hookAction1.id,
+          action_type_id: hookAction1.actionTypeId,
+          params: {},
+        };
+        const action2 = {
+          group: 'default',
+          id: hookAction2.id,
+          action_type_id: hookAction2.actionTypeId,
+          params: {},
+        };
+
+        const rule1: ReturnType<typeof getSimpleRule> = {
+          ...getSimpleRule('rule-1'),
+          actions: [action1, action2],
+        };
+
+        await createRule(supertest, rule1);
+
+        const { body } = await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/_export`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200)
+          .parse(binaryToString);
+
+        const firstRuleParsed = JSON.parse(body.toString().split(/\n/)[0]);
+        const firstRule = removeServerGeneratedProperties(firstRuleParsed);
+
+        const outputRule1: ReturnType<typeof getSimpleRuleOutput> = {
+          ...getSimpleRuleOutput('rule-1'),
+          actions: [action1, action2],
+          throttle: 'rule',
+        };
+        expect(firstRule).to.eql(outputRule1);
+      });
+
+      it('should export actions attached to 2 rules', async () => {
+        // create a new action
+        const { body: hookAction } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+
+        const action = {
+          group: 'default',
+          id: hookAction.id,
+          action_type_id: hookAction.actionTypeId,
+          params: {},
+        };
+
+        const rule1: ReturnType<typeof getSimpleRule> = {
+          ...getSimpleRule('rule-1'),
+          actions: [action],
+        };
+
+        const rule2: ReturnType<typeof getSimpleRule> = {
+          ...getSimpleRule('rule-2'),
+          actions: [action],
+        };
+
+        await createRule(supertest, rule1);
+        await createRule(supertest, rule2);
+
+        const { body } = await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/_export`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200)
+          .parse(binaryToString);
+
+        const firstRuleParsed = JSON.parse(body.toString().split(/\n/)[0]);
+        const secondRuleParsed = JSON.parse(body.toString().split(/\n/)[1]);
+        const firstRule = removeServerGeneratedProperties(firstRuleParsed);
+        const secondRule = removeServerGeneratedProperties(secondRuleParsed);
+
+        const outputRule1: ReturnType<typeof getSimpleRuleOutput> = {
+          ...getSimpleRuleOutput('rule-2'),
+          actions: [action],
+          throttle: 'rule',
+        };
+        const outputRule2: ReturnType<typeof getSimpleRuleOutput> = {
+          ...getSimpleRuleOutput('rule-1'),
+          actions: [action],
+          throttle: 'rule',
+        };
+        expect(firstRule).to.eql(outputRule1);
+        expect(secondRule).to.eql(outputRule2);
+      });
+
+      /**
+       * Tests the legacy actions to ensure we can export legacy notifications
+       * @deprecated Once the legacy notification system is removed, remove this test too.
+       */
+      describe('legacy_notification_system', () => {
+        it('should be able to export 1 legacy action on 1 rule', async () => {
+          // create an action
+          const { body: hookAction } = await supertest
+            .post('/api/actions/action')
+            .set('kbn-xsrf', 'true')
+            .send(getWebHookAction())
+            .expect(200);
+
+          // create a rule without actions
+          const rule = await createRule(supertest, getSimpleRule('rule-1'));
+
+          // attach the legacy notification
+          await supertest
+            .post(`/internal/api/detection/legacy/notifications?alert_id=${rule.id}`)
+            .set('kbn-xsrf', 'true')
+            .send({
+              name: 'Legacy notification with one action',
+              interval: '1h',
+              actions: [
+                {
+                  id: hookAction.id,
+                  group: 'default',
+                  params: {
+                    message:
+                      'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                  },
+                  actionTypeId: hookAction.actionTypeId,
+                },
+              ],
+            })
+            .expect(200);
+
+          // export the rule
+          const { body } = await supertest
+            .post(`${DETECTION_ENGINE_RULES_URL}/_export`)
+            .set('kbn-xsrf', 'true')
+            .send()
+            .expect(200)
+            .parse(binaryToString);
+
+          const outputRule1: ReturnType<typeof getSimpleRuleOutput> = {
+            ...getSimpleRuleOutput('rule-1'),
+            actions: [
+              {
+                group: 'default',
+                id: hookAction.id,
+                action_type_id: hookAction.actionTypeId,
+                params: {
+                  message:
+                    'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                },
+              },
+            ],
+            throttle: '1h',
+          };
+          const firstRuleParsed = JSON.parse(body.toString().split(/\n/)[0]);
+          const firstRule = removeServerGeneratedProperties(firstRuleParsed);
+
+          expect(firstRule).to.eql(outputRule1);
+        });
+
+        it('should be able to export 2 legacy actions on 1 rule', async () => {
+          // create 1st action/connector
+          const { body: hookAction1 } = await supertest
+            .post('/api/actions/action')
+            .set('kbn-xsrf', 'true')
+            .send(getWebHookAction())
+            .expect(200);
+
+          // create 2nd action/connector
+          const { body: hookAction2 } = await supertest
+            .post('/api/actions/action')
+            .set('kbn-xsrf', 'true')
+            .send(getWebHookAction())
+            .expect(200);
+
+          // create a rule without actions
+          const rule = await createRule(supertest, getSimpleRule('rule-1'));
+
+          // attach the legacy notification with actions
+          await supertest
+            .post(`/internal/api/detection/legacy/notifications?alert_id=${rule.id}`)
+            .set('kbn-xsrf', 'true')
+            .send({
+              name: 'Legacy notification with one action',
+              interval: '1h',
+              actions: [
+                {
+                  id: hookAction1.id,
+                  group: 'default',
+                  params: {
+                    message:
+                      'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                  },
+                  actionTypeId: hookAction1.actionTypeId,
+                },
+                {
+                  id: hookAction2.id,
+                  group: 'default',
+                  params: {
+                    message:
+                      'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                  },
+                  actionTypeId: hookAction2.actionTypeId,
+                },
+              ],
+            })
+            .expect(200);
+
+          // export the rule
+          const { body } = await supertest
+            .post(`${DETECTION_ENGINE_RULES_URL}/_export`)
+            .set('kbn-xsrf', 'true')
+            .send()
+            .expect(200)
+            .parse(binaryToString);
+
+          const outputRule1: ReturnType<typeof getSimpleRuleOutput> = {
+            ...getSimpleRuleOutput('rule-1'),
+            actions: [
+              {
+                group: 'default',
+                id: hookAction1.id,
+                action_type_id: hookAction1.actionTypeId,
+                params: {
+                  message:
+                    'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                },
+              },
+              {
+                group: 'default',
+                id: hookAction2.id,
+                action_type_id: hookAction2.actionTypeId,
+                params: {
+                  message:
+                    'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                },
+              },
+            ],
+            throttle: '1h',
+          };
+          const firstRuleParsed = JSON.parse(body.toString().split(/\n/)[0]);
+          const firstRule = removeServerGeneratedProperties(firstRuleParsed);
+
+          expect(firstRule).to.eql(outputRule1);
+        });
+
+        it('should be able to export 2 legacy actions on 2 rules', async () => {
+          // create 1st action/connector
+          const { body: hookAction1 } = await supertest
+            .post('/api/actions/action')
+            .set('kbn-xsrf', 'true')
+            .send(getWebHookAction())
+            .expect(200);
+
+          // create 2nd action/connector
+          const { body: hookAction2 } = await supertest
+            .post('/api/actions/action')
+            .set('kbn-xsrf', 'true')
+            .send(getWebHookAction())
+            .expect(200);
+
+          // create 2 rules without actions
+          const rule1 = await createRule(supertest, getSimpleRule('rule-1'));
+          const rule2 = await createRule(supertest, getSimpleRule('rule-2'));
+
+          // attach the legacy notification with actions to the first rule
+          await supertest
+            .post(`/internal/api/detection/legacy/notifications?alert_id=${rule1.id}`)
+            .set('kbn-xsrf', 'true')
+            .send({
+              name: 'Legacy notification with one action',
+              interval: '1h',
+              actions: [
+                {
+                  id: hookAction1.id,
+                  group: 'default',
+                  params: {
+                    message:
+                      'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                  },
+                  actionTypeId: hookAction1.actionTypeId,
+                },
+                {
+                  id: hookAction2.id,
+                  group: 'default',
+                  params: {
+                    message:
+                      'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                  },
+                  actionTypeId: hookAction2.actionTypeId,
+                },
+              ],
+            })
+            .expect(200);
+
+          // attach the legacy notification with actions to the 2nd rule
+          await supertest
+            .post(`/internal/api/detection/legacy/notifications?alert_id=${rule2.id}`)
+            .set('kbn-xsrf', 'true')
+            .send({
+              name: 'Legacy notification with one action',
+              interval: '1h',
+              actions: [
+                {
+                  id: hookAction1.id,
+                  group: 'default',
+                  params: {
+                    message:
+                      'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                  },
+                  actionTypeId: hookAction1.actionTypeId,
+                },
+                {
+                  id: hookAction2.id,
+                  group: 'default',
+                  params: {
+                    message:
+                      'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                  },
+                  actionTypeId: hookAction2.actionTypeId,
+                },
+              ],
+            })
+            .expect(200);
+
+          // export the rule
+          const { body } = await supertest
+            .post(`${DETECTION_ENGINE_RULES_URL}/_export`)
+            .set('kbn-xsrf', 'true')
+            .send()
+            .expect(200)
+            .parse(binaryToString);
+
+          const outputRule1: ReturnType<typeof getSimpleRuleOutput> = {
+            ...getSimpleRuleOutput('rule-1'),
+            actions: [
+              {
+                group: 'default',
+                id: hookAction1.id,
+                action_type_id: hookAction1.actionTypeId,
+                params: {
+                  message:
+                    'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                },
+              },
+              {
+                group: 'default',
+                id: hookAction2.id,
+                action_type_id: hookAction2.actionTypeId,
+                params: {
+                  message:
+                    'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                },
+              },
+            ],
+            throttle: '1h',
+          };
+
+          const outputRule2: ReturnType<typeof getSimpleRuleOutput> = {
+            ...getSimpleRuleOutput('rule-2'),
+            actions: [
+              {
+                group: 'default',
+                id: hookAction1.id,
+                action_type_id: hookAction1.actionTypeId,
+                params: {
+                  message:
+                    'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                },
+              },
+              {
+                group: 'default',
+                id: hookAction2.id,
+                action_type_id: hookAction2.actionTypeId,
+                params: {
+                  message:
+                    'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                },
+              },
+            ],
+            throttle: '1h',
+          };
+          const firstRuleParsed = JSON.parse(body.toString().split(/\n/)[0]);
+          const secondRuleParsed = JSON.parse(body.toString().split(/\n/)[1]);
+          const firstRule = removeServerGeneratedProperties(firstRuleParsed);
+          const secondRule = removeServerGeneratedProperties(secondRuleParsed);
+
+          expect(firstRule).to.eql(outputRule2);
+          expect(secondRule).to.eql(outputRule1);
+        });
+      });
     });
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts
index 30e1b3eef714a..2056d5648d6db 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_rules.ts
@@ -18,6 +18,7 @@ import {
   getComplexRuleOutput,
   getSimpleRule,
   getSimpleRuleOutput,
+  getWebHookAction,
   removeServerGeneratedProperties,
 } from '../../utils';
 
@@ -92,5 +93,164 @@ export default ({ getService }: FtrProviderContext): void => {
         total: 1,
       });
     });
+
+    it('should find a single rule with a execute immediately action correctly', async () => {
+      // create connector/action
+      const { body: hookAction } = await supertest
+        .post('/api/actions/action')
+        .set('kbn-xsrf', 'true')
+        .send(getWebHookAction())
+        .expect(200);
+
+      const action = {
+        group: 'default',
+        id: hookAction.id,
+        action_type_id: hookAction.actionTypeId,
+        params: {},
+      };
+
+      // create rule with connector/action
+      const rule: ReturnType<typeof getSimpleRule> = {
+        ...getSimpleRule('rule-1'),
+        actions: [action],
+      };
+      await createRule(supertest, rule);
+
+      // query the single rule from _find
+      const { body } = await supertest
+        .get(`${DETECTION_ENGINE_RULES_URL}/_find`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      const ruleWithActions: ReturnType<typeof getSimpleRuleOutput> = {
+        ...getSimpleRuleOutput(),
+        actions: [action],
+        throttle: 'rule',
+      };
+
+      body.data = [removeServerGeneratedProperties(body.data[0])];
+      expect(body).to.eql({
+        data: [ruleWithActions],
+        page: 1,
+        perPage: 20,
+        total: 1,
+      });
+    });
+
+    it('should be able to find a scheduled action correctly', async () => {
+      // create connector/action
+      const { body: hookAction } = await supertest
+        .post('/api/actions/action')
+        .set('kbn-xsrf', 'true')
+        .send(getWebHookAction())
+        .expect(200);
+
+      const action = {
+        group: 'default',
+        id: hookAction.id,
+        action_type_id: hookAction.actionTypeId,
+        params: {},
+      };
+
+      // create rule with connector/action
+      const rule: ReturnType<typeof getSimpleRule> = {
+        ...getSimpleRule('rule-1'),
+        throttle: '1h', // <-- throttle makes this a scheduled action
+        actions: [action],
+      };
+      await createRule(supertest, rule);
+
+      // query the single rule from _find
+      const { body } = await supertest
+        .get(`${DETECTION_ENGINE_RULES_URL}/_find`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      const ruleWithActions: ReturnType<typeof getSimpleRuleOutput> = {
+        ...getSimpleRuleOutput(),
+        actions: [action],
+        throttle: '1h', // <-- throttle makes this a scheduled action
+      };
+
+      body.data = [removeServerGeneratedProperties(body.data[0])];
+      expect(body).to.eql({
+        data: [ruleWithActions],
+        page: 1,
+        perPage: 20,
+        total: 1,
+      });
+    });
+
+    /**
+     * Tests the legacy actions to ensure we can export legacy notifications
+     * @deprecated Once the legacy notification system is removed, remove this test too.
+     */
+    describe('legacy_notification_system', async () => {
+      it('should be able to a read a scheduled action correctly', async () => {
+        // create an connector/action
+        const { body: hookAction } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+
+        // create a rule without actions
+        const createRuleBody = await createRule(supertest, getSimpleRule('rule-1'));
+
+        // attach the legacy notification
+        await supertest
+          .post(`/internal/api/detection/legacy/notifications?alert_id=${createRuleBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .send({
+            name: 'Legacy notification with one action',
+            interval: '1h',
+            actions: [
+              {
+                id: hookAction.id,
+                group: 'default',
+                params: {
+                  message:
+                    'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                },
+                actionTypeId: hookAction.actionTypeId,
+              },
+            ],
+          })
+          .expect(200);
+
+        // query the single rule from _find
+        const { body } = await supertest
+          .get(`${DETECTION_ENGINE_RULES_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        const ruleWithActions: ReturnType<typeof getSimpleRuleOutput> = {
+          ...getSimpleRuleOutput(),
+          actions: [
+            {
+              id: hookAction.id,
+              group: 'default',
+              params: {
+                message:
+                  'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+              },
+              action_type_id: hookAction.actionTypeId,
+            },
+          ],
+          throttle: '1h',
+        };
+
+        body.data = [removeServerGeneratedProperties(body.data[0])];
+        expect(body).to.eql({
+          data: [ruleWithActions],
+          page: 1,
+          perPage: 20,
+          total: 1,
+        });
+      });
+    });
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts
index 654bd4d79b7c3..72912c9d10f0b 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/import_rules.ts
@@ -16,6 +16,7 @@ import {
   getSimpleRule,
   getSimpleRuleAsNdjson,
   getSimpleRuleOutput,
+  getWebHookAction,
   removeServerGeneratedProperties,
   ruleToNdjson,
 } from '../../utils';
@@ -315,6 +316,165 @@ export default ({ getService }: FtrProviderContext): void => {
           getSimpleRuleOutput('rule-3'),
         ]);
       });
+
+      it('should give single connector error back if we have a single connector error message', async () => {
+        const simpleRule: ReturnType<typeof getSimpleRule> = {
+          ...getSimpleRule('rule-1'),
+          actions: [
+            {
+              group: 'default',
+              id: '123',
+              action_type_id: '456',
+              params: {},
+            },
+          ],
+        };
+        const { body } = await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/_import`)
+          .set('kbn-xsrf', 'true')
+          .attach('file', ruleToNdjson(simpleRule), 'rules.ndjson')
+          .expect(200);
+
+        expect(body).to.eql({
+          success: false,
+          success_count: 0,
+          errors: [
+            {
+              rule_id: 'rule-1',
+              error: {
+                status_code: 404,
+                message: '1 connector is missing. Connector id missing is: 123',
+              },
+            },
+          ],
+        });
+      });
+
+      it('should be able to import a rule with an action connector that exists', async () => {
+        // create a new action
+        const { body: hookAction } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+        const simpleRule: ReturnType<typeof getSimpleRule> = {
+          ...getSimpleRule('rule-1'),
+          actions: [
+            {
+              group: 'default',
+              id: hookAction.id,
+              action_type_id: hookAction.actionTypeId,
+              params: {},
+            },
+          ],
+        };
+        const { body } = await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/_import`)
+          .set('kbn-xsrf', 'true')
+          .attach('file', ruleToNdjson(simpleRule), 'rules.ndjson')
+          .expect(200);
+        expect(body).to.eql({ success: true, success_count: 1, errors: [] });
+      });
+
+      it('should be able to import 2 rules with action connectors that exist', async () => {
+        // create a new action
+        const { body: hookAction } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+
+        const rule1: ReturnType<typeof getSimpleRule> = {
+          ...getSimpleRule('rule-1'),
+          actions: [
+            {
+              group: 'default',
+              id: hookAction.id,
+              action_type_id: hookAction.actionTypeId,
+              params: {},
+            },
+          ],
+        };
+
+        const rule2: ReturnType<typeof getSimpleRule> = {
+          ...getSimpleRule('rule-2'),
+          actions: [
+            {
+              group: 'default',
+              id: hookAction.id,
+              action_type_id: hookAction.actionTypeId,
+              params: {},
+            },
+          ],
+        };
+        const rule1String = JSON.stringify(rule1);
+        const rule2String = JSON.stringify(rule2);
+        const buffer = Buffer.from(`${rule1String}\n${rule2String}\n`);
+
+        const { body } = await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/_import`)
+          .set('kbn-xsrf', 'true')
+          .attach('file', buffer, 'rules.ndjson')
+          .expect(200);
+
+        expect(body).to.eql({ success: true, success_count: 2, errors: [] });
+      });
+
+      it('should be able to import 1 rule with an action connector that exists and get 1 other error back for a second rule that does not have the connector', async () => {
+        // create a new action
+        const { body: hookAction } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+
+        const rule1: ReturnType<typeof getSimpleRule> = {
+          ...getSimpleRule('rule-1'),
+          actions: [
+            {
+              group: 'default',
+              id: hookAction.id,
+              action_type_id: hookAction.actionTypeId,
+              params: {},
+            },
+          ],
+        };
+
+        const rule2: ReturnType<typeof getSimpleRule> = {
+          ...getSimpleRule('rule-2'),
+          actions: [
+            {
+              group: 'default',
+              id: '123', // <-- This does not exist
+              action_type_id: hookAction.actionTypeId,
+              params: {},
+            },
+          ],
+        };
+        const rule1String = JSON.stringify(rule1);
+        const rule2String = JSON.stringify(rule2);
+        const buffer = Buffer.from(`${rule1String}\n${rule2String}\n`);
+
+        const { body } = await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/_import`)
+          .set('kbn-xsrf', 'true')
+          .attach('file', buffer, 'rules.ndjson')
+          .expect(200);
+
+        expect(body).to.eql({
+          success: false,
+          success_count: 1,
+          errors: [
+            {
+              rule_id: 'rule-2',
+              error: {
+                status_code: 404,
+                message: '1 connector is missing. Connector id missing is: 123',
+              },
+            },
+          ],
+        });
+      });
     });
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
index 31ecf6edb9bb2..db616baa0678a 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
@@ -19,6 +19,7 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
       loadTestFile(require.resolve('./update_actions'));
       loadTestFile(require.resolve('./add_prepackaged_rules'));
       loadTestFile(require.resolve('./check_privileges'));
+      loadTestFile(require.resolve('./create_index'));
       loadTestFile(require.resolve('./create_rules'));
       loadTestFile(require.resolve('./create_rules_bulk'));
       loadTestFile(require.resolve('./create_ml'));
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts
index d20eb0492bbc4..6918dc7a1876f 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules.ts
@@ -21,6 +21,7 @@ import {
   getSimpleMlRuleOutput,
   createRule,
   getSimpleMlRule,
+  createLegacyRuleAction,
 } from '../../utils';
 
 // eslint-disable-next-line import/no-default-export
@@ -187,6 +188,46 @@ export default ({ getService }: FtrProviderContext) => {
         expect(bodyToCompare).to.eql(outputRule);
       });
 
+      it('should return the rule with migrated actions after the enable patch', async () => {
+        const [connector, rule] = await Promise.all([
+          supertest
+            .post(`/api/actions/connector`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              name: 'My action',
+              connector_type_id: '.slack',
+              secrets: {
+                webhookUrl: 'http://localhost:1234',
+              },
+            }),
+          createRule(supertest, getSimpleRule('rule-1')),
+        ]);
+        await createLegacyRuleAction(supertest, rule.id, connector.body.id);
+
+        // patch disable the rule
+        const patchResponse = await supertest
+          .patch(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .send({ id: rule.id, enabled: false })
+          .expect(200);
+
+        const outputRule = getSimpleRuleOutput();
+        outputRule.actions = [
+          {
+            action_type_id: '.slack',
+            group: 'default',
+            id: connector.body.id,
+            params: {
+              message:
+                'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+            },
+          },
+        ];
+        outputRule.throttle = '1m';
+        const bodyToCompare = removeServerGeneratedProperties(patchResponse.body);
+        expect(bodyToCompare).to.eql(outputRule);
+      });
+
       it('should give a 404 if it is given a fake id', async () => {
         const { body } = await supertest
           .patch(DETECTION_ENGINE_RULES_URL)
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts
index 74d3bc8dd68d3..bc388d73cac6b 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/patch_rules_bulk.ts
@@ -19,6 +19,7 @@ import {
   getSimpleRuleOutputWithoutRuleId,
   removeServerGeneratedPropertiesIncludingRuleId,
   createRule,
+  createLegacyRuleAction,
 } from '../../utils';
 
 // eslint-disable-next-line import/no-default-export
@@ -126,6 +127,55 @@ export default ({ getService }: FtrProviderContext) => {
         expect(bodyToCompare2).to.eql(outputRule2);
       });
 
+      it('should bulk disable two rules and migrate their actions', async () => {
+        const [connector, rule1, rule2] = await Promise.all([
+          supertest
+            .post(`/api/actions/connector`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              name: 'My action',
+              connector_type_id: '.slack',
+              secrets: {
+                webhookUrl: 'http://localhost:1234',
+              },
+            }),
+          createRule(supertest, getSimpleRule('rule-1')),
+          createRule(supertest, getSimpleRule('rule-2')),
+        ]);
+        await Promise.all([
+          createLegacyRuleAction(supertest, rule1.id, connector.body.id),
+          createLegacyRuleAction(supertest, rule2.id, connector.body.id),
+        ]);
+        // patch a simple rule's name
+        const { body } = await supertest
+          .patch(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .set('kbn-xsrf', 'true')
+          .send([
+            { id: rule1.id, enabled: false },
+            { id: rule2.id, enabled: false },
+          ])
+          .expect(200);
+
+        // @ts-expect-error
+        body.forEach((response) => {
+          const outputRule = getSimpleRuleOutput(response.rule_id, false);
+          outputRule.actions = [
+            {
+              action_type_id: '.slack',
+              group: 'default',
+              id: connector.body.id,
+              params: {
+                message:
+                  'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+              },
+            },
+          ];
+          outputRule.throttle = '1m';
+          const bodyToCompare = removeServerGeneratedProperties(response);
+          expect(bodyToCompare).to.eql(outputRule);
+        });
+      });
+
       it('should patch a single rule property of name using the auto-generated id', async () => {
         const createdBody = await createRule(supertest, getSimpleRule('rule-1'));
 
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts
index 66a8459d0984c..0a51e6227cc9b 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/read_rules.ts
@@ -18,6 +18,7 @@ import {
   getSimpleRuleOutput,
   getSimpleRuleOutputWithoutRuleId,
   getSimpleRuleWithoutRuleId,
+  getWebHookAction,
   removeServerGeneratedProperties,
   removeServerGeneratedPropertiesIncludingRuleId,
 } from '../../utils';
@@ -101,6 +102,146 @@ export default ({ getService }: FtrProviderContext) => {
           message: 'rule_id: "fake_id" not found',
         });
       });
+
+      it('should be able to a read a execute immediately action correctly', async () => {
+        // create connector/action
+        const { body: hookAction } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+
+        const action = {
+          group: 'default',
+          id: hookAction.id,
+          action_type_id: hookAction.actionTypeId,
+          params: {},
+        };
+
+        // create rule with connector/action
+        const rule: ReturnType<typeof getSimpleRule> = {
+          ...getSimpleRule('rule-1'),
+          actions: [action],
+        };
+        const createRuleBody = await createRule(supertest, rule);
+
+        const { body } = await supertest
+          .get(`${DETECTION_ENGINE_RULES_URL}?id=${createRuleBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .send(getSimpleRule())
+          .expect(200);
+
+        const bodyToCompare = removeServerGeneratedProperties(body);
+        const ruleWithActions: ReturnType<typeof getSimpleRuleOutput> = {
+          ...getSimpleRuleOutput(),
+          actions: [action],
+          throttle: 'rule',
+        };
+        expect(bodyToCompare).to.eql(ruleWithActions);
+      });
+
+      it('should be able to a read a scheduled action correctly', async () => {
+        // create connector/action
+        const { body: hookAction } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+
+        const action = {
+          group: 'default',
+          id: hookAction.id,
+          action_type_id: hookAction.actionTypeId,
+          params: {},
+        };
+
+        // create rule with connector/action
+        const rule: ReturnType<typeof getSimpleRule> = {
+          ...getSimpleRule('rule-1'),
+          throttle: '1h', // <-- throttle makes this a scheduled action
+          actions: [action],
+        };
+
+        const createRuleBody = await createRule(supertest, rule);
+
+        const { body } = await supertest
+          .get(`${DETECTION_ENGINE_RULES_URL}?id=${createRuleBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .send(getSimpleRule())
+          .expect(200);
+
+        const bodyToCompare = removeServerGeneratedProperties(body);
+        const ruleWithActions: ReturnType<typeof getSimpleRuleOutput> = {
+          ...getSimpleRuleOutput(),
+          actions: [action],
+          throttle: '1h', // <-- throttle makes this a scheduled action
+        };
+        expect(bodyToCompare).to.eql(ruleWithActions);
+      });
+
+      /**
+       * Tests the legacy actions to ensure we can export legacy notifications
+       * @deprecated Once the legacy notification system is removed, remove this test too.
+       */
+      describe('legacy_notification_system', () => {
+        it('should be able to a read a scheduled action correctly', async () => {
+          // create an action
+          const { body: hookAction } = await supertest
+            .post('/api/actions/action')
+            .set('kbn-xsrf', 'true')
+            .send(getWebHookAction())
+            .expect(200);
+
+          // create a rule without actions
+          const createRuleBody = await createRule(supertest, getSimpleRule('rule-1'));
+
+          // attach the legacy notification
+          await supertest
+            .post(`/internal/api/detection/legacy/notifications?alert_id=${createRuleBody.id}`)
+            .set('kbn-xsrf', 'true')
+            .send({
+              name: 'Legacy notification with one action',
+              interval: '1h',
+              actions: [
+                {
+                  id: hookAction.id,
+                  group: 'default',
+                  params: {
+                    message:
+                      'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                  },
+                  actionTypeId: hookAction.actionTypeId,
+                },
+              ],
+            })
+            .expect(200);
+
+          // read the rule which should have the legacy actions attached
+          const { body } = await supertest
+            .get(`${DETECTION_ENGINE_RULES_URL}?id=${createRuleBody.id}`)
+            .set('kbn-xsrf', 'true')
+            .send(getSimpleRule())
+            .expect(200);
+
+          const bodyToCompare = removeServerGeneratedProperties(body);
+          const ruleWithActions: ReturnType<typeof getSimpleRuleOutput> = {
+            ...getSimpleRuleOutput(),
+            actions: [
+              {
+                id: hookAction.id,
+                group: 'default',
+                params: {
+                  message:
+                    'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+                },
+                action_type_id: hookAction.actionTypeId,
+              },
+            ],
+            throttle: '1h',
+          };
+          expect(bodyToCompare).to.eql(ruleWithActions);
+        });
+      });
     });
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/runtime.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/runtime.ts
index 528a99715c05c..293f3e758911e 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/runtime.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/runtime.ts
@@ -53,7 +53,9 @@ export default ({ getService }: FtrProviderContext) => {
         await waitForRuleSuccessOrStatus(supertest, id);
         await waitForSignalsToBePresent(supertest, 4, [id]);
         const signalsOpen = await getSignalsById(supertest, id);
-        const hits = signalsOpen.hits.hits.map((signal) => (signal._source?.host as Runtime).name);
+        const hits = signalsOpen.hits.hits
+          .map((signal) => (signal._source?.host as Runtime).name)
+          .sort();
         expect(hits).to.eql(['host name 1', 'host name 2', 'host name 3', 'host name 4']);
       });
 
@@ -63,9 +65,9 @@ export default ({ getService }: FtrProviderContext) => {
         await waitForRuleSuccessOrStatus(supertest, id);
         await waitForSignalsToBePresent(supertest, 4, [id]);
         const signalsOpen = await getSignalsById(supertest, id);
-        const hits = signalsOpen.hits.hits.map(
-          (signal) => (signal._source?.host as Runtime).hostname
-        );
+        const hits = signalsOpen.hits.hits
+          .map((signal) => (signal._source?.host as Runtime).hostname)
+          .sort();
         expect(hits).to.eql(['host name 1', 'host name 2', 'host name 3', 'host name 4']);
       });
     });
@@ -97,7 +99,16 @@ export default ({ getService }: FtrProviderContext) => {
         await waitForRuleSuccessOrStatus(supertest, id);
         await waitForSignalsToBePresent(supertest, 4, [id]);
         const signalsOpen = await getSignalsById(supertest, id);
-        const hits = signalsOpen.hits.hits.map((signal) => signal._source?.host);
+        const hits = signalsOpen.hits.hits
+          .map((signal) => signal._source?.host as Array<{ name: string }>)
+          .map((host) => {
+            // sort the inner array elements first
+            return host.sort((a, b) => a.name.localeCompare(b.name));
+          })
+          .sort((aArray, bArray) => {
+            // since these are all unique, using just the first element should give us stability
+            return aArray[0].name.localeCompare(bArray[0].name);
+          });
         expect(hits).to.eql([
           [
             {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts
index 5a4a04f71b3d5..2b91e0c3abd55 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules.ts
@@ -23,6 +23,7 @@ import {
   getSimpleMlRuleUpdate,
   createRule,
   getSimpleRule,
+  createLegacyRuleAction,
 } from '../../utils';
 
 // eslint-disable-next-line import/no-default-export
@@ -130,6 +131,55 @@ export default ({ getService }: FtrProviderContext) => {
         expect(bodyToCompare).to.eql(outputRule);
       });
 
+      it('should update a single rule property of name using an auto-generated rule_id and migrate the actions', async () => {
+        const rule = getSimpleRule('rule-1');
+        delete rule.rule_id;
+        const [connector, createRuleBody] = await Promise.all([
+          supertest
+            .post(`/api/actions/connector`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              name: 'My action',
+              connector_type_id: '.slack',
+              secrets: {
+                webhookUrl: 'http://localhost:1234',
+              },
+            }),
+          createRule(supertest, rule),
+        ]);
+        await createLegacyRuleAction(supertest, createRuleBody.id, connector.body.id);
+
+        // update a simple rule's name
+        const updatedRule = getSimpleRuleUpdate('rule-1');
+        updatedRule.rule_id = createRuleBody.rule_id;
+        updatedRule.name = 'some other name';
+        delete updatedRule.id;
+
+        const { body } = await supertest
+          .put(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedRule)
+          .expect(200);
+
+        const outputRule = getSimpleRuleOutputWithoutRuleId();
+        outputRule.name = 'some other name';
+        outputRule.version = 2;
+        outputRule.actions = [
+          {
+            action_type_id: '.slack',
+            group: 'default',
+            id: connector.body.id,
+            params: {
+              message:
+                'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+            },
+          },
+        ];
+        outputRule.throttle = '1m';
+        const bodyToCompare = removeServerGeneratedPropertiesIncludingRuleId(body);
+        expect(bodyToCompare).to.eql(outputRule);
+      });
+
       it('should update a single rule property of name using the auto-generated id', async () => {
         const createdBody = await createRule(supertest, getSimpleRule('rule-1'));
 
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts
index 7612aafb5bb60..d950b30d584af 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_rules_bulk.ts
@@ -20,6 +20,7 @@ import {
   getSimpleRuleUpdate,
   createRule,
   getSimpleRule,
+  createLegacyRuleAction,
 } from '../../utils';
 
 // eslint-disable-next-line import/no-default-export
@@ -94,6 +95,64 @@ export default ({ getService }: FtrProviderContext) => {
         expect(bodyToCompare2).to.eql(outputRule2);
       });
 
+      it('should update two rule properties of name using the two rules rule_id and migrate actions', async () => {
+        const [connector, rule1, rule2] = await Promise.all([
+          supertest
+            .post(`/api/actions/connector`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              name: 'My action',
+              connector_type_id: '.slack',
+              secrets: {
+                webhookUrl: 'http://localhost:1234',
+              },
+            }),
+          createRule(supertest, getSimpleRule('rule-1')),
+          createRule(supertest, getSimpleRule('rule-2')),
+        ]);
+        await Promise.all([
+          createLegacyRuleAction(supertest, rule1.id, connector.body.id),
+          createLegacyRuleAction(supertest, rule2.id, connector.body.id),
+        ]);
+
+        expect(rule1.actions).to.eql([]);
+        expect(rule2.actions).to.eql([]);
+
+        const updatedRule1 = getSimpleRuleUpdate('rule-1');
+        updatedRule1.name = 'some other name';
+
+        const updatedRule2 = getSimpleRuleUpdate('rule-2');
+        updatedRule2.name = 'some other name';
+
+        // update both rule names
+        const { body } = await supertest
+          .put(`${DETECTION_ENGINE_RULES_URL}/_bulk_update`)
+          .set('kbn-xsrf', 'true')
+          .send([updatedRule1, updatedRule2])
+          .expect(200);
+
+        // @ts-expect-error
+        body.forEach((response) => {
+          const outputRule = getSimpleRuleOutput(response.rule_id);
+          outputRule.name = 'some other name';
+          outputRule.version = 2;
+          outputRule.actions = [
+            {
+              action_type_id: '.slack',
+              group: 'default',
+              id: connector.body.id,
+              params: {
+                message:
+                  'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+              },
+            },
+          ];
+          outputRule.throttle = '1m';
+          const bodyToCompare = removeServerGeneratedProperties(response);
+          expect(bodyToCompare).to.eql(outputRule);
+        });
+      });
+
       it('should update a single rule property of name using an id', async () => {
         const createRuleBody = await createRule(supertest, getSimpleRule('rule-1'));
 
diff --git a/x-pack/test/detection_engine_api_integration/utils.ts b/x-pack/test/detection_engine_api_integration/utils.ts
index 4781df7993a41..ae769bd01b52d 100644
--- a/x-pack/test/detection_engine_api_integration/utils.ts
+++ b/x-pack/test/detection_engine_api_integration/utils.ts
@@ -48,6 +48,7 @@ import {
   DETECTION_ENGINE_SIGNALS_MIGRATION_URL,
   INTERNAL_IMMUTABLE_KEY,
   INTERNAL_RULE_ID_KEY,
+  UPDATE_OR_CREATE_LEGACY_ACTIONS,
 } from '../../plugins/security_solution/common/constants';
 import { RACAlert } from '../../plugins/security_solution/server/lib/detection_engine/rule_types/types';
 
@@ -516,6 +517,29 @@ export const createSignalsIndex = async (
   }, 'createSignalsIndex');
 };
 
+export const createLegacyRuleAction = async (
+  supertest: SuperTest.SuperTest<SuperTest.Test>,
+  alertId: string,
+  connectorId: string
+): Promise<unknown> =>
+  supertest
+    .post(`${UPDATE_OR_CREATE_LEGACY_ACTIONS}`)
+    .set('kbn-xsrf', 'true')
+    .query({ alert_id: alertId })
+    .send({
+      name: 'Legacy notification with one action',
+      interval: '1m',
+      actions: [
+        {
+          id: connectorId,
+          group: 'default',
+          params: {
+            message: 'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
+          },
+          actionTypeId: '.slack',
+        },
+      ],
+    });
 /**
  * Deletes the signals index for use inside of afterEach blocks of tests
  * @param supertest The supertest client library
diff --git a/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap b/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap
index 8e06e62385315..98dc4c2630743 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap
+++ b/x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap
@@ -167,7 +167,6 @@ Object {
   "data_streams": Array [
     Object {
       "dataset": "apache.access",
-      "ingest_pipeline": "default",
       "package": "apache",
       "path": "access",
       "release": "experimental",
@@ -199,7 +198,6 @@ Object {
     },
     Object {
       "dataset": "apache.status",
-      "ingest_pipeline": "default",
       "package": "apache",
       "path": "status",
       "release": "experimental",
@@ -236,7 +234,6 @@ Object {
     },
     Object {
       "dataset": "apache.error",
-      "ingest_pipeline": "default",
       "package": "apache",
       "path": "error",
       "release": "experimental",
@@ -331,11 +328,11 @@ Object {
       "install_version": "0.1.4",
       "installed_es": Array [
         Object {
-          "id": "logs-apache.access-0.1.4",
+          "id": "logs-apache.access-0.1.4-default",
           "type": "ingest_pipeline",
         },
         Object {
-          "id": "logs-apache.error-0.1.4",
+          "id": "logs-apache.error-0.1.4-default",
           "type": "ingest_pipeline",
         },
         Object {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts b/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
index 86928874f8a34..85f4cb6193d60 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
@@ -74,7 +74,7 @@ export default function (providerContext: FtrProviderContext) {
         .type('application/gzip')
         .send(buf)
         .expect(200);
-      expect(res.body.response.length).to.be(29);
+      expect(res.body.response.length).to.be(27);
     });
 
     it('should install a zip archive correctly and package info should return correctly after validation', async function () {
@@ -85,7 +85,7 @@ export default function (providerContext: FtrProviderContext) {
         .type('application/zip')
         .send(buf)
         .expect(200);
-      expect(res.body.response.length).to.be(29);
+      expect(res.body.response.length).to.be(27);
 
       const packageInfoRes = await supertest
         .get(`/api/fleet/epm/packages/${testPkgKey}`)
diff --git a/x-pack/test/fleet_api_integration/apis/epm/template.ts b/x-pack/test/fleet_api_integration/apis/epm/template.ts
index 6f29eb794e7d0..d8856ec392218 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/template.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/template.ts
@@ -28,7 +28,7 @@ export default function ({ getService }: FtrProviderContext) {
     },
   ];
 
-  // This test was inspired by https://github.com/elastic/kibana/blob/master/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
+  // This test was inspired by https://github.com/elastic/kibana/blob/main/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
   describe('EPM - template', async () => {
     beforeEach(async () => {
       appContextService.start({
diff --git a/x-pack/test/functional/apps/monitoring/index.js b/x-pack/test/functional/apps/monitoring/index.js
index a67964d325164..20217399a9191 100644
--- a/x-pack/test/functional/apps/monitoring/index.js
+++ b/x-pack/test/functional/apps/monitoring/index.js
@@ -34,9 +34,14 @@ export default function ({ loadTestFile }) {
     loadTestFile(require.resolve('./kibana/instance'));
     loadTestFile(require.resolve('./kibana/instance_mb'));
 
+    loadTestFile(require.resolve('./logstash/overview'));
+    loadTestFile(require.resolve('./logstash/overview_mb'));
+    loadTestFile(require.resolve('./logstash/nodes'));
+    loadTestFile(require.resolve('./logstash/nodes_mb'));
     loadTestFile(require.resolve('./logstash/pipelines'));
     loadTestFile(require.resolve('./logstash/pipelines_mb'));
-
+    loadTestFile(require.resolve('./logstash/node_detail'));
+    loadTestFile(require.resolve('./logstash/node_detail_mb'));
     loadTestFile(require.resolve('./beats/cluster'));
     loadTestFile(require.resolve('./beats/overview'));
     loadTestFile(require.resolve('./beats/listing'));
diff --git a/x-pack/test/functional/apps/monitoring/logstash/node_detail.js b/x-pack/test/functional/apps/monitoring/logstash/node_detail.js
new file mode 100644
index 0000000000000..2e75422f3028f
--- /dev/null
+++ b/x-pack/test/functional/apps/monitoring/logstash/node_detail.js
@@ -0,0 +1,125 @@
+/*
+ * Copyright 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 { getLifecycleMethods } from '../_get_lifecycle_methods';
+
+export default function ({ getService, getPageObjects }) {
+  const PageObjects = getPageObjects(['common']);
+  const retry = getService('retry');
+  const clusterOverview = getService('monitoringClusterOverview');
+  const nodes = getService('monitoringLogstashNodes');
+  const nodeDetail = getService('monitoringLogstashNodeDetail');
+  const pipelinesList = getService('monitoringLogstashPipelines');
+
+  describe('Logstash node detail', () => {
+    describe('Node', () => {
+      const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
+      const nodeSummaryStatus = {
+        eventsIn: 'Events Received\n42.4k',
+        eventsOut: 'Events Emitted\n39.4k',
+        httpAddress: 'Transport Address\n127.0.0.1:9600',
+        numReloads: 'Config Reloads\n0',
+        pipelineBatchSize: 'Batch Size\n125',
+        pipelineWorkers: 'Pipeline Workers\n8',
+        uptime: 'Uptime\n8 minutes',
+        version: 'Version\n7.0.0-alpha1',
+      };
+
+      before(async () => {
+        await setup('x-pack/test/functional/es_archives/monitoring/logstash_pipelines', {
+          from: 'Jan 22, 2018 @ 09:10:00.000',
+          to: 'Jan 22, 2018 @ 09:41:00.000',
+        });
+
+        await clusterOverview.closeAlertsModal();
+
+        // go to logstash nodes
+        await clusterOverview.clickLsNodes();
+        expect(await nodes.isOnNodesListing()).to.be(true);
+      });
+
+      after(async () => {
+        await tearDown();
+      });
+
+      it('detail view should have summary status showing correct info', async () => {
+        await nodes.clickRowByResolver('29a3dfa6-c146-4534-9bc0-be475d2ce950');
+        expect(await nodeDetail.getSummary()).to.eql(nodeSummaryStatus);
+      });
+      it('advanced view should have summary status showing correct info', async () => {
+        await nodeDetail.clickAdvanced();
+
+        expect(await nodeDetail.getSummary()).to.eql(nodeSummaryStatus);
+      });
+      it('pipelines view should have summary status showing correct info', async () => {
+        await nodeDetail.clickPipelines();
+
+        expect(await nodeDetail.getSummary()).to.eql(nodeSummaryStatus);
+      });
+      it('pipelines view should have Pipelines table showing correct rows with default sorting', async () => {
+        const rows = await pipelinesList.getRows();
+        expect(rows.length).to.be(3);
+
+        await pipelinesList.clickIdCol();
+
+        const pipelinesAll = await pipelinesList.getPipelinesAll();
+
+        const tableData = [
+          { id: 'nginx_logs', eventsEmittedRate: '62.5 e/s', nodeCount: '1' },
+          { id: 'test_interpolation', eventsEmittedRate: '0 e/s', nodeCount: '1' },
+          { id: 'tweets_about_labradoodles', eventsEmittedRate: '1.2 e/s', nodeCount: '1' },
+        ];
+
+        // check the all data in the table
+        pipelinesAll.forEach((obj, index) => {
+          expect(pipelinesAll[index].id).to.be(tableData[index].id);
+          expect(pipelinesAll[index].eventsEmittedRate).to.be(tableData[index].eventsEmittedRate);
+          expect(pipelinesAll[index].nodeCount).to.be(tableData[index].nodeCount);
+        });
+      });
+
+      it('should have Pipelines Table showing correct rows after sorting by Events Emitted Rate Asc', async () => {
+        await pipelinesList.clickEventsEmittedRateCol();
+
+        const rows = await pipelinesList.getRows();
+        expect(rows.length).to.be(3);
+
+        const pipelinesAll = await pipelinesList.getPipelinesAll();
+
+        const tableData = [
+          { id: 'test_interpolation', eventsEmittedRate: '0 e/s', nodeCount: '1' },
+          { id: 'tweets_about_labradoodles', eventsEmittedRate: '1.2 e/s', nodeCount: '1' },
+          { id: 'nginx_logs', eventsEmittedRate: '62.5 e/s', nodeCount: '1' },
+        ];
+
+        // check the all data in the table
+        pipelinesAll.forEach((obj, index) => {
+          expect(pipelinesAll[index].id).to.be(tableData[index].id);
+          expect(pipelinesAll[index].eventsEmittedRate).to.be(tableData[index].eventsEmittedRate);
+          expect(pipelinesAll[index].nodeCount).to.be(tableData[index].nodeCount);
+        });
+      });
+
+      it('should filter for non-existent pipeline', async () => {
+        await pipelinesList.setFilter('foobar');
+        await pipelinesList.assertNoData();
+        await pipelinesList.clearFilter();
+      });
+
+      it('should filter for specific pipelines', async () => {
+        await pipelinesList.setFilter('la');
+        await PageObjects.common.pressEnterKey();
+        await retry.try(async () => {
+          const rows = await pipelinesList.getRows();
+          expect(rows.length).to.be(2);
+        });
+        await pipelinesList.clearFilter();
+      });
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/monitoring/logstash/node_detail_mb.js b/x-pack/test/functional/apps/monitoring/logstash/node_detail_mb.js
new file mode 100644
index 0000000000000..aba95b42c3043
--- /dev/null
+++ b/x-pack/test/functional/apps/monitoring/logstash/node_detail_mb.js
@@ -0,0 +1,125 @@
+/*
+ * Copyright 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 { getLifecycleMethods } from '../_get_lifecycle_methods';
+
+export default function ({ getService, getPageObjects }) {
+  const PageObjects = getPageObjects(['common']);
+  const retry = getService('retry');
+  const clusterOverview = getService('monitoringClusterOverview');
+  const nodes = getService('monitoringLogstashNodes');
+  const nodeDetail = getService('monitoringLogstashNodeDetail');
+  const pipelinesList = getService('monitoringLogstashPipelines');
+
+  describe('Logstash node detail mb', () => {
+    describe('Node', () => {
+      const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
+      const nodeSummaryStatus = {
+        eventsIn: 'Events Received\n42.4k',
+        eventsOut: 'Events Emitted\n39.4k',
+        httpAddress: 'Transport Address\n127.0.0.1:9600',
+        numReloads: 'Config Reloads\n0',
+        pipelineBatchSize: 'Batch Size\n125',
+        pipelineWorkers: 'Pipeline Workers\n8',
+        uptime: 'Uptime\n8 minutes',
+        version: 'Version\n7.0.0-alpha1',
+      };
+
+      before(async () => {
+        await setup('x-pack/test/functional/es_archives/monitoring/logstash_pipelines_mb', {
+          from: 'Jan 22, 2018 @ 09:10:00.000',
+          to: 'Jan 22, 2018 @ 09:41:00.000',
+        });
+
+        await clusterOverview.closeAlertsModal();
+
+        // go to logstash nodes
+        await clusterOverview.clickLsNodes();
+        expect(await nodes.isOnNodesListing()).to.be(true);
+        await nodes.clickRowByResolver('29a3dfa6-c146-4534-9bc0-be475d2ce950');
+      });
+
+      after(async () => {
+        await tearDown();
+      });
+
+      it('detail view should have summary status showing correct info', async () => {
+        expect(await nodeDetail.getSummary()).to.eql(nodeSummaryStatus);
+      });
+      it('advanced view should have summary status showing correct info', async () => {
+        await nodeDetail.clickAdvanced();
+
+        expect(await nodeDetail.getSummary()).to.eql(nodeSummaryStatus);
+      });
+      it('pipelines view should have summary status showing correct info', async () => {
+        await nodeDetail.clickPipelines();
+
+        expect(await nodeDetail.getSummary()).to.eql(nodeSummaryStatus);
+      });
+      it('pipelines view should have Pipelines table showing correct rows with default sorting', async () => {
+        const rows = await pipelinesList.getRows();
+        expect(rows.length).to.be(3);
+
+        await pipelinesList.clickIdCol();
+
+        const pipelinesAll = await pipelinesList.getPipelinesAll();
+
+        const tableData = [
+          { id: 'nginx_logs', eventsEmittedRate: '62.5 e/s', nodeCount: '1' },
+          { id: 'test_interpolation', eventsEmittedRate: '0 e/s', nodeCount: '1' },
+          { id: 'tweets_about_labradoodles', eventsEmittedRate: '1.2 e/s', nodeCount: '1' },
+        ];
+
+        // check the all data in the table
+        pipelinesAll.forEach((obj, index) => {
+          expect(pipelinesAll[index].id).to.be(tableData[index].id);
+          expect(pipelinesAll[index].eventsEmittedRate).to.be(tableData[index].eventsEmittedRate);
+          expect(pipelinesAll[index].nodeCount).to.be(tableData[index].nodeCount);
+        });
+      });
+
+      it('should have Pipelines Table showing correct rows after sorting by Events Emitted Rate Asc', async () => {
+        await pipelinesList.clickEventsEmittedRateCol();
+
+        const rows = await pipelinesList.getRows();
+        expect(rows.length).to.be(3);
+
+        const pipelinesAll = await pipelinesList.getPipelinesAll();
+
+        const tableData = [
+          { id: 'test_interpolation', eventsEmittedRate: '0 e/s', nodeCount: '1' },
+          { id: 'tweets_about_labradoodles', eventsEmittedRate: '1.2 e/s', nodeCount: '1' },
+          { id: 'nginx_logs', eventsEmittedRate: '62.5 e/s', nodeCount: '1' },
+        ];
+
+        // check the all data in the table
+        pipelinesAll.forEach((obj, index) => {
+          expect(pipelinesAll[index].id).to.be(tableData[index].id);
+          expect(pipelinesAll[index].eventsEmittedRate).to.be(tableData[index].eventsEmittedRate);
+          expect(pipelinesAll[index].nodeCount).to.be(tableData[index].nodeCount);
+        });
+      });
+
+      it('should filter for non-existent pipeline', async () => {
+        await pipelinesList.setFilter('foobar');
+        await pipelinesList.assertNoData();
+        await pipelinesList.clearFilter();
+      });
+
+      it('should filter for specific pipelines', async () => {
+        await pipelinesList.setFilter('la');
+        await PageObjects.common.pressEnterKey();
+        await retry.try(async () => {
+          const rows = await pipelinesList.getRows();
+          expect(rows.length).to.be(2);
+        });
+        await pipelinesList.clearFilter();
+      });
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/monitoring/logstash/nodes.js b/x-pack/test/functional/apps/monitoring/logstash/nodes.js
new file mode 100644
index 0000000000000..75e3c7bac7c01
--- /dev/null
+++ b/x-pack/test/functional/apps/monitoring/logstash/nodes.js
@@ -0,0 +1,104 @@
+/*
+ * Copyright 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 { getLifecycleMethods } from '../_get_lifecycle_methods';
+
+export default function ({ getService, getPageObjects }) {
+  const clusterOverview = getService('monitoringClusterOverview');
+  const nodes = getService('monitoringLogstashNodes');
+  const logstashSummaryStatus = getService('monitoringLogstashSummaryStatus');
+
+  describe('Logstash nodes', () => {
+    const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
+
+    before(async () => {
+      await setup('x-pack/test/functional/es_archives/monitoring/logstash_pipelines', {
+        from: 'Jan 22, 2018 @ 09:10:00.000',
+        to: 'Jan 22, 2018 @ 09:41:00.000',
+      });
+
+      await clusterOverview.closeAlertsModal();
+
+      // go to logstash nodes
+      await clusterOverview.clickLsNodes();
+      expect(await nodes.isOnNodesListing()).to.be(true);
+    });
+
+    after(async () => {
+      await tearDown();
+    });
+    it('should have Logstash Cluster Summary Status showing correct info', async () => {
+      expect(await logstashSummaryStatus.getContent()).to.eql({
+        eventsInTotal: 'Events Received\n117.9k',
+        eventsOutTotal: 'Events Emitted\n111.9k',
+        memoryUsed: 'Memory\n528.4 MB / 1.9 GB',
+        nodeCount: 'Nodes\n2',
+      });
+    });
+    it('should have a nodes table with the correct number of rows', async () => {
+      const rows = await nodes.getRows();
+      expect(rows.length).to.be(2);
+    });
+    it('should have a nodes table with the correct data', async () => {
+      const nodesAll = await nodes.getNodesAll();
+
+      const tableData = [
+        {
+          id: 'Shaunaks-MacBook-Pro.local',
+          httpAddress: '127.0.0.1:9601',
+          alertStatus: 'Clear',
+          cpuUsage: '0.00%',
+          loadAverage: '4.54',
+          jvmHeapUsed: '22.00%',
+          eventsOut: '73.5k',
+          configReloadsSuccess: '0 successes',
+          configReloadsFailure: '0 failures',
+          version: '7.0.0-alpha1',
+        },
+        {
+          id: 'Shaunaks-MacBook-Pro.local',
+          httpAddress: '127.0.0.1:9600',
+          alertStatus: 'Clear',
+          cpuUsage: '2.00%',
+          loadAverage: '4.76',
+          jvmHeapUsed: '30.00%',
+          eventsOut: '38.4k',
+          configReloadsSuccess: '0 successes',
+          configReloadsFailure: '0 failures',
+          version: '7.0.0-alpha1',
+        },
+      ];
+
+      nodesAll.forEach((obj, index) => {
+        expect(nodesAll[index].id).to.be(tableData[index].id);
+        expect(nodesAll[index].httpAddress).to.be(tableData[index].httpAddress);
+        expect(nodesAll[index].alertStatus).to.be(tableData[index].alertStatus);
+        expect(nodesAll[index].cpuUsage).to.be(tableData[index].cpuUsage);
+        expect(nodesAll[index].loadAverage).to.be(tableData[index].loadAverage);
+        expect(nodesAll[index].jvmHeapUsed).to.be(tableData[index].jvmHeapUsed);
+        expect(nodesAll[index].eventsOut).to.be(tableData[index].eventsOut);
+        expect(nodesAll[index].configReloadsSuccess).to.be(tableData[index].configReloadsSuccess);
+        expect(nodesAll[index].configReloadsFailure).to.be(tableData[index].configReloadsFailure);
+        expect(nodesAll[index].version).to.be(tableData[index].version);
+      });
+    });
+
+    it('should filter for non-existent node', async () => {
+      await nodes.setFilter('foobar');
+      await nodes.assertNoData();
+      await nodes.clearFilter();
+    });
+
+    it('should filter for specific nodes', async () => {
+      await nodes.setFilter('sha');
+      const rows = await nodes.getRows();
+      expect(rows.length).to.be(2);
+      await nodes.clearFilter();
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/monitoring/logstash/nodes_mb.js b/x-pack/test/functional/apps/monitoring/logstash/nodes_mb.js
new file mode 100644
index 0000000000000..1f55d3a0c72dd
--- /dev/null
+++ b/x-pack/test/functional/apps/monitoring/logstash/nodes_mb.js
@@ -0,0 +1,104 @@
+/*
+ * Copyright 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 { getLifecycleMethods } from '../_get_lifecycle_methods';
+
+export default function ({ getService, getPageObjects }) {
+  const clusterOverview = getService('monitoringClusterOverview');
+  const nodes = getService('monitoringLogstashNodes');
+  const logstashSummaryStatus = getService('monitoringLogstashSummaryStatus');
+
+  describe('Logstash nodes mb', () => {
+    const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
+
+    before(async () => {
+      await setup('x-pack/test/functional/es_archives/monitoring/logstash_pipelines_mb', {
+        from: 'Jan 22, 2018 @ 09:10:00.000',
+        to: 'Jan 22, 2018 @ 09:41:00.000',
+      });
+
+      await clusterOverview.closeAlertsModal();
+
+      // go to logstash nodes
+      await clusterOverview.clickLsNodes();
+      expect(await nodes.isOnNodesListing()).to.be(true);
+    });
+
+    after(async () => {
+      await tearDown();
+    });
+    it('should have Logstash Cluster Summary Status showing correct info', async () => {
+      expect(await logstashSummaryStatus.getContent()).to.eql({
+        eventsInTotal: 'Events Received\n117.9k',
+        eventsOutTotal: 'Events Emitted\n111.9k',
+        memoryUsed: 'Memory\n528.4 MB / 1.9 GB',
+        nodeCount: 'Nodes\n2',
+      });
+    });
+    it('should have a nodes table with the correct number of rows', async () => {
+      const rows = await nodes.getRows();
+      expect(rows.length).to.be(2);
+    });
+    it('should have a nodes table with the correct data', async () => {
+      const nodesAll = await nodes.getNodesAll();
+
+      const tableData = [
+        {
+          id: 'Shaunaks-MacBook-Pro.local',
+          httpAddress: '127.0.0.1:9601',
+          alertStatus: 'Clear',
+          cpuUsage: '0.00%',
+          loadAverage: '4.54',
+          jvmHeapUsed: '22.00%',
+          eventsOut: '73.5k',
+          configReloadsSuccess: '0 successes',
+          configReloadsFailure: '0 failures',
+          version: '7.0.0-alpha1',
+        },
+        {
+          id: 'Shaunaks-MacBook-Pro.local',
+          httpAddress: '127.0.0.1:9600',
+          alertStatus: 'Clear',
+          cpuUsage: '2.00%',
+          loadAverage: '4.76',
+          jvmHeapUsed: '30.00%',
+          eventsOut: '38.4k',
+          configReloadsSuccess: '0 successes',
+          configReloadsFailure: '0 failures',
+          version: '7.0.0-alpha1',
+        },
+      ];
+
+      nodesAll.forEach((obj, index) => {
+        expect(nodesAll[index].id).to.be(tableData[index].id);
+        expect(nodesAll[index].httpAddress).to.be(tableData[index].httpAddress);
+        expect(nodesAll[index].alertStatus).to.be(tableData[index].alertStatus);
+        expect(nodesAll[index].cpuUsage).to.be(tableData[index].cpuUsage);
+        expect(nodesAll[index].loadAverage).to.be(tableData[index].loadAverage);
+        expect(nodesAll[index].jvmHeapUsed).to.be(tableData[index].jvmHeapUsed);
+        expect(nodesAll[index].eventsOut).to.be(tableData[index].eventsOut);
+        expect(nodesAll[index].configReloadsSuccess).to.be(tableData[index].configReloadsSuccess);
+        expect(nodesAll[index].configReloadsFailure).to.be(tableData[index].configReloadsFailure);
+        expect(nodesAll[index].version).to.be(tableData[index].version);
+      });
+    });
+
+    it('should filter for non-existent node', async () => {
+      await nodes.setFilter('foobar');
+      await nodes.assertNoData();
+      await nodes.clearFilter();
+    });
+
+    it('should filter for specific nodes', async () => {
+      await nodes.setFilter('sha');
+      const rows = await nodes.getRows();
+      expect(rows.length).to.be(2);
+      await nodes.clearFilter();
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/monitoring/logstash/overview.js b/x-pack/test/functional/apps/monitoring/logstash/overview.js
new file mode 100644
index 0000000000000..593159ec6b266
--- /dev/null
+++ b/x-pack/test/functional/apps/monitoring/logstash/overview.js
@@ -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 { getLifecycleMethods } from '../_get_lifecycle_methods';
+
+export default function ({ getService, getPageObjects }) {
+  const clusterOverview = getService('monitoringClusterOverview');
+  const overview = getService('monitoringLogstashOverview');
+  const logstashSummaryStatus = getService('monitoringLogstashSummaryStatus');
+
+  describe('Logstash overview', () => {
+    const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
+
+    before(async () => {
+      await setup('x-pack/test/functional/es_archives/monitoring/logstash_pipelines', {
+        from: 'Jan 22, 2018 @ 09:10:00.000',
+        to: 'Jan 22, 2018 @ 09:41:00.000',
+      });
+
+      await clusterOverview.closeAlertsModal();
+
+      // go to logstash overview
+      await clusterOverview.clickLsOverview();
+      expect(await overview.isOnOverview()).to.be(true);
+    });
+
+    after(async () => {
+      await tearDown();
+    });
+    it('should have Logstash Cluster Summary Status showing correct info', async () => {
+      expect(await logstashSummaryStatus.getContent()).to.eql({
+        eventsInTotal: 'Events Received\n117.9k',
+        eventsOutTotal: 'Events Emitted\n111.9k',
+        memoryUsed: 'Memory\n528.4 MB / 1.9 GB',
+        nodeCount: 'Nodes\n2',
+      });
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/monitoring/logstash/overview_mb.js b/x-pack/test/functional/apps/monitoring/logstash/overview_mb.js
new file mode 100644
index 0000000000000..91faede36b1d6
--- /dev/null
+++ b/x-pack/test/functional/apps/monitoring/logstash/overview_mb.js
@@ -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 { getLifecycleMethods } from '../_get_lifecycle_methods';
+
+export default function ({ getService, getPageObjects }) {
+  const clusterOverview = getService('monitoringClusterOverview');
+  const overview = getService('monitoringLogstashOverview');
+  const logstashSummaryStatus = getService('monitoringLogstashSummaryStatus');
+
+  describe('Logstash overview mb', () => {
+    const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
+
+    before(async () => {
+      await setup('x-pack/test/functional/es_archives/monitoring/logstash_pipelines_mb', {
+        from: 'Jan 22, 2018 @ 09:10:00.000',
+        to: 'Jan 22, 2018 @ 09:41:00.000',
+      });
+
+      await clusterOverview.closeAlertsModal();
+
+      // go to logstash overview
+      await clusterOverview.clickLsOverview();
+      expect(await overview.isOnOverview()).to.be(true);
+    });
+
+    after(async () => {
+      await tearDown();
+    });
+    it('should have an Logstash Summary Status with correct info', async () => {
+      expect(await logstashSummaryStatus.getContent()).to.eql({
+        eventsInTotal: 'Events Received\n117.9k',
+        eventsOutTotal: 'Events Emitted\n111.9k',
+        memoryUsed: 'Memory\n528.4 MB / 1.9 GB',
+        nodeCount: 'Nodes\n2',
+      });
+    });
+  });
+}
diff --git a/x-pack/test/functional/es_archives/signals/README.md b/x-pack/test/functional/es_archives/signals/README.md
index 97c8c504a4039..01f8405d6ed58 100644
--- a/x-pack/test/functional/es_archives/signals/README.md
+++ b/x-pack/test/functional/es_archives/signals/README.md
@@ -24,3 +24,7 @@ A legacy signals index. It has no migration metadata fields and a very old mappi
 #### `signals/outdated_signals_index`
 
 A signals index that had previously been updated but is now out of date. It has migration metadata fields and a recent mapping version.
+
+#### `signals/index_alias_clash`
+
+An index that has the .siem-signals alias, but is NOT a signals index. Used for simulating an alerts-as-data index, which will have the .siem-signals alias but different mappings. This way we can test that functionality that needs to target only signals indices (e.g. mapping updates to apply field aliases) work correctly in the presence of alerts-as-data indices.
diff --git a/x-pack/test/functional/es_archives/signals/index_alias_clash/data.json b/x-pack/test/functional/es_archives/signals/index_alias_clash/data.json
new file mode 100644
index 0000000000000..8bba21bbfbae8
--- /dev/null
+++ b/x-pack/test/functional/es_archives/signals/index_alias_clash/data.json
@@ -0,0 +1,11 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "1",
+    "index": "signal_name_clash",
+    "source": {
+      "@timestamp": "2020-10-28T05:08:53.000Z"
+    },
+    "type": "_doc"
+  }
+}
diff --git a/x-pack/test/functional/es_archives/signals/index_alias_clash/mappings.json b/x-pack/test/functional/es_archives/signals/index_alias_clash/mappings.json
new file mode 100644
index 0000000000000..3a77af645b118
--- /dev/null
+++ b/x-pack/test/functional/es_archives/signals/index_alias_clash/mappings.json
@@ -0,0 +1,24 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".siem-signals-default": {
+        "is_write_index": false
+      }
+    },
+    "index": "index_alias_clash",
+    "mappings": {
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/services/index.ts b/x-pack/test/functional/services/index.ts
index 3e69a5f43928a..2f9259c16d4bf 100644
--- a/x-pack/test/functional/services/index.ts
+++ b/x-pack/test/functional/services/index.ts
@@ -27,6 +27,9 @@ import {
   MonitoringBeatsListingProvider,
   MonitoringBeatDetailProvider,
   MonitoringBeatsSummaryStatusProvider,
+  MonitoringLogstashOverviewProvider,
+  MonitoringLogstashNodesProvider,
+  MonitoringLogstashNodeDetailProvider,
   MonitoringLogstashPipelinesProvider,
   MonitoringLogstashSummaryStatusProvider,
   MonitoringKibanaOverviewProvider,
@@ -88,6 +91,9 @@ export const services = {
   monitoringBeatsListing: MonitoringBeatsListingProvider,
   monitoringBeatDetail: MonitoringBeatDetailProvider,
   monitoringBeatsSummaryStatus: MonitoringBeatsSummaryStatusProvider,
+  monitoringLogstashOverview: MonitoringLogstashOverviewProvider,
+  monitoringLogstashNodes: MonitoringLogstashNodesProvider,
+  monitoringLogstashNodeDetail: MonitoringLogstashNodeDetailProvider,
   monitoringLogstashPipelines: MonitoringLogstashPipelinesProvider,
   monitoringLogstashSummaryStatus: MonitoringLogstashSummaryStatusProvider,
   monitoringKibanaOverview: MonitoringKibanaOverviewProvider,
diff --git a/x-pack/test/functional/services/monitoring/cluster_overview.js b/x-pack/test/functional/services/monitoring/cluster_overview.js
index 215e92fa055be..835e566386e0a 100644
--- a/x-pack/test/functional/services/monitoring/cluster_overview.js
+++ b/x-pack/test/functional/services/monitoring/cluster_overview.js
@@ -45,6 +45,7 @@ export function MonitoringClusterOverviewProvider({ getService }) {
   const SUBJ_LS_UPTIME = `${SUBJ_LS_PANEL} > lsUptime`;
   const SUBJ_LS_JVM_HEAP = `${SUBJ_LS_PANEL} > lsJvmHeap`;
   const SUBJ_LS_PIPELINES = `${SUBJ_LS_PANEL} > lsPipelines`;
+  const SUBJ_LS_OVERVIEW = `${SUBJ_LS_PANEL} > lsOverview`;
 
   const SUBJ_BEATS_PANEL = `clusterItemContainerBeats`;
   const SUBJ_BEATS_OVERVIEW = `${SUBJ_BEATS_PANEL} > beatsOverview`;
@@ -179,6 +180,12 @@ export function MonitoringClusterOverviewProvider({ getService }) {
     getLsJvmHeap() {
       return testSubjects.getVisibleText(SUBJ_LS_JVM_HEAP);
     }
+    clickLsOverview() {
+      return testSubjects.click(SUBJ_LS_OVERVIEW);
+    }
+    clickLsNodes() {
+      return testSubjects.click(SUBJ_LS_NODES);
+    }
     getLsPipelines() {
       return testSubjects.getVisibleText(SUBJ_LS_PIPELINES);
     }
diff --git a/x-pack/test/functional/services/monitoring/index.js b/x-pack/test/functional/services/monitoring/index.js
index 2ca0e7fc920c1..5d337dc6ca822 100644
--- a/x-pack/test/functional/services/monitoring/index.js
+++ b/x-pack/test/functional/services/monitoring/index.js
@@ -20,6 +20,9 @@ export { MonitoringBeatsOverviewProvider } from './beats_overview';
 export { MonitoringBeatsListingProvider } from './beats_listing';
 export { MonitoringBeatDetailProvider } from './beat_detail';
 export { MonitoringBeatsSummaryStatusProvider } from './beats_summary_status';
+export { MonitoringLogstashOverviewProvider } from './logstash_overview';
+export { MonitoringLogstashNodesProvider } from './logstash_nodes';
+export { MonitoringLogstashNodeDetailProvider } from './logstash_node_detail';
 export { MonitoringLogstashPipelinesProvider } from './logstash_pipelines';
 export { MonitoringLogstashSummaryStatusProvider } from './logstash_summary_status';
 export { MonitoringKibanaOverviewProvider } from './kibana_overview';
diff --git a/x-pack/test/functional/services/monitoring/logstash_node_detail.js b/x-pack/test/functional/services/monitoring/logstash_node_detail.js
new file mode 100644
index 0000000000000..42d32c0c1a2aa
--- /dev/null
+++ b/x-pack/test/functional/services/monitoring/logstash_node_detail.js
@@ -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.
+ */
+
+export function MonitoringLogstashNodeDetailProvider({ getService }) {
+  const testSubjects = getService('testSubjects');
+
+  const SUBJ_SUMMARY = 'logstashDetailStatus';
+  const SUBJ_SUMMARY_HTTP_ADDRESS = `${SUBJ_SUMMARY} > httpAddress`;
+  const SUBJ_SUMMARY_EVENTS_IN = `${SUBJ_SUMMARY} > eventsIn`;
+  const SUBJ_SUMMARY_EVENTS_OUT = `${SUBJ_SUMMARY} > eventsOut`;
+  const SUBJ_SUMMARY_NUM_RELOADS = `${SUBJ_SUMMARY} > numReloads`;
+  const SUBJ_SUMMARY_PIPELINE_WORKERS = `${SUBJ_SUMMARY} > pipelineWorkers`;
+  const SUBJ_SUMMARY_PIPELINE_BATCH_SIZE = `${SUBJ_SUMMARY} > pipelineBatchSize`;
+  const SUBJ_SUMMARY_VERSION = `${SUBJ_SUMMARY} > version`;
+  const SUBJ_SUMMARY_UPTIME = `${SUBJ_SUMMARY} > uptime`;
+
+  return new (class LogstashNodeDetail {
+    async clickPipelines() {
+      return testSubjects.click('logstashNodeDetailPipelinesLink');
+    }
+    async clickAdvanced() {
+      return testSubjects.click('logstashNodeDetailAdvancedLink');
+    }
+
+    async getSummary() {
+      return {
+        httpAddress: await testSubjects.getVisibleText(SUBJ_SUMMARY_HTTP_ADDRESS),
+        eventsIn: await testSubjects.getVisibleText(SUBJ_SUMMARY_EVENTS_IN),
+        eventsOut: await testSubjects.getVisibleText(SUBJ_SUMMARY_EVENTS_OUT),
+        numReloads: await testSubjects.getVisibleText(SUBJ_SUMMARY_NUM_RELOADS),
+        pipelineWorkers: await testSubjects.getVisibleText(SUBJ_SUMMARY_PIPELINE_WORKERS),
+        pipelineBatchSize: await testSubjects.getVisibleText(SUBJ_SUMMARY_PIPELINE_BATCH_SIZE),
+        version: await testSubjects.getVisibleText(SUBJ_SUMMARY_VERSION),
+        uptime: await testSubjects.getVisibleText(SUBJ_SUMMARY_UPTIME),
+      };
+    }
+  })();
+}
diff --git a/x-pack/test/functional/services/monitoring/logstash_nodes.js b/x-pack/test/functional/services/monitoring/logstash_nodes.js
new file mode 100644
index 0000000000000..2666cdc3d0654
--- /dev/null
+++ b/x-pack/test/functional/services/monitoring/logstash_nodes.js
@@ -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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { range } from 'lodash';
+export function MonitoringLogstashNodesProvider({ getService, getPageObjects }) {
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+  const PageObjects = getPageObjects(['monitoring']);
+  const find = getService('find');
+
+  const SUBJ_OVERVIEW_PAGE = 'logstashNodesPage';
+  const SUBJ_TABLE_CONTAINER = 'logstashNodesTableContainer';
+  const SUBJ_SEARCH_BAR = `${SUBJ_TABLE_CONTAINER} > monitoringTableToolBar`;
+  const SUBJ_TABLE_NO_DATA = `${SUBJ_TABLE_CONTAINER} > monitoringTableNoData`;
+  const SUBJ_NODE_NAME = `${SUBJ_TABLE_CONTAINER} > name`;
+  const SUBJ_NODE_ALERT_STATUS = `${SUBJ_TABLE_CONTAINER} > alertStatusText`;
+  const SUBJ_NODE_IP = `${SUBJ_TABLE_CONTAINER} > httpAddress`;
+  const SUBJ_NODE_CPU_USAGE = `${SUBJ_TABLE_CONTAINER} > cpuUsage`;
+  const SUBJ_NODE_LOAD_AVERAGE = `${SUBJ_TABLE_CONTAINER} > loadAverage`;
+  const SUBJ_NODE_JVM_HEAP_USED = `${SUBJ_TABLE_CONTAINER} > jvmHeapUsed`;
+  const SUBJ_NODE_EVENTS_OUT = `${SUBJ_TABLE_CONTAINER} > eventsOut`;
+  const SUBJ_NODE_CONFIG_RELOADS_SUCCESS = `${SUBJ_TABLE_CONTAINER} > configReloadsSuccess`;
+  const SUBJ_NODE_CONFIG_RELOADS_FAILURE = `${SUBJ_TABLE_CONTAINER} > configReloadsFailure`;
+  const SUBJ_NODE_VERSION = `${SUBJ_TABLE_CONTAINER} > version`;
+
+  const SUBJ_NODE_LINK_PREFIX = `${SUBJ_TABLE_CONTAINER} > nodeLink-`;
+
+  return new (class LogstashNodes {
+    async isOnNodesListing() {
+      const pageId = await retry.try(() => testSubjects.find(SUBJ_OVERVIEW_PAGE));
+      return pageId !== null;
+    }
+    async clickRowByResolver(nodeResolver) {
+      await retry.waitForWithTimeout('redirection to node detail', 30000, async () => {
+        await testSubjects.click(SUBJ_NODE_LINK_PREFIX + nodeResolver, 5000);
+        return testSubjects.exists('logstashDetailStatus', { timeout: 5000 });
+      });
+    }
+    getRows() {
+      return PageObjects.monitoring.tableGetRowsFromContainer(SUBJ_TABLE_CONTAINER);
+    }
+    async setFilter(text) {
+      await PageObjects.monitoring.tableSetFilter(SUBJ_SEARCH_BAR, text);
+      await this.waitForTableToFinishLoading();
+    }
+
+    async clearFilter() {
+      await PageObjects.monitoring.tableClearFilter(SUBJ_SEARCH_BAR);
+      await this.waitForTableToFinishLoading();
+    }
+
+    assertNoData() {
+      return PageObjects.monitoring.assertTableNoData(SUBJ_TABLE_NO_DATA);
+    }
+    async waitForTableToFinishLoading() {
+      await retry.try(async () => {
+        await find.waitForDeletedByCssSelector('.euiBasicTable-loading', 5000);
+      });
+    }
+    async getNodesAll() {
+      const name = await testSubjects.getVisibleTextAll(SUBJ_NODE_NAME);
+      const alertStatus = await testSubjects.getVisibleTextAll(SUBJ_NODE_ALERT_STATUS);
+      const httpAddress = await testSubjects.getVisibleTextAll(SUBJ_NODE_IP);
+      const cpuUsage = await testSubjects.getVisibleTextAll(SUBJ_NODE_CPU_USAGE);
+      const loadAverage = await testSubjects.getVisibleTextAll(SUBJ_NODE_LOAD_AVERAGE);
+      const jvmHeapUsed = await testSubjects.getVisibleTextAll(SUBJ_NODE_JVM_HEAP_USED);
+      const eventsOut = await testSubjects.getVisibleTextAll(SUBJ_NODE_EVENTS_OUT);
+      const configReloadsSuccess = await testSubjects.getVisibleTextAll(
+        SUBJ_NODE_CONFIG_RELOADS_SUCCESS
+      );
+      const configReloadsFailure = await testSubjects.getVisibleTextAll(
+        SUBJ_NODE_CONFIG_RELOADS_FAILURE
+      );
+      const version = await testSubjects.getVisibleTextAll(SUBJ_NODE_VERSION);
+
+      // tuple-ize the icons and texts together into an array of objects
+      const tableRows = await this.getRows();
+      const iterator = range(tableRows.length);
+      return iterator.reduce((all, current) => {
+        return [
+          ...all,
+          {
+            id: name[current],
+            httpAddress: httpAddress[current],
+            alertStatus: alertStatus[current],
+            cpuUsage: cpuUsage[current],
+            loadAverage: loadAverage[current],
+            jvmHeapUsed: jvmHeapUsed[current],
+            eventsOut: eventsOut[current],
+            configReloadsSuccess: configReloadsSuccess[current],
+            configReloadsFailure: configReloadsFailure[current],
+            version: version[current],
+          },
+        ];
+      }, []);
+    }
+  })();
+}
diff --git a/x-pack/test/functional/services/monitoring/logstash_overview.js b/x-pack/test/functional/services/monitoring/logstash_overview.js
new file mode 100644
index 0000000000000..55ac738c8ffea
--- /dev/null
+++ b/x-pack/test/functional/services/monitoring/logstash_overview.js
@@ -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.
+ */
+
+export function MonitoringLogstashOverviewProvider({ getService }) {
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+
+  const SUBJ_OVERVIEW_PAGE = 'logstashOverviewPage';
+
+  return new (class LogstashOverview {
+    async isOnOverview() {
+      const pageId = await retry.try(() => testSubjects.find(SUBJ_OVERVIEW_PAGE));
+      return pageId !== null;
+    }
+  })();
+}
diff --git a/yarn.lock b/yarn.lock
index fbfa69d2c94b7..49ef08f1cf363 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10277,36 +10277,24 @@ check-more-types@2.24.0, check-more-types@^2.24.0:
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
   integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=
 
-cheerio-select@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.4.0.tgz#3a16f21e37a2ef0f211d6d1aa4eff054bb22cdc9"
-  integrity sha512-sobR3Yqz27L553Qa7cK6rtJlMDbiKPdNywtR95Sj/YgfpLfy0u6CGJuaBKe5YE/vTc23SCRKxWSdlon/w6I/Ew==
+cheerio-select@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.5.0.tgz#faf3daeb31b17c5e1a9dabcee288aaf8aafa5823"
+  integrity sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==
   dependencies:
-    css-select "^4.1.2"
-    css-what "^5.0.0"
+    css-select "^4.1.3"
+    css-what "^5.0.1"
     domelementtype "^2.2.0"
     domhandler "^4.2.0"
-    domutils "^2.6.0"
+    domutils "^2.7.0"
 
-cheerio@^1.0.0-rc.3:
-  version "1.0.0-rc.3"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
-  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
-  dependencies:
-    css-select "~1.2.0"
-    dom-serializer "~0.1.1"
-    entities "~1.1.1"
-    htmlparser2 "^3.9.1"
-    lodash "^4.15.0"
-    parse5 "^3.0.1"
-
-cheerio@^1.0.0-rc.9:
-  version "1.0.0-rc.9"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.9.tgz#a3ae6b7ce7af80675302ff836f628e7cb786a67f"
-  integrity sha512-QF6XVdrLONO6DXRF5iaolY+odmhj2CLj+xzNod7INPWMi/x9X4SOylH0S/vaPpX+AUU6t04s34SQNh7DbkuCng==
-  dependencies:
-    cheerio-select "^1.4.0"
-    dom-serializer "^1.3.1"
+cheerio@^1.0.0-rc.10, cheerio@^1.0.0-rc.3:
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e"
+  integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==
+  dependencies:
+    cheerio-select "^1.5.0"
+    dom-serializer "^1.3.2"
     domhandler "^4.2.0"
     htmlparser2 "^6.1.0"
     parse5 "^6.0.1"
@@ -11496,7 +11484,7 @@ css-select-base-adapter@^0.1.1:
   resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
   integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==
 
-css-select@^1.1.0, css-select@~1.2.0:
+css-select@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
   integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
@@ -11516,10 +11504,10 @@ css-select@^2.0.0:
     domutils "^1.7.0"
     nth-check "^1.0.2"
 
-css-select@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.2.tgz#8b52b6714ed3a80d8221ec971c543f3b12653286"
-  integrity sha512-nu5ye2Hg/4ISq4XqdLY2bEatAcLIdt3OYGFc9Tm9n7VSlFBcfRv0gBNksHRgSdUDQGtN3XrZ94ztW+NfzkFSUw==
+css-select@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
+  integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==
   dependencies:
     boolbase "^1.0.0"
     css-what "^5.0.0"
@@ -11562,10 +11550,10 @@ css-what@^3.2.1:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
   integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
 
-css-what@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad"
-  integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==
+css-what@^5.0.0, css-what@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
+  integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
 
 css.escape@^1.5.1:
   version "1.5.1"
@@ -12896,15 +12884,15 @@ dom-helpers@^5.0.0, dom-helpers@^5.0.1:
     "@babel/runtime" "^7.8.7"
     csstype "^2.6.7"
 
-dom-serializer@0, dom-serializer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
-  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
+dom-serializer@0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.1.tgz#13650c850daffea35d8b626a4cfc4d3a17643fdb"
+  integrity sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==
   dependencies:
-    domelementtype "^1.3.0"
-    entities "^1.1.1"
+    domelementtype "^2.0.1"
+    entities "^2.0.0"
 
-dom-serializer@^1.0.1, dom-serializer@^1.3.1:
+dom-serializer@^1.0.1, dom-serializer@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
   integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
@@ -12923,7 +12911,7 @@ domain-browser@^1.1.1, domain-browser@^1.2.0:
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+domelementtype@1, domelementtype@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
@@ -12991,10 +12979,10 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^2.5.2, domutils@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz#2e15c04185d43fb16ae7057cb76433c6edb938b7"
-  integrity sha512-y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA==
+domutils@^2.5.2, domutils@^2.6.0, domutils@^2.7.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
   dependencies:
     dom-serializer "^1.0.1"
     domelementtype "^2.2.0"
@@ -13393,7 +13381,7 @@ enquirer@^2.3.5, enquirer@^2.3.6:
   dependencies:
     ansi-colors "^4.1.1"
 
-entities@^1.1.1, entities@^1.1.2, entities@~1.1.1:
+entities@^1.1.1, entities@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
@@ -16468,7 +16456,7 @@ htmlescape@^1.1.0:
   resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
   integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=
 
-htmlparser2@^3.10.0, htmlparser2@^3.9.1:
+htmlparser2@^3.10.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
   integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
@@ -19568,7 +19556,7 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@>4.17.4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@~4.17.10, lodash@~4.17.15:
+lodash@>4.17.4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@~4.17.10, lodash@~4.17.15:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -21330,9 +21318,9 @@ nth-check@^1.0.2, nth-check@~1.0.1:
     boolbase "~1.0.0"
 
 nth-check@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
-  integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
+  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
   dependencies:
     boolbase "^1.0.0"
 
@@ -22171,13 +22159,6 @@ parse5@5.1.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
   integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
 
-parse5@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
-  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
-  dependencies:
-    "@types/node" "*"
-
 parse5@^6.0.0, parse5@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"