diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 381fad404ca73..9a09ea1de6943 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -26,12 +26,12 @@
 /src/plugins/kibana_legacy/ @elastic/kibana-vis-editors
 /src/plugins/timelion/ @elastic/kibana-vis-editors
 /src/plugins/vis_default_editor/ @elastic/kibana-vis-editors
-/src/plugins/vis_type_metric/ @elastic/kibana-vis-editors
+/src/plugins/vis_types/metric/ @elastic/kibana-vis-editors
 /src/plugins/vis_type_table/ @elastic/kibana-vis-editors
-/src/plugins/vis_type_tagcloud/ @elastic/kibana-vis-editors
+/src/plugins/vis_types/tagcloud/ @elastic/kibana-vis-editors
 /src/plugins/vis_type_timelion/ @elastic/kibana-vis-editors
 /src/plugins/vis_type_timeseries/ @elastic/kibana-vis-editors
-/src/plugins/vis_type_vega/ @elastic/kibana-vis-editors
+/src/plugins/vis_types/vega/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/vislib/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/xy/ @elastic/kibana-vis-editors
 /src/plugins/vis_types/pie/ @elastic/kibana-vis-editors
diff --git a/.i18nrc.json b/.i18nrc.json
index f38d6b8faae7e..77c57ded8242b 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -60,11 +60,11 @@
     "uiActions": "src/plugins/ui_actions",
     "visDefaultEditor": "src/plugins/vis_default_editor",
     "visTypeMarkdown": "src/plugins/vis_type_markdown",
-    "visTypeMetric": "src/plugins/vis_type_metric",
+    "visTypeMetric": "src/plugins/vis_types/metric",
     "visTypeTable": "src/plugins/vis_type_table",
-    "visTypeTagCloud": "src/plugins/vis_type_tagcloud",
+    "visTypeTagCloud": "src/plugins/vis_types/tagcloud",
     "visTypeTimeseries": "src/plugins/vis_type_timeseries",
-    "visTypeVega": "src/plugins/vis_type_vega",
+    "visTypeVega": "src/plugins/vis_types/vega",
     "visTypeVislib": "src/plugins/vis_types/vislib",
     "visTypeXy": "src/plugins/vis_types/xy",
     "visTypePie": "src/plugins/vis_types/pie",
diff --git a/api_docs/core.json b/api_docs/core.json
index 8edb5d3b7ce63..93a84eb38f5c6 100644
--- a/api_docs/core.json
+++ b/api_docs/core.json
@@ -1125,7 +1125,7 @@
             "references": [
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/public/plugin.ts"
+                "path": "src/plugins/vis_types/vega/public/plugin.ts"
               }
             ]
           },
@@ -1423,15 +1423,15 @@
               },
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/public/data_model/search_api.ts"
+                "path": "src/plugins/vis_types/vega/public/data_model/search_api.ts"
               },
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/public/plugin.ts"
+                "path": "src/plugins/vis_types/vega/public/plugin.ts"
               },
               {
                 "plugin": "visTypeVega",
-                "path": "src/plugins/vis_type_vega/target/types/public/data_model/search_api.d.ts"
+                "path": "src/plugins/vis_types/vega/target/types/public/data_model/search_api.d.ts"
               }
             ]
           }
diff --git a/api_docs/data.json b/api_docs/data.json
index d0cbb6851a8fe..d76adbc36a7c4 100644
--- a/api_docs/data.json
+++ b/api_docs/data.json
@@ -16157,11 +16157,11 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "dashboard",
@@ -20282,15 +20282,15 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           }
         ],
         "children": [
@@ -22396,7 +22396,7 @@
             },
             {
               "plugin": "visTypeMetric",
-              "path": "src/plugins/vis_type_metric/public/plugin.ts"
+              "path": "src/plugins/vis_types/metric/public/plugin.ts"
             },
             {
               "plugin": "visTypeTable",
@@ -30417,11 +30417,11 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "dashboard",
@@ -36898,11 +36898,11 @@
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "visTypeVega",
-            "path": "src/plugins/vis_type_vega/public/vega_request_handler.ts"
+            "path": "src/plugins/vis_types/vega/public/vega_request_handler.ts"
           },
           {
             "plugin": "dashboard",
diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
index 24cfe1e5342a7..de62579ee05dc 100644
--- a/api_docs/deprecations_by_plugin.mdx
+++ b/api_docs/deprecations_by_plugin.mdx
@@ -679,7 +679,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_metric/public/plugin.ts#:~:text=fieldFormats) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/metric/public/plugin.ts#:~:text=fieldFormats) | - |
 
 
 
@@ -738,12 +738,12 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibDataPluginApi" section="def-public.esQuery" text="esQuery"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=esQuery) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
-| <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
-| <DocLink id="kibCorePluginApi" section="def-public.CoreSetup.injectedMetadata" text="injectedMetadata"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/plugin.ts#:~:text=injectedMetadata) | - |
-| <DocLink id="kibCorePluginApi" section="def-public.CoreStart.injectedMetadata" text="injectedMetadata"/> | [search_api.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/data_model/search_api.ts#:~:text=injectedMetadata), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/public/plugin.ts#:~:text=injectedMetadata), [search_api.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_type_vega/target/types/public/data_model/search_api.d.ts#:~:text=injectedMetadata) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.esQuery" text="esQuery"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=esQuery) | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-public.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-common.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
+| <DocLink id="kibDataPluginApi" section="def-server.Filter" text="Filter"/> | [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter), [vega_request_handler.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/vega_request_handler.ts#:~:text=Filter) | 8.1 |
+| <DocLink id="kibCorePluginApi" section="def-public.CoreSetup.injectedMetadata" text="injectedMetadata"/> | [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/plugin.ts#:~:text=injectedMetadata) | - |
+| <DocLink id="kibCorePluginApi" section="def-public.CoreStart.injectedMetadata" text="injectedMetadata"/> | [search_api.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/data_model/search_api.ts#:~:text=injectedMetadata), [plugin.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/public/plugin.ts#:~:text=injectedMetadata), [search_api.d.ts](https://github.com/elastic/kibana/tree/master/src/plugins/vis_types/vega/target/types/public/data_model/search_api.d.ts#:~:text=injectedMetadata) | - |
 
 
 
diff --git a/api_docs/vis_type_vega.json b/api_docs/vis_type_vega.json
index 88a5bda07a2f2..1ecbc7c48f289 100644
--- a/api_docs/vis_type_vega.json
+++ b/api_docs/vis_type_vega.json
@@ -22,7 +22,7 @@
       "tags": [],
       "label": "VisTypeVegaPluginStart",
       "description": [],
-      "path": "src/plugins/vis_type_vega/server/types.ts",
+      "path": "src/plugins/vis_types/vega/server/types.ts",
       "deprecated": false,
       "children": [],
       "lifecycle": "start",
@@ -35,7 +35,7 @@
       "tags": [],
       "label": "VisTypeVegaPluginSetup",
       "description": [],
-      "path": "src/plugins/vis_type_vega/server/types.ts",
+      "path": "src/plugins/vis_types/vega/server/types.ts",
       "deprecated": false,
       "children": [],
       "lifecycle": "setup",
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index e9925014d5a71..d2d543ff59d59 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -286,7 +286,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |The markdown visualization that can be used to place text panels on dashboards.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_metric[visTypeMetric]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/metric[visTypeMetric]
 |WARNING: Missing README.
 
 
@@ -298,7 +298,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |Contains the data table visualization, that allows presenting data in a simple table format.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_tagcloud[visTypeTagcloud]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/tagcloud[visTypeTagcloud]
 |WARNING: Missing README.
 
 
@@ -310,7 +310,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_vega[visTypeVega]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/vega[visTypeVega]
 |WARNING: Missing README.
 
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md b/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md
index 75732f59f1b3f..eb0dbb59e6c12 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md
+++ b/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md
@@ -31,10 +31,10 @@ async function getDeprecations({ esClient, savedObjectsClient }: GetDeprecations
     // Example of a manual correctiveAction
     deprecations.push({
       title: i18n.translate('xpack.timelion.deprecations.worksheetsTitle', {
-        defaultMessage: 'Found Timelion worksheets.'
+        defaultMessage: 'Timelion worksheets are deprecated'
       }),
       message: i18n.translate('xpack.timelion.deprecations.worksheetsMessage', {
-        defaultMessage: 'You have {count} Timelion worksheets. The Timelion app will be removed in 8.0. To continue using your Timelion worksheets, migrate them to a dashboard.',
+        defaultMessage: 'You have {count} Timelion worksheets. Migrate your Timelion worksheets to a dashboard to continue using them.',
         values: { count },
       }),
       documentationUrl:
diff --git a/docs/management/connectors/action-types/email.asciidoc b/docs/management/connectors/action-types/email.asciidoc
index bab04b8052674..98d7b2591a572 100644
--- a/docs/management/connectors/action-types/email.asciidoc
+++ b/docs/management/connectors/action-types/email.asciidoc
@@ -51,7 +51,7 @@ Use the <<action-settings, Action configuration settings>> to customize connecto
 
 Config defines information for the connector type.
 
-`service`:: The name of a https://nodemailer.com/smtp/well-known/[well-known email service provider]. If `service` is provided, `host`, `port`, and `secure` properties are ignored. For more information on the `gmail` service value, see the https://nodemailer.com/usage/using-gmail/[Nodemailer Gmail documentation].
+`service`:: The name of the email service. If `service` is `elastic_cloud` (for Elastic Cloud notifications) or one of Nodemailer's https://nodemailer.com/smtp/well-known/[well-known email service providers], `host`, `port`, and `secure` properties are ignored. If `service` is `other`, `host` and `port` properties must be defined. For more information on the `gmail` service value, see the https://nodemailer.com/usage/using-gmail/[Nodemailer Gmail documentation].
 `from`:: An email address that corresponds to *Sender*.
 `host`:: A string that corresponds to *Host*.
 `port`:: A number that corresponds to *Port*.
diff --git a/docs/spaces/images/edit-space-feature-visibility.png b/docs/spaces/images/edit-space-feature-visibility.png
index f1852d3cc03b5..b6ee4740e1d20 100644
Binary files a/docs/spaces/images/edit-space-feature-visibility.png and b/docs/spaces/images/edit-space-feature-visibility.png differ
diff --git a/docs/spaces/images/edit-space.png b/docs/spaces/images/edit-space.png
index 9785dd9e77aba..97d7ec009ade4 100644
Binary files a/docs/spaces/images/edit-space.png and b/docs/spaces/images/edit-space.png differ
diff --git a/docs/spaces/images/spaces-roles.png b/docs/spaces/images/spaces-roles.png
index 031b319cfad3e..b9003a91092bf 100644
Binary files a/docs/spaces/images/spaces-roles.png and b/docs/spaces/images/spaces-roles.png differ
diff --git a/docs/spaces/index.asciidoc b/docs/spaces/index.asciidoc
index aeeb7b45ccd8a..6722503eb0323 100644
--- a/docs/spaces/index.asciidoc
+++ b/docs/spaces/index.asciidoc
@@ -8,29 +8,18 @@ the dashboards and saved objects that belong to that space.
 
 {kib} creates a default space for you.
 After you create your own
-spaces, you're asked to choose a space when you log in to Kibana. You can change your
+spaces, you're asked to choose a space when you log in to {kib}. You can change your
 current space at any time by using the menu.
 
 [role="screenshot"]
 image::images/change-space.png["Change current space menu"]
 
-Kibana supports spaces in several ways.  You can:
-
-[[spaces-getting-started]]
-
-* <<spaces-managing, View&comma; create&comma; and delete spaces>>
-* <<spaces-control-feature-visibility, Control feature access based on user needs>>
-* <<spaces-control-user-access, Control feature access based on user privileges>>
-* <<spaces-moving-objects, Move objects between spaces>>
-* <<spaces-default-route, Configure a Space-level landing page>>
-* <<spaces-delete-started, Disable the Spaces feature>>
-
 [float]
-==== Required permissions
+==== Required privileges
 
 The `kibana_admin` role or equivalent is required to manage **Spaces**.
 
-TIP: Looking to support multiple tenants? See <<xpack-security-multiple-tenants, the Security documentation>> for more information.
+TIP: Looking to support multiple tenants? Refer to <<xpack-security-multiple-tenants, the Security documentation>> for more information.
 
 [float]
 [[spaces-managing]]
@@ -71,14 +60,14 @@ You can't delete the default space, but you can customize it to your liking.
 === Control feature access based on user needs
 
 You have control over which features are visible in each space.
-For example, you might hide Dev Tools
-in your "Executive" space or show Stack Monitoring only in your "Admin" space.
+For example, you might hide *Dev Tools*
+in your "Executive" space or show *Stack Monitoring* only in your "Admin" space.
 You can define which features to show or hide when you add or edit a space.
 
 Controlling feature
 visibility is not a security feature. To secure access
 to specific features on a per-user basis, you must configure
-<<xpack-security-authorization, Kibana Security>>.
+<<xpack-security-authorization, {kib} Security>>.
 
 [role="screenshot"]
 image::images/edit-space-feature-visibility.png["Controlling features visiblity"]
@@ -87,12 +76,12 @@ image::images/edit-space-feature-visibility.png["Controlling features visiblity"
 [[spaces-control-user-access]]
 === Control feature access based on user privileges
 
-When using Kibana with security, you can configure applications and features
+When using {kib} with security, you can configure applications and features
 based on your users’ privileges. This means different roles can have access
 to different features in the same space.
 Power users might have privileges to create and edit visualizations and dashboards,
-while analysts or executives might have Dashboard and Canvas with read-only privileges.
-See <<adding_kibana_privileges>> for details.
+while analysts or executives might have read-only privileges for *Dashboard* and *Canvas*.
+Refer to <<adding_kibana_privileges>> for details.
 
 [role="screenshot"]
 image::images/spaces-roles.png["Controlling features visiblity"]
@@ -105,7 +94,7 @@ To move saved objects between spaces, you can <<managing-saved-objects-copy-to-s
 
 [float]
 [[spaces-default-route]]
-=== Configure a Space-level landing page
+=== Configure a space-level landing page
 
 You can create a custom experience for users by configuring the {kib} landing page on a per-space basis.
 The landing page can route users to a specific dashboard, application, or saved object as they enter each space.
@@ -123,9 +112,8 @@ image::images/spaces-configure-landing-page.png["Configure space-level landing p
 === Disable and version updates
 
 Spaces are automatically enabled in {kib}. If you don't want use this feature,
-you can disable it
-by setting `xpack.spaces.enabled` to `false` in your
-`kibana.yml` configuration file.
+you can disable it. For more information, refer to <<spaces-settings-kb,Spaces settings in {kib}>>.
+
+When you upgrade {kib}, the default space contains all of your existing saved objects.
+
 
-If you are upgrading your
-version of {kib}, the default space will contain all of your existing saved objects.
diff --git a/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc b/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc
index c57e9876a4118..408b18143f27f 100644
--- a/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc
+++ b/docs/user/alerting/troubleshooting/alerting-common-issues.asciidoc
@@ -68,7 +68,7 @@ Rules  are taking a long time to execute and are impacting the overall health of
 
 [IMPORTANT]
 ==============================================
-By default, only users with a `superuser` role can query the {kib} event log because it is a system index. To enable additional users to execute this query, assign `read` privileges to the `.kibana-event-log*` index.
+By default, only users with a `superuser` role can query the experimental[] {kib} event log because it is a system index. To enable additional users to execute this query, assign `read` privileges to the `.kibana-event-log*` index.
 ==============================================
 
 *Solution*
diff --git a/docs/user/alerting/troubleshooting/event-log-index.asciidoc b/docs/user/alerting/troubleshooting/event-log-index.asciidoc
index fa5b5831c04ee..393b982b279f5 100644
--- a/docs/user/alerting/troubleshooting/event-log-index.asciidoc
+++ b/docs/user/alerting/troubleshooting/event-log-index.asciidoc
@@ -2,6 +2,8 @@
 [[event-log-index]]
 === Event log index
 
+experimental[]
+
 Use the event log index to determine:
 
 * Whether a rule successfully ran but its associated actions did not
diff --git a/docs/user/dashboard/dashboard.asciidoc b/docs/user/dashboard/dashboard.asciidoc
index 6430c5d246dc6..1284c057af2da 100644
--- a/docs/user/dashboard/dashboard.asciidoc
+++ b/docs/user/dashboard/dashboard.asciidoc
@@ -283,37 +283,15 @@ To enable series interactions, refer to <<settings-explore-data-in-chart,`xpack.
 [[download-csv]]
 == Download panel data
 
-Download panel data in a CSV file. You can download most panels in a CSV file, but there is a shortcut available
-for *Lens* panels.
-
-[float]
-[role="xpack"]
-[[download-lens-data]]
-=== Download Lens data
-
-When you download *Lens* panel data, each layer produces a single CSV file with columns.
-When you download multiple layers, the file names combine the visualization and layer index names.
-
-. Open the *Lens* panel menu
-
-. Select *More > Download as CSV*.
-
-[float]
-[[download-other-panel-data]]
-=== Download all other panel data
-
-Download the data for non-*Lens* panels.  
+Download panel data in a CSV file. When you download visualization panels with multiple layers, each layer produces a CSV file, and the file names contain the visualization and layer index names.
 
 . Open the panel menu, then select *Inspect*.
 
-. Click *Download CSV*, then select the CSV type from the dropdown:
+. Click *Download CSV*, then select the format type from the dropdown:
 
 * *Formatted CSV* &mdash; Contains human-readable dates and numbers.
 
 * *Unformatted* &mdash; Best used for computer use.
-+
-[role="screenshot"]
-image:images/Dashboard_inspect.png[Inspect in dashboard]
 
 [float]
 [[defer-loading-panels-below-the-fold]]
diff --git a/docs/user/dashboard/lens.asciidoc b/docs/user/dashboard/lens.asciidoc
index 774b50caeba6a..6b61c9fe6a9a3 100644
--- a/docs/user/dashboard/lens.asciidoc
+++ b/docs/user/dashboard/lens.asciidoc
@@ -1,14 +1,18 @@
 [[lens]]
-=== Lens
+=== Create visualizations with Lens
+++++
+<titleabbrev>Lens</titleabbrev>
+++++
 
-To create visualization panels with *Lens*, you drag the data fields you want to visualize to the workspace, then *Lens* uses heuristics to apply each field and create a visualization for you. 
+To create a visualization, drag the data fields you want to visualize to the workspace, then *Lens* uses visualization best practices to apply the fields and create a visualization that best displays the data. 
 
 With *Lens*, you can:
 
-* Create area, line, and bar charts with multiple layers, indices, and visualization types.
-* Change the aggregation function and labels to customize the data.
+* Create area, line, and bar charts with layers to display multiple indices and chart types.
+* Change the aggregation function to change the data in the visualization.
 * Perform math on aggregations using *Formula*.
-* Use time shifts to compare data for two time intervals, such as month over month.
+* Use time shifts to compare the data in two time intervals, such as month over month.
+* Create custom tables.
 
 ++++
 <script type="text/javascript" async 
@@ -32,15 +36,23 @@ If you're unsure about the visualization type you want to use, or how you want t
 
 If you already know the visualization type you want to use, and how you want to display the data, use the following process:
 
-* *Choose the visualization type.* Open the *Chart type* dropdown, then select the visualization type before you drag any fields.  
-+
-To view more visualizations that *Lens* automatically created for the fields, click the *Suggestions*. If one of the *Suggestions* meets your visualization needs, click *Save and return* to add it to the dashboard.
+Choose the visualization type. 
 
-* *Choose the data you want to visualize.* Drag the fields directly to the layer pane. *Lens* automatically selects the aggregation function.
-+
-If you want to learn more about the data a field contains, click *i* next to the field.
+. Before you drag fields to the workspace, open the *Chart type* dropdown, then select the visualization type.  
+
+. To view more visualizations that *Lens* automatically created for the fields, click *Suggestions*. If one of the *Suggestions* meets your visualization needs, click *Save and return* to add it to the dashboard.
+
+Choose the data you want to visualize.
+
+. Drag the fields directly to the layer pane. *Lens* automatically selects the aggregation function.
 
-* *Edit and delete.* To change the *Quick function* and display options, click the field in the layer pane. To delete a field, close the configuration options, then click *X* next to the field.
+. If you want to learn more about the data a field contains, click the field.
+
+Edit and delete.
+
+. To change the aggregation *Quick function* and display options, click the field in the layer pane. 
+
+. To delete a field, close the configuration options, then click *X* next to the field.
 
 [float]
 [[change-the-fields]]
@@ -59,60 +71,11 @@ image:images/runtime-field-menu.png[Dropdown menu located next to index pattern
 +
 For more information about adding fields to index patterns and examples, refer to <<runtime-fields>>.
 
-[float]
-[[lens-formulas]]
-==== Use formulas to perform math
-
-Formulas allow you to perform math on aggregated data. The most common formulas divide two values to produce a percent.
-
-. In the layer pane, click a field.
-
-. Click *Formula*, then enter the formula. 
-+
-Filter ratio example:: Use `kql=''` to filter one set of documents, then compare the document set to other documents within the same grouping:
-+
-See how the error rate changes over time:
-+
-```
-count(kql='response.status_code > 400') / count()
-```
-+
-Week over week example:: Use `shift='1w'` to get the value of each grouping from the previous week. Time shift should not be used with the *Top values* function.
-+
-```
-percentile(system.network.in.bytes, percentile=99) /
-percentile(system.network.in.bytes, percentile=99, shift='1w')
-```
-+
-Percent of total example:: Formulas can calculate `overall_sum` for all the groupings,
-which lets you convert each grouping into a percent of total:
-+
-```
-sum(products.base_price) / overall_sum(sum(products.base_price))
-```
-TIP: For detailed information on formulas, click image:dashboard/images/formula_reference.png[Formula reference icon].
-
-. To accurately display the formula, select *Percent* from the *Value format* dropdown.
-
-[float]
-[[compare-data-with-time-offsets]]
-==== Compare differences over time
-
-Compare your real-time data set to the results that are offset by a time increment. For example, you can compare the real-time percentage of a user CPU time spent to the results offset by one hour. 
-
-. In the layer pane, click the field you want to offset.
-
-. From the *Add advanced options* dropdown, select *Time shift*.
-
-. Select the time offset increment. 
-
-For a time shift example, refer to <<compare-time-ranges>>.
-
 [float]
 [[create-custom-tables]]
 ==== Create custom tables
 
-*Lens* tables are highly customizable, and provide you with text alignment, value formatting, coloring options, and more.
+Tables are highly customizable, and provide you with text alignment, value formatting, coloring options, and more.
 
 . From the *Chart type* dropdown, select *Table*. 
 
@@ -167,35 +130,80 @@ image::images/lens_drag_drop_3.gif[Using drag and drop to reorder]
 . To confirm the action, press Space bar. To cancel, press Esc.
 
 [float]
-[[configure-the-visualization-components]]
-==== Configure the visualization components
+[[lens-formulas]]
+==== Use formulas to perform math
 
-Each visualiztion type comes with a set of components that you can configure, such as data labels, legend, axes, and more.
+Formulas allow you to perform math on aggregated data. The most common formulas divide two values to produce a percent.
 
-For example, to add data labels to bar and horizontal bar charts, use the *Values* menu.
+. In the layer pane, click a field.
 
-[role="screenshot"]
-image::images/lens_value_labels_xychart_toggle.png[Lens Bar chart value labels menu]
+. Click *Formula*, then enter the formula. 
++
+Filter ratio example:: To filter a document set, use `kql=''`, then compare to other documents within the same grouping:
++
+```
+count(kql='response.status_code > 400') / count()
+```
++
+Week over week example:: To get the value for each grouping from the previous week, use `shift='1w'`.
++
+```
+percentile(system.network.in.bytes, percentile=99) /
+percentile(system.network.in.bytes, percentile=99, shift='1w')
+```
+You are unable to combine different time shifts, such as `count(shift="1w") - count()` and `count(shift="1w") - count(shift="1m")`, with the *Top values* function.
++
+Percent of total example:: To convert each grouping into a percent of the total, formulas calculate `overall_sum` for all groupings:
++
+```
+sum(products.base_price) / overall_sum(sum(products.base_price))
+```
+TIP: For detailed information on formulas, click image:dashboard/images/formula_reference.png[Formula reference icon].
 
-To add data labels to pie charts, donut charts, or treemaps, use the *Labels* menu.
+. To accurately display the formula, select *Percent* from the *Value format* dropdown.
 
-[role="screenshot"]
-image::images/lens_value_labels_partition_toggle.png[Lens Pie chart value labels menu]
+[float]
+[[compare-data-with-time-offsets]]
+==== Compare differences over time
+
+Compare your real-time data set to the results that are offset by a time increment. For example, you can compare the real-time percentage of a user CPU time spent to the results offset by one hour. 
+
+. In the layer pane, click the field you want to offset.
+
+. From the *Add advanced options* dropdown, select *Time shift*.
+
+. Select the time offset increment. 
+
+For a time shift example, refer to <<compare-time-ranges>>.
 
 [float]
 [[filter-the-data]]
-==== Filter the data
+==== Apply filters with the legend
 
-Apply filters to visualizations directly from the values in the legend. Only *Bar*, *Line and area*, and *Proportion* visualizations support legend filters.
+Apply filters to visualizations directly from the values in the legend. *Bar*, *Line and area*, and *Proportion* visualizations support legend filters.
 
-. In the legend, click the field.
-
-. Choose one of the following options:
+In the legend, click the field, then choose one of the following options:
 
 * *Filter for value* &mdash; Applies a filter that displays only the field data in the visualization.
 
 * *Filter out value* &mdash; Applies a filter that removes the field data from the visualization.
 
+[float]
+[[configure-the-visualization-components]]
+==== Configure the visualization components
+
+Each visualiztion type comes with a set of components that you access from the editor toolbar.
+
+The following component menus are available:
+
+* *Visual options* &mdash; Specifies how to display area, line, and bar chart options. For example, you can specify how to display the labels in bar charts.
+
+* *Labels* &mdash; Specifies how to display the labels for donut charts, pie charts, and treemaps. 
+
+* *Legend* &mdash; Specifies how to display the legend. For example, you can display the legend inside the visualization and truncate the legend values.
+
+* *Left axis*, *Bottom axis*, and *Right axis* &mdash; Specify how you want to display the chart axes. For example, add axis labels and change the orientation and bounds.
+
 [float]
 [[lens-faq]]
 ==== Frequently asked questions
@@ -287,7 +295,7 @@ Use formulas to compare multiple {es} aggregations that can be filtered or shift
 
 [discrete]
 [[is-it-possible-to-have-more-than-one-Y-axis-scale]]
-.*Can I add more than one y-axis scale to a visualization?*
+.*Can I add more than one y-axis scale?*
 [%collapsible]
 ====
 For each y-axis, you can select *Left* and *Right*, and configure a different scale.
@@ -327,12 +335,12 @@ refer to <<explore-fields-in-your-data,Explore the fields in your data>>.
 .*Why is my field missing from the fields list?*
 [%collapsible]
 ====
-Fields do not appear in the *Available fields* in the following scenarios:
+The following field types do not appear in the *Available fields* list:
 
-* The field is a full-text field.
-* The field is a `geo_point` field
-* The field is a `flattened` field.
-* The field is a `object` field.
+* Full-text
+* geo_point
+* flattened
+* object
 
 Verify if the field appears in the *Empty fields* list. *Lens* uses heuristics to determine if the fields contain values. For sparse data sets, the heuristics are less precise.
 ====
diff --git a/docs/user/production-considerations/alerting-production-considerations.asciidoc b/docs/user/production-considerations/alerting-production-considerations.asciidoc
index 57cc2a72a8895..cd8a60a1d5fe3 100644
--- a/docs/user/production-considerations/alerting-production-considerations.asciidoc
+++ b/docs/user/production-considerations/alerting-production-considerations.asciidoc
@@ -54,6 +54,8 @@ Predicting the buffer required to account for actions depends heavily on the rul
 [[event-log-ilm]]
 === Event log index lifecycle managment
 
+experimental[]
+
 Alerts and actions log activity in a set of "event log" indices.  These indices are configured with an index lifecycle management (ILM) policy, which you can customize.  The default policy rolls over the index when it reaches 50GB, or after 30 days.  Indices over 90 days old are deleted.
 
 The name of the index policy is `kibana-event-log-policy`.  {kib} creates the index policy on startup, if it doesn't already exist.  The index policy can be customized for your environment, but {kib} never modifies the index policy after creating it.
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_plugins.ts b/packages/kbn-test/src/kbn_client/kbn_client_plugins.ts
index c730091c1478b..25c3d7e156e91 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_plugins.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_plugins.ts
@@ -8,26 +8,14 @@
 
 import { KbnClientStatus } from './kbn_client_status';
 
-const PLUGIN_STATUS_ID = /^plugin:(.+?)@/;
-
 export class KbnClientPlugins {
   constructor(private readonly status: KbnClientStatus) {}
   /**
    * Get a list of plugin ids that are enabled on the server
    */
   public async getEnabledIds() {
-    const pluginIds: string[] = [];
     const apiResp = await this.status.get();
 
-    for (const status of apiResp.status.statuses) {
-      if (status.id) {
-        const match = status.id.match(PLUGIN_STATUS_ID);
-        if (match) {
-          pluginIds.push(match[1]);
-        }
-      }
-    }
-
-    return pluginIds;
+    return Object.keys(apiResp.status.plugins);
   }
 }
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_status.ts b/packages/kbn-test/src/kbn_client/kbn_client_status.ts
index 26c46917ae8dd..ed08b6b8cea15 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_status.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_status.ts
@@ -9,13 +9,11 @@
 import { KbnClientRequester } from './kbn_client_requester';
 
 interface Status {
-  state: 'green' | 'red' | 'yellow';
-  title?: string;
-  id?: string;
-  icon: string;
-  message: string;
-  uiColor: string;
-  since: string;
+  level: 'available' | 'degraded' | 'unavailable' | 'critical';
+  summary: string;
+  detail?: string;
+  documentationUrl?: string;
+  meta?: Record<string, unknown>;
 }
 
 interface ApiResponseStatus {
@@ -29,7 +27,8 @@ interface ApiResponseStatus {
   };
   status: {
     overall: Status;
-    statuses: Status[];
+    core: Record<string, Status>;
+    plugins: Record<string, Status>;
   };
   metrics: unknown;
 }
@@ -55,6 +54,6 @@ export class KbnClientStatus {
    */
   public async getOverallState() {
     const status = await this.get();
-    return status.status.overall.state;
+    return status.status.overall.level;
   }
 }
diff --git a/scripts/functional_tests.js b/scripts/functional_tests.js
index aa6e1831f5e71..c541b9faaeccc 100644
--- a/scripts/functional_tests.js
+++ b/scripts/functional_tests.js
@@ -20,6 +20,7 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/api_integration/config.js'),
   require.resolve('../test/interpreter_functional/config.ts'),
   require.resolve('../test/examples/config.js'),
+  require.resolve('../test/functional_execution_context/config.ts'),
 ];
 
 require('../src/setup_node_env');
diff --git a/src/core/public/core_app/status/lib/load_status.ts b/src/core/public/core_app/status/lib/load_status.ts
index a5cc18ffd6c16..e65764771f0fc 100644
--- a/src/core/public/core_app/status/lib/load_status.ts
+++ b/src/core/public/core_app/status/lib/load_status.ts
@@ -145,7 +145,7 @@ export async function loadStatus({
   let response: StatusResponse;
 
   try {
-    response = await http.get('/api/status', { query: { v8format: true } });
+    response = await http.get('/api/status');
   } catch (e) {
     // API returns a 503 response if not all services are available.
     // In this case, we want to treat this as a successful API call, so that we can
diff --git a/src/core/server/core_usage_data/core_usage_data_service.mock.ts b/src/core/server/core_usage_data/core_usage_data_service.mock.ts
index 941ac5afacb40..331a3bbb9c028 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.mock.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.mock.ts
@@ -10,12 +10,14 @@ import { PublicMethodsOf } from '@kbn/utility-types';
 import { BehaviorSubject } from 'rxjs';
 import { CoreUsageDataService } from './core_usage_data_service';
 import { coreUsageStatsClientMock } from './core_usage_stats_client.mock';
-import { CoreUsageData, CoreUsageDataSetup, CoreUsageDataStart } from './types';
+import { CoreUsageData, InternalCoreUsageDataSetup, CoreUsageDataStart } from './types';
 
 const createSetupContractMock = (usageStatsClient = coreUsageStatsClientMock.create()) => {
-  const setupContract: jest.Mocked<CoreUsageDataSetup> = {
+  const setupContract: jest.Mocked<InternalCoreUsageDataSetup> = {
     registerType: jest.fn(),
     getClient: jest.fn().mockReturnValue(usageStatsClient),
+    registerUsageCounter: jest.fn(),
+    incrementUsageCounter: jest.fn(),
   };
   return setupContract;
 };
diff --git a/src/core/server/core_usage_data/core_usage_data_service.test.ts b/src/core/server/core_usage_data/core_usage_data_service.test.ts
index 478cfe5daff46..3c05069d3cd07 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.test.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.test.ts
@@ -150,6 +150,50 @@ describe('CoreUsageDataService', () => {
         expect(usageStatsClient).toBeInstanceOf(CoreUsageStatsClient);
       });
     });
+
+    describe('Usage Counter', () => {
+      it('registers a usage counter and uses it to increment the counters', async () => {
+        const http = httpServiceMock.createInternalSetupContract();
+        const metrics = metricsServiceMock.createInternalSetupContract();
+        const savedObjectsStartPromise = Promise.resolve(
+          savedObjectsServiceMock.createStartContract()
+        );
+        const changedDeprecatedConfigPath$ = configServiceMock.create().getDeprecatedConfigPath$();
+        const coreUsageData = service.setup({
+          http,
+          metrics,
+          savedObjectsStartPromise,
+          changedDeprecatedConfigPath$,
+        });
+        const myUsageCounter = { incrementCounter: jest.fn() };
+        coreUsageData.registerUsageCounter(myUsageCounter);
+        coreUsageData.incrementUsageCounter({ counterName: 'test' });
+        expect(myUsageCounter.incrementCounter).toHaveBeenCalledWith({ counterName: 'test' });
+      });
+
+      it('swallows errors when provided increment counter fails', async () => {
+        const http = httpServiceMock.createInternalSetupContract();
+        const metrics = metricsServiceMock.createInternalSetupContract();
+        const savedObjectsStartPromise = Promise.resolve(
+          savedObjectsServiceMock.createStartContract()
+        );
+        const changedDeprecatedConfigPath$ = configServiceMock.create().getDeprecatedConfigPath$();
+        const coreUsageData = service.setup({
+          http,
+          metrics,
+          savedObjectsStartPromise,
+          changedDeprecatedConfigPath$,
+        });
+        const myUsageCounter = {
+          incrementCounter: jest.fn(() => {
+            throw new Error('Something is really wrong');
+          }),
+        };
+        coreUsageData.registerUsageCounter(myUsageCounter);
+        expect(() => coreUsageData.incrementUsageCounter({ counterName: 'test' })).not.toThrow();
+        expect(myUsageCounter.incrementCounter).toHaveBeenCalledWith({ counterName: 'test' });
+      });
+    });
   });
 
   describe('start', () => {
diff --git a/src/core/server/core_usage_data/core_usage_data_service.ts b/src/core/server/core_usage_data/core_usage_data_service.ts
index 73f63d4d634df..ce9013d9437d6 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.ts
@@ -27,7 +27,7 @@ import type {
   CoreServicesUsageData,
   CoreUsageData,
   CoreUsageDataStart,
-  CoreUsageDataSetup,
+  InternalCoreUsageDataSetup,
   ConfigUsageData,
   CoreConfigUsageData,
 } from './types';
@@ -39,6 +39,7 @@ import { LEGACY_URL_ALIAS_TYPE } from '../saved_objects/object_types';
 import { CORE_USAGE_STATS_TYPE } from './constants';
 import { CoreUsageStatsClient } from './core_usage_stats_client';
 import { MetricsServiceSetup, OpsMetrics } from '..';
+import { CoreIncrementUsageCounter } from './types';
 
 export type ExposedConfigsToUsage = Map<string, Record<string, boolean>>;
 
@@ -86,7 +87,8 @@ const isCustomIndex = (index: string) => {
   return index !== '.kibana';
 };
 
-export class CoreUsageDataService implements CoreService<CoreUsageDataSetup, CoreUsageDataStart> {
+export class CoreUsageDataService
+  implements CoreService<InternalCoreUsageDataSetup, CoreUsageDataStart> {
   private logger: Logger;
   private elasticsearchConfig?: ElasticsearchConfigType;
   private configService: CoreContext['configService'];
@@ -98,6 +100,7 @@ export class CoreUsageDataService implements CoreService<CoreUsageDataSetup, Cor
   private kibanaConfig?: KibanaConfigType;
   private coreUsageStatsClient?: CoreUsageStatsClient;
   private deprecatedConfigPaths: ChangedDeprecatedPaths = { set: [], unset: [] };
+  private incrementUsageCounter: CoreIncrementUsageCounter = () => {}; // Initially set to noop
 
   constructor(core: CoreContext) {
     this.logger = core.logger.get('core-usage-stats-service');
@@ -495,7 +498,24 @@ export class CoreUsageDataService implements CoreService<CoreUsageDataSetup, Cor
 
     this.coreUsageStatsClient = getClient();
 
-    return { registerType, getClient } as CoreUsageDataSetup;
+    const contract: InternalCoreUsageDataSetup = {
+      registerType,
+      getClient,
+      registerUsageCounter: (usageCounter) => {
+        this.incrementUsageCounter = (params) => usageCounter.incrementCounter(params);
+      },
+      incrementUsageCounter: (params) => {
+        try {
+          this.incrementUsageCounter(params);
+        } catch (e) {
+          // Self-defense mechanism since the handler is externally registered
+          this.logger.debug('Failed to increase the usage counter');
+          this.logger.debug(e);
+        }
+      },
+    };
+
+    return contract;
   }
 
   start({ savedObjects, elasticsearch, exposedConfigsToUsage }: StartDeps) {
diff --git a/src/core/server/core_usage_data/index.ts b/src/core/server/core_usage_data/index.ts
index a5c62c75f62d5..4687446bdb3a3 100644
--- a/src/core/server/core_usage_data/index.ts
+++ b/src/core/server/core_usage_data/index.ts
@@ -7,7 +7,15 @@
  */
 
 export { CORE_USAGE_STATS_TYPE, CORE_USAGE_STATS_ID } from './constants';
-export type { CoreUsageDataSetup, ConfigUsageData, CoreUsageDataStart } from './types';
+export type {
+  InternalCoreUsageDataSetup,
+  ConfigUsageData,
+  CoreUsageDataStart,
+  CoreUsageDataSetup,
+  CoreUsageCounter,
+  CoreIncrementUsageCounter,
+  CoreIncrementCounterParams,
+} from './types';
 export { CoreUsageDataService } from './core_usage_data_service';
 export { CoreUsageStatsClient, REPOSITORY_RESOLVE_OUTCOME_STATS } from './core_usage_stats_client';
 
diff --git a/src/core/server/core_usage_data/types.ts b/src/core/server/core_usage_data/types.ts
index 563a2a337cc8d..68e0b56c56db4 100644
--- a/src/core/server/core_usage_data/types.ts
+++ b/src/core/server/core_usage_data/types.ts
@@ -280,12 +280,59 @@ export interface CoreConfigUsageData {
   };
 }
 
+/**
+ * @internal Details about the counter to be incremented
+ */
+export interface CoreIncrementCounterParams {
+  /** The name of the counter **/
+  counterName: string;
+  /** The counter type ("count" by default) **/
+  counterType?: string;
+  /** Increment the counter by this number (1 if not specified) **/
+  incrementBy?: number;
+}
+
+/**
+ * @internal
+ * Method to call whenever an event occurs, so the counter can be increased.
+ */
+export type CoreIncrementUsageCounter = (params: CoreIncrementCounterParams) => void;
+
+/**
+ * @internal
+ * API to track whenever an event occurs, so the core can report them.
+ */
+export interface CoreUsageCounter {
+  /** @internal {@link CoreIncrementUsageCounter} **/
+  incrementCounter: CoreIncrementUsageCounter;
+}
+
 /** @internal */
-export interface CoreUsageDataSetup {
+export interface InternalCoreUsageDataSetup extends CoreUsageDataSetup {
   registerType(
     typeRegistry: ISavedObjectTypeRegistry & Pick<SavedObjectTypeRegistry, 'registerType'>
   ): void;
   getClient(): CoreUsageStatsClient;
+
+  /** @internal {@link CoreIncrementUsageCounter} **/
+  incrementUsageCounter: CoreIncrementUsageCounter;
+}
+
+/**
+ * Internal API for registering the Usage Tracker used for Core's usage data payload.
+ *
+ * @note This API should never be used to drive application logic and is only
+ * intended for telemetry purposes.
+ *
+ * @internal
+ */
+export interface CoreUsageDataSetup {
+  /**
+   * @internal
+   * API for a usage tracker plugin to inject the {@link CoreUsageCounter} to use
+   * when tracking events.
+   */
+  registerUsageCounter: (usageCounter: CoreUsageCounter) => void;
 }
 
 /**
diff --git a/src/core/server/elasticsearch/integration_tests/client.test.ts b/src/core/server/elasticsearch/integration_tests/client.test.ts
index 6e40c638614bd..83b20761df1ae 100644
--- a/src/core/server/elasticsearch/integration_tests/client.test.ts
+++ b/src/core/server/elasticsearch/integration_tests/client.test.ts
@@ -96,8 +96,8 @@ describe('fake elasticsearch', () => {
 
   test('should return unknown product when it cannot perform the Product check (503 response)', async () => {
     const resp = await supertest(kibanaHttpServer).get('/api/status').expect(503);
-    expect(resp.body.status.overall.state).toBe('red');
-    expect(resp.body.status.statuses[0].message).toBe(
+    expect(resp.body.status.overall.level).toBe('critical');
+    expect(resp.body.status.core.elasticsearch.summary).toBe(
       'Unable to retrieve version information from Elasticsearch nodes. The client noticed that the server is not Elasticsearch and we do not support this unknown product.'
     );
   });
diff --git a/src/core/server/execution_context/execution_context_service.test.ts b/src/core/server/execution_context/execution_context_service.test.ts
index 3fa4de34ebda0..9bb76ad78c49a 100644
--- a/src/core/server/execution_context/execution_context_service.test.ts
+++ b/src/core/server/execution_context/execution_context_service.test.ts
@@ -109,7 +109,7 @@ describe('ExecutionContextService', () => {
         expect(loggingSystemMock.collect(core.logger).debug).toMatchInlineSnapshot(`
           Array [
             Array [
-              "set the execution context: {\\"type\\":\\"type-a\\",\\"name\\":\\"name-a\\",\\"id\\":\\"id-a\\",\\"description\\":\\"description-a\\"}",
+              "{\\"type\\":\\"type-a\\",\\"name\\":\\"name-a\\",\\"id\\":\\"id-a\\",\\"description\\":\\"description-a\\"}",
             ],
           ]
         `);
@@ -351,7 +351,7 @@ describe('ExecutionContextService', () => {
         expect(loggingSystemMock.collect(core.logger).debug).toMatchInlineSnapshot(`
                   Array [
                     Array [
-                      "stored the execution context: {\\"type\\":\\"type-a\\",\\"name\\":\\"name-a\\",\\"id\\":\\"id-a\\",\\"description\\":\\"description-a\\"}",
+                      "{\\"type\\":\\"type-a\\",\\"name\\":\\"name-a\\",\\"id\\":\\"id-a\\",\\"description\\":\\"description-a\\"}",
                     ],
                   ]
               `);
diff --git a/src/core/server/execution_context/execution_context_service.ts b/src/core/server/execution_context/execution_context_service.ts
index 41b225cf1d0f3..d8ff5fca7847d 100644
--- a/src/core/server/execution_context/execution_context_service.ts
+++ b/src/core/server/execution_context/execution_context_service.ts
@@ -124,7 +124,7 @@ export class ExecutionContextService
     // we have to use enterWith since Hapi lifecycle model is built on event emitters.
     // therefore if we wrapped request handler in asyncLocalStorage.run(), we would lose context in other lifecycles.
     this.contextStore.enterWith(contextContainer);
-    this.log.debug(`set the execution context: ${JSON.stringify(contextContainer)}`);
+    this.log.debug(JSON.stringify(contextContainer));
   }
 
   private withContext<R>(
@@ -136,7 +136,7 @@ export class ExecutionContextService
     }
     const parent = this.contextStore.getStore();
     const contextContainer = new ExecutionContextContainer(context, parent);
-    this.log.debug(`stored the execution context: ${JSON.stringify(contextContainer)}`);
+    this.log.debug(JSON.stringify(contextContainer));
 
     return this.contextStore.run(contextContainer, fn);
   }
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 1c3a0850d3b79..3a55d70109b8c 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -55,7 +55,7 @@ import { CapabilitiesSetup, CapabilitiesStart } from './capabilities';
 import { MetricsServiceSetup, MetricsServiceStart } from './metrics';
 import { StatusServiceSetup } from './status';
 import { AppenderConfigType, appendersSchema, LoggingServiceSetup } from './logging';
-import { CoreUsageDataStart } from './core_usage_data';
+import { CoreUsageDataStart, CoreUsageDataSetup } from './core_usage_data';
 import { I18nServiceSetup } from './i18n';
 import { DeprecationsServiceSetup, DeprecationsClient } from './deprecations';
 // Because of #79265 we need to explicitly import, then export these types for
@@ -410,7 +410,13 @@ export type {
 export { ServiceStatusLevels } from './status';
 export type { CoreStatus, ServiceStatus, ServiceStatusLevel, StatusServiceSetup } from './status';
 
-export type { CoreUsageDataStart } from './core_usage_data';
+export type {
+  CoreUsageDataSetup,
+  CoreUsageDataStart,
+  CoreUsageCounter,
+  CoreIncrementUsageCounter,
+  CoreIncrementCounterParams,
+} from './core_usage_data';
 
 /**
  * Plugin specific context passed to a route handler.
@@ -500,6 +506,8 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
   deprecations: DeprecationsServiceSetup;
   /** {@link StartServicesAccessor} */
   getStartServices: StartServicesAccessor<TPluginsStart, TStart>;
+  /** @internal {@link CoreUsageDataSetup} */
+  coreUsageData: CoreUsageDataSetup;
 }
 
 /**
diff --git a/src/core/server/internal_types.ts b/src/core/server/internal_types.ts
index 8fc76e8b95743..29187c3963add 100644
--- a/src/core/server/internal_types.ts
+++ b/src/core/server/internal_types.ts
@@ -36,7 +36,7 @@ import { InternalRenderingServiceSetup } from './rendering';
 import { InternalHttpResourcesPreboot, InternalHttpResourcesSetup } from './http_resources';
 import { InternalStatusServiceSetup } from './status';
 import { InternalLoggingServicePreboot, InternalLoggingServiceSetup } from './logging';
-import { CoreUsageDataStart } from './core_usage_data';
+import { CoreUsageDataStart, InternalCoreUsageDataSetup } from './core_usage_data';
 import { I18nServiceSetup } from './i18n';
 import { InternalDeprecationsServiceSetup, InternalDeprecationsServiceStart } from './deprecations';
 import type {
@@ -73,6 +73,7 @@ export interface InternalCoreSetup {
   logging: InternalLoggingServiceSetup;
   metrics: InternalMetricsServiceSetup;
   deprecations: InternalDeprecationsServiceSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 /**
diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
index b53658b574939..f8b56e81ab188 100644
--- a/src/core/server/mocks.ts
+++ b/src/core/server/mocks.ts
@@ -169,6 +169,9 @@ function createCoreSetupMock({
     metrics: metricsServiceMock.createSetupContract(),
     deprecations: deprecationsServiceMock.createSetupContract(),
     executionContext: executionContextServiceMock.createInternalSetupContract(),
+    coreUsageData: {
+      registerUsageCounter: coreUsageDataServiceMock.createSetupContract().registerUsageCounter,
+    },
     getStartServices: jest
       .fn<Promise<[ReturnType<typeof createCoreStartMock>, object, any]>, []>()
       .mockResolvedValue([createCoreStartMock(), pluginStartDeps, pluginStartContract]),
@@ -222,6 +225,7 @@ function createInternalCoreSetupMock() {
     metrics: metricsServiceMock.createInternalSetupContract(),
     deprecations: deprecationsServiceMock.createInternalSetupContract(),
     executionContext: executionContextServiceMock.createInternalSetupContract(),
+    coreUsageData: coreUsageDataServiceMock.createSetupContract(),
   };
   return setupDeps;
 }
diff --git a/src/core/server/plugins/plugin_context.ts b/src/core/server/plugins/plugin_context.ts
index cbefdae525180..bdb4efde9b1fb 100644
--- a/src/core/server/plugins/plugin_context.ts
+++ b/src/core/server/plugins/plugin_context.ts
@@ -211,6 +211,9 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
     },
     getStartServices: () => plugin.startDependencies,
     deprecations: deps.deprecations.getRegistry(plugin.name),
+    coreUsageData: {
+      registerUsageCounter: deps.coreUsageData.registerUsageCounter,
+    },
   };
 }
 
diff --git a/src/core/server/saved_objects/routes/bulk_create.ts b/src/core/server/saved_objects/routes/bulk_create.ts
index 344a0d151cfb9..f8438a70d0418 100644
--- a/src/core/server/saved_objects/routes/bulk_create.ts
+++ b/src/core/server/saved_objects/routes/bulk_create.ts
@@ -8,11 +8,11 @@
 
 import { schema } from '@kbn/config-schema';
 import { IRouter } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import { catchAndReturnBoomErrors } from './utils';
 
 interface RouteDependencies {
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 export const registerBulkCreateRoute = (router: IRouter, { coreUsageData }: RouteDependencies) => {
diff --git a/src/core/server/saved_objects/routes/bulk_get.ts b/src/core/server/saved_objects/routes/bulk_get.ts
index cf051d6cd25cc..cffa69b06f4e4 100644
--- a/src/core/server/saved_objects/routes/bulk_get.ts
+++ b/src/core/server/saved_objects/routes/bulk_get.ts
@@ -8,11 +8,11 @@
 
 import { schema } from '@kbn/config-schema';
 import { IRouter } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import { catchAndReturnBoomErrors } from './utils';
 
 interface RouteDependencies {
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 export const registerBulkGetRoute = (router: IRouter, { coreUsageData }: RouteDependencies) => {
diff --git a/src/core/server/saved_objects/routes/bulk_update.ts b/src/core/server/saved_objects/routes/bulk_update.ts
index de47ab9c59611..277673971dabe 100644
--- a/src/core/server/saved_objects/routes/bulk_update.ts
+++ b/src/core/server/saved_objects/routes/bulk_update.ts
@@ -8,11 +8,11 @@
 
 import { schema } from '@kbn/config-schema';
 import { IRouter } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import { catchAndReturnBoomErrors } from './utils';
 
 interface RouteDependencies {
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 export const registerBulkUpdateRoute = (router: IRouter, { coreUsageData }: RouteDependencies) => {
diff --git a/src/core/server/saved_objects/routes/create.ts b/src/core/server/saved_objects/routes/create.ts
index 2fa7acfb6cab6..0e321aa7031f2 100644
--- a/src/core/server/saved_objects/routes/create.ts
+++ b/src/core/server/saved_objects/routes/create.ts
@@ -8,11 +8,11 @@
 
 import { schema } from '@kbn/config-schema';
 import { IRouter } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import { catchAndReturnBoomErrors } from './utils';
 
 interface RouteDependencies {
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 export const registerCreateRoute = (router: IRouter, { coreUsageData }: RouteDependencies) => {
diff --git a/src/core/server/saved_objects/routes/delete.ts b/src/core/server/saved_objects/routes/delete.ts
index fe08acf23fd23..e8404ba7fc8cf 100644
--- a/src/core/server/saved_objects/routes/delete.ts
+++ b/src/core/server/saved_objects/routes/delete.ts
@@ -8,11 +8,11 @@
 
 import { schema } from '@kbn/config-schema';
 import { IRouter } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import { catchAndReturnBoomErrors } from './utils';
 
 interface RouteDependencies {
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 export const registerDeleteRoute = (router: IRouter, { coreUsageData }: RouteDependencies) => {
diff --git a/src/core/server/saved_objects/routes/export.ts b/src/core/server/saved_objects/routes/export.ts
index e0293a4522fc1..e224f30a1bb02 100644
--- a/src/core/server/saved_objects/routes/export.ts
+++ b/src/core/server/saved_objects/routes/export.ts
@@ -11,7 +11,7 @@ import stringify from 'json-stable-stringify';
 import { createPromiseFromStreams, createMapStream, createConcatStream } from '@kbn/utils';
 
 import { IRouter, KibanaRequest } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import { SavedObjectConfig } from '../saved_objects_config';
 import {
   SavedObjectsExportByTypeOptions,
@@ -22,7 +22,7 @@ import { validateTypes, validateObjects, catchAndReturnBoomErrors } from './util
 
 interface RouteDependencies {
   config: SavedObjectConfig;
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 type EitherExportOptions = SavedObjectsExportByTypeOptions | SavedObjectsExportByObjectOptions;
diff --git a/src/core/server/saved_objects/routes/find.ts b/src/core/server/saved_objects/routes/find.ts
index d21039db30e5f..6e009f80bda7d 100644
--- a/src/core/server/saved_objects/routes/find.ts
+++ b/src/core/server/saved_objects/routes/find.ts
@@ -8,11 +8,11 @@
 
 import { schema } from '@kbn/config-schema';
 import { IRouter } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import { catchAndReturnBoomErrors } from './utils';
 
 interface RouteDependencies {
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 export const registerFindRoute = (router: IRouter, { coreUsageData }: RouteDependencies) => {
diff --git a/src/core/server/saved_objects/routes/get.ts b/src/core/server/saved_objects/routes/get.ts
index f28822d95d814..ae0656599a1e2 100644
--- a/src/core/server/saved_objects/routes/get.ts
+++ b/src/core/server/saved_objects/routes/get.ts
@@ -8,11 +8,11 @@
 
 import { schema } from '@kbn/config-schema';
 import { IRouter } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import { catchAndReturnBoomErrors } from './utils';
 
 interface RouteDependencies {
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 export const registerGetRoute = (router: IRouter, { coreUsageData }: RouteDependencies) => {
diff --git a/src/core/server/saved_objects/routes/import.ts b/src/core/server/saved_objects/routes/import.ts
index 6f75bcf9fd5bf..d373dd5e63bc6 100644
--- a/src/core/server/saved_objects/routes/import.ts
+++ b/src/core/server/saved_objects/routes/import.ts
@@ -10,14 +10,14 @@ import { Readable } from 'stream';
 import { extname } from 'path';
 import { schema } from '@kbn/config-schema';
 import { IRouter } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import { SavedObjectConfig } from '../saved_objects_config';
 import { SavedObjectsImportError } from '../import';
 import { catchAndReturnBoomErrors, createSavedObjectsStreamFromNdJson } from './utils';
 
 interface RouteDependencies {
   config: SavedObjectConfig;
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 interface FileStream extends Readable {
diff --git a/src/core/server/saved_objects/routes/index.ts b/src/core/server/saved_objects/routes/index.ts
index 930e02de7657a..889edfb66a20f 100644
--- a/src/core/server/saved_objects/routes/index.ts
+++ b/src/core/server/saved_objects/routes/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { InternalHttpServiceSetup } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import { Logger } from '../../logging';
 import { SavedObjectConfig } from '../saved_objects_config';
 import { IKibanaMigrator } from '../migrations';
@@ -34,7 +34,7 @@ export function registerRoutes({
   migratorPromise,
 }: {
   http: InternalHttpServiceSetup;
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
   logger: Logger;
   config: SavedObjectConfig;
   migratorPromise: Promise<IKibanaMigrator>;
diff --git a/src/core/server/saved_objects/routes/resolve.ts b/src/core/server/saved_objects/routes/resolve.ts
index ba409f7db7b67..78e85d17fe1fa 100644
--- a/src/core/server/saved_objects/routes/resolve.ts
+++ b/src/core/server/saved_objects/routes/resolve.ts
@@ -8,10 +8,10 @@
 
 import { schema } from '@kbn/config-schema';
 import { IRouter } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 
 interface RouteDependencies {
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 export const registerResolveRoute = (router: IRouter, { coreUsageData }: RouteDependencies) => {
diff --git a/src/core/server/saved_objects/routes/resolve_import_errors.ts b/src/core/server/saved_objects/routes/resolve_import_errors.ts
index a05c7d30b91fd..f1fe2e9cfe431 100644
--- a/src/core/server/saved_objects/routes/resolve_import_errors.ts
+++ b/src/core/server/saved_objects/routes/resolve_import_errors.ts
@@ -11,13 +11,13 @@ import { Readable } from 'stream';
 import { schema } from '@kbn/config-schema';
 import { chain } from 'lodash';
 import { IRouter } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import { SavedObjectConfig } from '../saved_objects_config';
 import { SavedObjectsImportError } from '../import';
 import { catchAndReturnBoomErrors, createSavedObjectsStreamFromNdJson } from './utils';
 interface RouteDependencies {
   config: SavedObjectConfig;
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 interface FileStream extends Readable {
diff --git a/src/core/server/saved_objects/routes/update.ts b/src/core/server/saved_objects/routes/update.ts
index b6dd9dc8e9ace..f21fc183cdade 100644
--- a/src/core/server/saved_objects/routes/update.ts
+++ b/src/core/server/saved_objects/routes/update.ts
@@ -8,12 +8,12 @@
 
 import { schema } from '@kbn/config-schema';
 import { IRouter } from '../../http';
-import { CoreUsageDataSetup } from '../../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../../core_usage_data';
 import type { SavedObjectsUpdateOptions } from '../service/saved_objects_client';
 import { catchAndReturnBoomErrors } from './utils';
 
 interface RouteDependencies {
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 export const registerUpdateRoute = (router: IRouter, { coreUsageData }: RouteDependencies) => {
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
index b25e51da3a749..074eae55acaea 100644
--- a/src/core/server/saved_objects/saved_objects_service.ts
+++ b/src/core/server/saved_objects/saved_objects_service.ts
@@ -16,7 +16,7 @@ import {
 } from './';
 import { KibanaMigrator, IKibanaMigrator } from './migrations';
 import { CoreContext } from '../core_context';
-import { CoreUsageDataSetup } from '../core_usage_data';
+import { InternalCoreUsageDataSetup } from '../core_usage_data';
 import {
   ElasticsearchClient,
   InternalElasticsearchServiceSetup,
@@ -250,7 +250,7 @@ export interface SavedObjectsRepositoryFactory {
 export interface SavedObjectsSetupDeps {
   http: InternalHttpServiceSetup;
   elasticsearch: InternalElasticsearchServiceSetup;
-  coreUsageData: CoreUsageDataSetup;
+  coreUsageData: InternalCoreUsageDataSetup;
 }
 
 interface WrappedClientFactoryWrapper {
diff --git a/src/core/server/saved_objects/service/lib/repository.test.js b/src/core/server/saved_objects/service/lib/repository.test.js
index 427c28ceb326c..0d7365c4b97c1 100644
--- a/src/core/server/saved_objects/service/lib/repository.test.js
+++ b/src/core/server/saved_objects/service/lib/repository.test.js
@@ -197,7 +197,16 @@ describe('SavedObjectsRepository', () => {
     { type, id, references, namespace: objectNamespace, originId },
     namespace
   ) => {
-    const namespaceId = objectNamespace === 'default' ? undefined : objectNamespace ?? namespace;
+    let namespaces;
+    if (objectNamespace) {
+      namespaces = [objectNamespace];
+    } else if (namespace) {
+      namespaces = Array.isArray(namespace) ? namespace : [namespace];
+    } else {
+      namespaces = ['default'];
+    }
+    const namespaceId = namespaces[0] === 'default' ? undefined : namespaces[0];
+
     return {
       // NOTE: Elasticsearch returns more fields (_index, _type) but the SavedObjectsRepository method ignores these
       found: true,
@@ -207,7 +216,7 @@ describe('SavedObjectsRepository', () => {
       ...mockVersionProps,
       _source: {
         ...(registry.isSingleNamespace(type) && { namespace: namespaceId }),
-        ...(registry.isMultiNamespace(type) && { namespaces: [namespaceId ?? 'default'] }),
+        ...(registry.isMultiNamespace(type) && { namespaces }),
         ...(originId && { originId }),
         type,
         [type]: { title: 'Testing' },
@@ -219,7 +228,9 @@ describe('SavedObjectsRepository', () => {
   };
 
   const getMockMgetResponse = (objects, namespace) => ({
-    docs: objects.map((obj) => (obj.found === false ? obj : getMockGetResponse(obj, namespace))),
+    docs: objects.map((obj) =>
+      obj.found === false ? obj : getMockGetResponse(obj, obj.initialNamespaces ?? namespace)
+    ),
   });
 
   expect.extend({
@@ -555,6 +566,25 @@ describe('SavedObjectsRepository', () => {
         await test(namespace);
       });
 
+      it(`normalizes initialNamespaces from 'default' to undefined`, async () => {
+        const test = async (namespace) => {
+          const objects = [{ ...obj1, type: 'dashboard', initialNamespaces: ['default'] }];
+          await bulkCreateSuccess(objects, { namespace, overwrite: true });
+          const body = [
+            { index: expect.objectContaining({ _id: `dashboard:${obj1.id}` }) },
+            expect.not.objectContaining({ namespace: 'default' }),
+          ];
+          expect(client.bulk).toHaveBeenCalledWith(
+            expect.objectContaining({ body }),
+            expect.anything()
+          );
+          client.bulk.mockClear();
+          client.mget.mockClear();
+        };
+        await test(undefined);
+        await test(namespace);
+      });
+
       it(`doesn't add namespaces to request body for any types that are not multi-namespace`, async () => {
         const test = async (namespace) => {
           const objects = [obj1, { ...obj2, type: NAMESPACE_AGNOSTIC_TYPE }];
@@ -778,6 +808,54 @@ describe('SavedObjectsRepository', () => {
         });
       });
 
+      it(`returns error when there is an unresolvable conflict with an existing multi-namespace saved object when using initialNamespaces (get)`, async () => {
+        const obj = {
+          ...obj3,
+          type: MULTI_NAMESPACE_TYPE,
+          initialNamespaces: ['foo-namespace', 'default'],
+        };
+        const response1 = {
+          status: 200,
+          docs: [
+            {
+              found: true,
+              _source: {
+                type: obj.type,
+                namespaces: ['bar-namespace'],
+              },
+            },
+          ],
+        };
+        client.mget.mockResolvedValueOnce(
+          elasticsearchClientMock.createSuccessTransportRequestPromise(response1)
+        );
+        const response2 = getMockBulkCreateResponse([obj1, obj2]);
+        client.bulk.mockResolvedValueOnce(
+          elasticsearchClientMock.createSuccessTransportRequestPromise(response2)
+        );
+
+        const options = { overwrite: true };
+        const result = await savedObjectsRepository.bulkCreate([obj1, obj, obj2], options);
+
+        expect(client.bulk).toHaveBeenCalled();
+        expect(client.mget).toHaveBeenCalled();
+
+        const body1 = { docs: [expect.objectContaining({ _id: `${obj.type}:${obj.id}` })] };
+        expect(client.mget).toHaveBeenCalledWith(
+          expect.objectContaining({ body: body1 }),
+          expect.anything()
+        );
+        const body2 = [...expectObjArgs(obj1), ...expectObjArgs(obj2)];
+        expect(client.bulk).toHaveBeenCalledWith(
+          expect.objectContaining({ body: body2 }),
+          expect.anything()
+        );
+        const expectedError = expectErrorConflict(obj, { metadata: { isNotOverwritable: true } });
+        expect(result).toEqual({
+          saved_objects: [expectSuccess(obj1), expectedError, expectSuccess(obj2)],
+        });
+      });
+
       it(`returns bulk error`, async () => {
         const expectedErrorResult = { type: obj3.type, id: obj3.id, error: 'Oh no, a bulk error!' };
         await bulkCreateError(obj3, true, expectedErrorResult);
@@ -2072,6 +2150,24 @@ describe('SavedObjectsRepository', () => {
         );
       });
 
+      it(`normalizes initialNamespaces from 'default' to undefined`, async () => {
+        await savedObjectsRepository.create('dashboard', attributes, {
+          id,
+          namespace,
+          initialNamespaces: ['default'],
+        });
+
+        expect(client.create).toHaveBeenCalledTimes(1);
+        expect(client.create).toHaveBeenNthCalledWith(
+          1,
+          expect.objectContaining({
+            id: `dashboard:${id}`,
+            body: expect.not.objectContaining({ namespace: 'default' }),
+          }),
+          expect.anything()
+        );
+      });
+
       it(`doesn't prepend namespace to the id or add namespace or namespaces fields when using namespace-agnostic type`, async () => {
         await createSuccess(NAMESPACE_AGNOSTIC_TYPE, attributes, { id, namespace });
         expect(client.create).toHaveBeenCalledWith(
@@ -2160,6 +2256,22 @@ describe('SavedObjectsRepository', () => {
         expect(client.get).toHaveBeenCalled();
       });
 
+      it(`throws when there is an unresolvable conflict with an existing multi-namespace saved object when using initialNamespaces (get)`, async () => {
+        const response = getMockGetResponse({ type: MULTI_NAMESPACE_ISOLATED_TYPE, id }, namespace);
+        client.get.mockResolvedValueOnce(
+          elasticsearchClientMock.createSuccessTransportRequestPromise(response)
+        );
+        await expect(
+          savedObjectsRepository.create(MULTI_NAMESPACE_TYPE, attributes, {
+            id,
+            overwrite: true,
+            initialNamespaces: ['bar-ns', 'dolly-ns'],
+            namespace,
+          })
+        ).rejects.toThrowError(createConflictError(MULTI_NAMESPACE_TYPE, id));
+        expect(client.get).toHaveBeenCalled();
+      });
+
       it.todo(`throws when automatic index creation fails`);
 
       it.todo(`throws when an unexpected failure occurs`);
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index 7ce3a55d057eb..e49b2e413981f 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -301,13 +301,19 @@ export class SavedObjectsRepository {
     let savedObjectNamespaces: string[] | undefined;
 
     if (this._registry.isSingleNamespace(type)) {
-      savedObjectNamespace = initialNamespaces ? initialNamespaces[0] : namespace;
+      savedObjectNamespace = initialNamespaces
+        ? normalizeNamespace(initialNamespaces[0])
+        : namespace;
     } else if (this._registry.isMultiNamespace(type)) {
       if (id && overwrite) {
         // we will overwrite a multi-namespace saved object if it exists; if that happens, ensure we preserve its included namespaces
         // note: this check throws an error if the object is found but does not exist in this namespace
-        const existingNamespaces = await this.preflightGetNamespaces(type, id, namespace);
-        savedObjectNamespaces = initialNamespaces || existingNamespaces;
+        savedObjectNamespaces = await this.preflightGetNamespaces(
+          type,
+          id,
+          namespace,
+          initialNamespaces
+        );
       } else {
         savedObjectNamespaces = initialNamespaces || getSavedObjectNamespaces(namespace);
       }
@@ -453,8 +459,14 @@ export class SavedObjectsRepository {
         const indexFound = bulkGetResponse?.statusCode !== 404;
         const actualResult = indexFound ? bulkGetResponse?.body.docs[esRequestIndex] : undefined;
         const docFound = indexFound && actualResult?.found === true;
-        // @ts-expect-error MultiGetHit._source is optional
-        if (docFound && !this.rawDocExistsInNamespace(actualResult!, namespace)) {
+        if (
+          docFound &&
+          !this.rawDocExistsInNamespaces(
+            // @ts-expect-error MultiGetHit._source is optional
+            actualResult!,
+            initialNamespaces ?? [SavedObjectsUtils.namespaceIdToString(namespace)]
+          )
+        ) {
           const { id, type } = object;
           return {
             tag: 'Left' as 'Left',
@@ -476,7 +488,9 @@ export class SavedObjectsRepository {
         versionProperties = getExpectedVersionProperties(version, actualResult);
       } else {
         if (this._registry.isSingleNamespace(object.type)) {
-          savedObjectNamespace = initialNamespaces ? initialNamespaces[0] : namespace;
+          savedObjectNamespace = initialNamespaces
+            ? normalizeNamespace(initialNamespaces[0])
+            : namespace;
         } else if (this._registry.isMultiNamespace(object.type)) {
           savedObjectNamespaces = initialNamespaces || getSavedObjectNamespaces(namespace);
         }
@@ -2136,12 +2150,18 @@ export class SavedObjectsRepository {
    * @param type The type of the saved object.
    * @param id The ID of the saved object.
    * @param namespace The target namespace.
+   * @param initialNamespaces The target namespace(s) we intend to create the object in, if specified.
    * @returns Array of namespaces that this saved object currently includes, or (if the object does not exist yet) the namespaces that a
    * newly-created object will include. Value may be undefined if an existing saved object has no namespaces attribute; this should not
    * happen in normal operations, but it is possible if the Elasticsearch document is manually modified.
    * @throws Will throw an error if the saved object exists and it does not include the target namespace.
    */
-  private async preflightGetNamespaces(type: string, id: string, namespace?: string) {
+  private async preflightGetNamespaces(
+    type: string,
+    id: string,
+    namespace: string | undefined,
+    initialNamespaces?: string[]
+  ) {
     if (!this._registry.isMultiNamespace(type)) {
       throw new Error(`Cannot make preflight get request for non-multi-namespace type '${type}'.`);
     }
@@ -2156,17 +2176,19 @@ export class SavedObjectsRepository {
       }
     );
 
+    const namespaces = initialNamespaces ?? [SavedObjectsUtils.namespaceIdToString(namespace)];
+
     const indexFound = statusCode !== 404;
     if (indexFound && isFoundGetResponse(body)) {
-      if (!this.rawDocExistsInNamespace(body, namespace)) {
+      if (!this.rawDocExistsInNamespaces(body, namespaces)) {
         throw SavedObjectsErrorHelpers.createConflictError(type, id);
       }
-      return getSavedObjectNamespaces(namespace, body);
+      return initialNamespaces ?? getSavedObjectNamespaces(namespace, body);
     } else if (isNotFoundFromUnsupportedServer({ statusCode, headers })) {
       // checking if the 404 is from Elasticsearch
       throw SavedObjectsErrorHelpers.createGenericNotFoundEsUnavailableError(type, id);
     }
-    return getSavedObjectNamespaces(namespace);
+    return initialNamespaces ?? getSavedObjectNamespaces(namespace);
   }
 
   /**
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index aa421fe393059..5abd1171a1936 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -359,6 +359,16 @@ export interface CoreEnvironmentUsageData {
 // @internal (undocumented)
 export type CoreId = symbol;
 
+// @internal
+export interface CoreIncrementCounterParams {
+    counterName: string;
+    counterType?: string;
+    incrementBy?: number;
+}
+
+// @internal
+export type CoreIncrementUsageCounter = (params: CoreIncrementCounterParams) => void;
+
 // @public
 export interface CorePreboot {
     // (undocumented)
@@ -395,6 +405,8 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
     capabilities: CapabilitiesSetup;
     // (undocumented)
     context: ContextSetup;
+    // @internal (undocumented)
+    coreUsageData: CoreUsageDataSetup;
     // (undocumented)
     deprecations: DeprecationsServiceSetup;
     // (undocumented)
@@ -449,6 +461,12 @@ export interface CoreStatus {
     savedObjects: ServiceStatus;
 }
 
+// @internal
+export interface CoreUsageCounter {
+    // (undocumented)
+    incrementCounter: CoreIncrementUsageCounter;
+}
+
 // @internal
 export interface CoreUsageData extends CoreUsageStats {
     // (undocumented)
@@ -459,6 +477,11 @@ export interface CoreUsageData extends CoreUsageStats {
     services: CoreServicesUsageData;
 }
 
+// @internal
+export interface CoreUsageDataSetup {
+    registerUsageCounter: (usageCounter: CoreUsageCounter) => void;
+}
+
 // @internal
 export interface CoreUsageDataStart {
     // (undocumented)
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index 27c35031db46f..865cc71a7e26b 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -243,6 +243,7 @@ export class Server {
       environment: environmentSetup,
       http: httpSetup,
       metrics: metricsSetup,
+      coreUsageData: coreUsageDataSetup,
     });
 
     const renderingSetup = await this.rendering.setup({
@@ -278,6 +279,7 @@ export class Server {
       logging: loggingSetup,
       metrics: metricsSetup,
       deprecations: deprecationsSetup,
+      coreUsageData: coreUsageDataSetup,
     };
 
     const pluginsSetup = await this.plugins.setup(coreSetup);
diff --git a/src/core/server/status/routes/integration_tests/status.test.ts b/src/core/server/status/routes/integration_tests/status.test.ts
index 645ce0b241612..082be62f8dc09 100644
--- a/src/core/server/status/routes/integration_tests/status.test.ts
+++ b/src/core/server/status/routes/integration_tests/status.test.ts
@@ -29,6 +29,7 @@ describe('GET /api/status', () => {
   let server: HttpService;
   let httpSetup: InternalHttpServiceSetup;
   let metrics: jest.Mocked<MetricsServiceSetup>;
+  let incrementUsageCounter: jest.Mock;
 
   const setupServer = async ({ allowAnonymous = true }: { allowAnonymous?: boolean } = {}) => {
     const coreContext = createCoreContext({ coreId });
@@ -50,6 +51,8 @@ describe('GET /api/status', () => {
       d: { level: ServiceStatusLevels.critical, summary: 'd is critical' },
     });
 
+    incrementUsageCounter = jest.fn();
+
     const router = httpSetup.createRouter('');
     registerStatusRoute({
       router,
@@ -71,6 +74,7 @@ describe('GET /api/status', () => {
         core$: status.core$,
         plugins$: pluginsStatus$,
       },
+      incrementUsageCounter,
     });
 
     // Register dummy auth provider for testing auth
@@ -137,69 +141,75 @@ describe('GET /api/status', () => {
   });
 
   describe('legacy status format', () => {
-    it('returns legacy status format when no query params provided', async () => {
-      await setupServer();
-      const result = await supertest(httpSetup.server.listener).get('/api/status').expect(200);
-      expect(result.body.status).toEqual({
-        overall: {
+    const legacyFormat = {
+      overall: {
+        icon: 'success',
+        nickname: 'Looking good',
+        since: expect.any(String),
+        state: 'green',
+        title: 'Green',
+        uiColor: 'secondary',
+      },
+      statuses: [
+        {
+          icon: 'success',
+          id: 'core:elasticsearch@9.9.9',
+          message: 'Service is working',
+          since: expect.any(String),
+          state: 'green',
+          uiColor: 'secondary',
+        },
+        {
           icon: 'success',
-          nickname: 'Looking good',
+          id: 'core:savedObjects@9.9.9',
+          message: 'Service is working',
           since: expect.any(String),
           state: 'green',
-          title: 'Green',
           uiColor: 'secondary',
         },
-        statuses: [
-          {
-            icon: 'success',
-            id: 'core:elasticsearch@9.9.9',
-            message: 'Service is working',
-            since: expect.any(String),
-            state: 'green',
-            uiColor: 'secondary',
-          },
-          {
-            icon: 'success',
-            id: 'core:savedObjects@9.9.9',
-            message: 'Service is working',
-            since: expect.any(String),
-            state: 'green',
-            uiColor: 'secondary',
-          },
-          {
-            icon: 'success',
-            id: 'plugin:a@9.9.9',
-            message: 'a is available',
-            since: expect.any(String),
-            state: 'green',
-            uiColor: 'secondary',
-          },
-          {
-            icon: 'warning',
-            id: 'plugin:b@9.9.9',
-            message: 'b is degraded',
-            since: expect.any(String),
-            state: 'yellow',
-            uiColor: 'warning',
-          },
-          {
-            icon: 'danger',
-            id: 'plugin:c@9.9.9',
-            message: 'c is unavailable',
-            since: expect.any(String),
-            state: 'red',
-            uiColor: 'danger',
-          },
-          {
-            icon: 'danger',
-            id: 'plugin:d@9.9.9',
-            message: 'd is critical',
-            since: expect.any(String),
-            state: 'red',
-            uiColor: 'danger',
-          },
-        ],
-      });
+        {
+          icon: 'success',
+          id: 'plugin:a@9.9.9',
+          message: 'a is available',
+          since: expect.any(String),
+          state: 'green',
+          uiColor: 'secondary',
+        },
+        {
+          icon: 'warning',
+          id: 'plugin:b@9.9.9',
+          message: 'b is degraded',
+          since: expect.any(String),
+          state: 'yellow',
+          uiColor: 'warning',
+        },
+        {
+          icon: 'danger',
+          id: 'plugin:c@9.9.9',
+          message: 'c is unavailable',
+          since: expect.any(String),
+          state: 'red',
+          uiColor: 'danger',
+        },
+        {
+          icon: 'danger',
+          id: 'plugin:d@9.9.9',
+          message: 'd is critical',
+          since: expect.any(String),
+          state: 'red',
+          uiColor: 'danger',
+        },
+      ],
+    };
+
+    it('returns legacy status format when v7format=true is provided', async () => {
+      await setupServer();
+      const result = await supertest(httpSetup.server.listener)
+        .get('/api/status?v7format=true')
+        .expect(200);
+      expect(result.body.status).toEqual(legacyFormat);
+      expect(incrementUsageCounter).toHaveBeenCalledTimes(1);
+      expect(incrementUsageCounter).toHaveBeenCalledWith({ counterName: 'status_v7format' });
     });
 
     it('returns legacy status format when v8format=false is provided', async () => {
@@ -207,109 +217,105 @@ describe('GET /api/status', () => {
       const result = await supertest(httpSetup.server.listener)
         .get('/api/status?v8format=false')
         .expect(200);
-      expect(result.body.status).toEqual({
-        overall: {
-          icon: 'success',
-          nickname: 'Looking good',
-          since: expect.any(String),
-          state: 'green',
-          title: 'Green',
-          uiColor: 'secondary',
-        },
-        statuses: [
-          {
-            icon: 'success',
-            id: 'core:elasticsearch@9.9.9',
-            message: 'Service is working',
-            since: expect.any(String),
-            state: 'green',
-            uiColor: 'secondary',
-          },
-          {
-            icon: 'success',
-            id: 'core:savedObjects@9.9.9',
-            message: 'Service is working',
-            since: expect.any(String),
-            state: 'green',
-            uiColor: 'secondary',
-          },
-          {
-            icon: 'success',
-            id: 'plugin:a@9.9.9',
-            message: 'a is available',
-            since: expect.any(String),
-            state: 'green',
-            uiColor: 'secondary',
-          },
-          {
-            icon: 'warning',
-            id: 'plugin:b@9.9.9',
-            message: 'b is degraded',
-            since: expect.any(String),
-            state: 'yellow',
-            uiColor: 'warning',
-          },
-          {
-            icon: 'danger',
-            id: 'plugin:c@9.9.9',
-            message: 'c is unavailable',
-            since: expect.any(String),
-            state: 'red',
-            uiColor: 'danger',
-          },
-          {
-            icon: 'danger',
-            id: 'plugin:d@9.9.9',
-            message: 'd is critical',
-            since: expect.any(String),
-            state: 'red',
-            uiColor: 'danger',
-          },
-        ],
-      });
+      expect(result.body.status).toEqual(legacyFormat);
+      expect(incrementUsageCounter).toHaveBeenCalledTimes(1);
+      expect(incrementUsageCounter).toHaveBeenCalledWith({ counterName: 'status_v7format' });
     });
   });
 
   describe('v8format', () => {
-    it('returns new status format when v8format=true is provided', async () => {
-      await setupServer();
-      const result = await supertest(httpSetup.server.listener)
-        .get('/api/status?v8format=true')
-        .expect(200);
-      expect(result.body.status).toEqual({
-        core: {
-          elasticsearch: {
-            level: 'available',
-            summary: 'Service is working',
-          },
-          savedObjects: {
-            level: 'available',
-            summary: 'Service is working',
-          },
+    const newFormat = {
+      core: {
+        elasticsearch: {
+          level: 'available',
+          summary: 'Service is working',
         },
-        overall: {
+        savedObjects: {
           level: 'available',
           summary: 'Service is working',
         },
-        plugins: {
-          a: {
-            level: 'available',
-            summary: 'a is available',
-          },
-          b: {
-            level: 'degraded',
-            summary: 'b is degraded',
-          },
-          c: {
-            level: 'unavailable',
-            summary: 'c is unavailable',
-          },
-          d: {
-            level: 'critical',
-            summary: 'd is critical',
-          },
+      },
+      overall: {
+        level: 'available',
+        summary: 'Service is working',
+      },
+      plugins: {
+        a: {
+          level: 'available',
+          summary: 'a is available',
+        },
+        b: {
+          level: 'degraded',
+          summary: 'b is degraded',
+        },
+        c: {
+          level: 'unavailable',
+          summary: 'c is unavailable',
         },
-      });
+        d: {
+          level: 'critical',
+          summary: 'd is critical',
+        },
+      },
+    };
+
+    it('returns new status format when no query params are provided', async () => {
+      await setupServer();
+      const result = await supertest(httpSetup.server.listener).get('/api/status').expect(200);
+      expect(result.body.status).toEqual(newFormat);
+      expect(incrementUsageCounter).not.toHaveBeenCalled();
+    });
+
+    it('returns new status format when v8format=true is provided', async () => {
+      await setupServer();
+      const result = await supertest(httpSetup.server.listener)
+        .get('/api/status?v8format=true')
+        .expect(200);
+      expect(result.body.status).toEqual(newFormat);
+      expect(incrementUsageCounter).not.toHaveBeenCalled();
+    });
+
+    it('returns new status format when v7format=false is provided', async () => {
+      await setupServer();
+      const result = await supertest(httpSetup.server.listener)
+        .get('/api/status?v7format=false')
+        .expect(200);
+      expect(result.body.status).toEqual(newFormat);
+      expect(incrementUsageCounter).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('invalid query parameters', () => {
+    it('v8format=true and v7format=true', async () => {
+      await setupServer();
+      await supertest(httpSetup.server.listener)
+        .get('/api/status?v8format=true&v7format=true')
+        .expect(400);
+      expect(incrementUsageCounter).not.toHaveBeenCalled();
+    });
+
+    it('v8format=true and v7format=false', async () => {
+      await setupServer();
+      await supertest(httpSetup.server.listener)
+        .get('/api/status?v8format=true&v7format=false')
+        .expect(400);
+      expect(incrementUsageCounter).not.toHaveBeenCalled();
+    });
+
+    it('v8format=false and v7format=false', async () => {
+      await setupServer();
+      await supertest(httpSetup.server.listener)
+        .get('/api/status?v8format=false&v7format=false')
+        .expect(400);
+      expect(incrementUsageCounter).not.toHaveBeenCalled();
+    });
+
+    it('v8format=false and v7format=true', async () => {
+      await setupServer();
+      await supertest(httpSetup.server.listener)
+        .get('/api/status?v8format=false&v7format=true')
+        .expect(400);
+      expect(incrementUsageCounter).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/src/core/server/status/routes/status.ts b/src/core/server/status/routes/status.ts
index 43a596bd1e0ec..861b41c58a893 100644
--- a/src/core/server/status/routes/status.ts
+++ b/src/core/server/status/routes/status.ts
@@ -12,6 +12,7 @@ import { schema } from '@kbn/config-schema';
 
 import { IRouter } from '../../http';
 import { MetricsServiceSetup } from '../../metrics';
+import type { CoreIncrementUsageCounter } from '../../core_usage_data/types';
 import { ServiceStatus, CoreStatus, ServiceStatusLevels } from '../types';
 import { PluginName } from '../../plugins';
 import { calculateLegacyStatus, LegacyStatusInfo } from '../legacy_status';
@@ -34,6 +35,7 @@ interface Deps {
     core$: Observable<CoreStatus>;
     plugins$: Observable<Record<PluginName, ServiceStatus>>;
   };
+  incrementUsageCounter: CoreIncrementUsageCounter;
 }
 
 interface StatusInfo {
@@ -47,7 +49,13 @@ interface StatusHttpBody extends Omit<StatusResponse, 'status'> {
   status: StatusInfo | LegacyStatusInfo;
 }
 
-export const registerStatusRoute = ({ router, config, metrics, status }: Deps) => {
+export const registerStatusRoute = ({
+  router,
+  config,
+  metrics,
+  status,
+  incrementUsageCounter,
+}: Deps) => {
   // Since the status.plugins$ observable is not subscribed to elsewhere, we need to subscribe it here to eagerly load
   // the plugins status when Kibana starts up so this endpoint responds quickly on first boot.
   const combinedStatus$ = new ReplaySubject<
@@ -63,9 +71,19 @@ export const registerStatusRoute = ({ router, config, metrics, status }: Deps) =
         tags: ['api'], // ensures that unauthenticated calls receive a 401 rather than a 302 redirect to login page
       },
       validate: {
-        query: schema.object({
-          v8format: schema.boolean({ defaultValue: false }),
-        }),
+        query: schema.object(
+          {
+            v7format: schema.maybe(schema.boolean()),
+            v8format: schema.maybe(schema.boolean()),
+          },
+          {
+            validate: ({ v7format, v8format }) => {
+              if (typeof v7format === 'boolean' && typeof v8format === 'boolean') {
+                return `provide only one format option: v7format or v8format`;
+              }
+            },
+          }
+        ),
       },
     },
     async (context, req, res) => {
@@ -73,14 +91,17 @@ export const registerStatusRoute = ({ router, config, metrics, status }: Deps) =
       const versionWithoutSnapshot = version.replace(SNAPSHOT_POSTFIX, '');
       const [overall, core, plugins] = await combinedStatus$.pipe(first()).toPromise();
 
+      const { v8format = true, v7format = false } = req.query ?? {};
+
       let statusInfo: StatusInfo | LegacyStatusInfo;
-      if (req.query?.v8format) {
+      if (!v7format && v8format) {
         statusInfo = {
           overall,
           core,
           plugins,
         };
       } else {
+        incrementUsageCounter({ counterName: 'status_v7format' });
         statusInfo = calculateLegacyStatus({
           overall,
           core,
diff --git a/src/core/server/status/status_service.test.ts b/src/core/server/status/status_service.test.ts
index 4ead81a6638dd..9148f69e079aa 100644
--- a/src/core/server/status/status_service.test.ts
+++ b/src/core/server/status/status_service.test.ts
@@ -18,6 +18,7 @@ import { httpServiceMock } from '../http/http_service.mock';
 import { mockRouter, RouterMock } from '../http/router/router.mock';
 import { metricsServiceMock } from '../metrics/metrics_service.mock';
 import { configServiceMock } from '../config/mocks';
+import { coreUsageDataServiceMock } from '../core_usage_data/core_usage_data_service.mock';
 
 expect.addSnapshotSerializer(ServiceStatusLevelSnapshotSerializer);
 
@@ -51,6 +52,7 @@ describe('StatusService', () => {
       environment: environmentServiceMock.createSetupContract(),
       http: httpServiceMock.createInternalSetupContract(),
       metrics: metricsServiceMock.createInternalSetupContract(),
+      coreUsageData: coreUsageDataServiceMock.createSetupContract(),
       ...overrides,
     };
   };
diff --git a/src/core/server/status/status_service.ts b/src/core/server/status/status_service.ts
index 8e9db30bbebd3..107074bdb98b1 100644
--- a/src/core/server/status/status_service.ts
+++ b/src/core/server/status/status_service.ts
@@ -20,6 +20,7 @@ import { PluginName } from '../plugins';
 import { InternalMetricsServiceSetup } from '../metrics';
 import { registerStatusRoute } from './routes';
 import { InternalEnvironmentServiceSetup } from '../environment';
+import type { InternalCoreUsageDataSetup } from '../core_usage_data';
 
 import { config, StatusConfigType } from './status_config';
 import { ServiceStatus, CoreStatus, InternalStatusServiceSetup } from './types';
@@ -38,6 +39,7 @@ interface SetupDeps {
   http: InternalHttpServiceSetup;
   metrics: InternalMetricsServiceSetup;
   savedObjects: Pick<InternalSavedObjectsServiceSetup, 'status$'>;
+  coreUsageData: Pick<InternalCoreUsageDataSetup, 'incrementUsageCounter'>;
 }
 
 export class StatusService implements CoreService<InternalStatusServiceSetup> {
@@ -61,6 +63,7 @@ export class StatusService implements CoreService<InternalStatusServiceSetup> {
     metrics,
     savedObjects,
     environment,
+    coreUsageData,
   }: SetupDeps) {
     const statusConfig = await this.config$.pipe(take(1)).toPromise();
     const core$ = this.setupCoreStatus({ elasticsearch, savedObjects });
@@ -101,6 +104,7 @@ export class StatusService implements CoreService<InternalStatusServiceSetup> {
         plugins$: this.pluginsStatus.getAll$(),
         core$,
       },
+      incrementUsageCounter: coreUsageData.incrementUsageCounter,
     };
 
     const router = http.createRouter('');
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
index c01cd43b1f1e3..7bf390b0bee5a 100644
--- a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
+++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
@@ -35,7 +35,7 @@ import {
   syncDashboardFilterState,
   loadSavedDashboardState,
   buildDashboardContainer,
-  loadDashboardUrlState,
+  syncDashboardUrlState,
   diffDashboardState,
   areTimeRangesEqual,
 } from '../lib';
@@ -151,15 +151,20 @@ export const useDashboardAppState = ({
        * Combine initial state from the saved object, session storage, and URL, then dispatch it to Redux.
        */
       const dashboardSessionStorageState = dashboardSessionStorage.getState(savedDashboardId) || {};
-      const dashboardURLState = loadDashboardUrlState(dashboardBuildContext);
+
       const forwardedAppState = loadDashboardHistoryLocationState(
         scopedHistory()?.location?.state as undefined | DashboardAppLocatorParams
       );
 
+      const { initialDashboardStateFromUrl, stopWatchingAppStateInUrl } = syncDashboardUrlState({
+        ...dashboardBuildContext,
+        savedDashboard,
+      });
+
       const initialDashboardState = {
         ...savedDashboardState,
         ...dashboardSessionStorageState,
-        ...dashboardURLState,
+        ...initialDashboardStateFromUrl,
         ...forwardedAppState,
 
         // if there is an incoming embeddable, dashboard always needs to be in edit mode to receive it.
@@ -291,6 +296,7 @@ export const useDashboardAppState = ({
 
       onDestroy = () => {
         stopSyncingContainerInput();
+        stopWatchingAppStateInUrl();
         stopSyncingDashboardFilterState();
         lastSavedSubscription.unsubscribe();
         indexPatternsSubscription.unsubscribe();
diff --git a/src/plugins/dashboard/public/application/lib/index.ts b/src/plugins/dashboard/public/application/lib/index.ts
index 9aba481c3fb86..845cfcb096c51 100644
--- a/src/plugins/dashboard/public/application/lib/index.ts
+++ b/src/plugins/dashboard/public/application/lib/index.ts
@@ -12,7 +12,7 @@ export { saveDashboard } from './save_dashboard';
 export { migrateAppState } from './migrate_app_state';
 export { addHelpMenuToAppChrome } from './help_menu_util';
 export { getTagsFromSavedDashboard } from './dashboard_tagging';
-export { loadDashboardUrlState } from './load_dashboard_url_state';
+export { syncDashboardUrlState } from './sync_dashboard_url_state';
 export { DashboardSessionStorage } from './dashboard_session_storage';
 export { loadSavedDashboardState } from './load_saved_dashboard_state';
 export { attemptLoadDashboardByTitle } from './load_dashboard_by_title';
diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts
index 2cfd7da6145ee..ea4ecf8dc7a3d 100644
--- a/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts
@@ -48,34 +48,13 @@ export const syncDashboardFilterState = ({
   const { filterManager, queryString, timefilter } = queryService;
   const { timefilter: timefilterService } = timefilter;
 
-  // apply initial filters to the query service and to the saved dashboard
-  filterManager.setAppFilters(_.cloneDeep(initialDashboardState.filters));
-  savedDashboard.searchSource.setField('filter', initialDashboardState.filters);
-
-  // apply initial query to the query service and to the saved dashboard
-  queryString.setQuery(initialDashboardState.query);
-  savedDashboard.searchSource.setField('query', initialDashboardState.query);
-
-  /**
-   * If a global time range is not set explicitly and the time range was saved with the dashboard, apply
-   * initial time range and refresh interval to the query service.
-   */
-  if (initialDashboardState.timeRestore) {
-    const initialGlobalQueryState = kbnUrlStateStorage.get<QueryState>('_g');
-    if (!initialGlobalQueryState?.time) {
-      if (savedDashboard.timeFrom && savedDashboard.timeTo) {
-        timefilterService.setTime({
-          from: savedDashboard.timeFrom,
-          to: savedDashboard.timeTo,
-        });
-      }
-    }
-    if (!initialGlobalQueryState?.refreshInterval) {
-      if (savedDashboard.refreshInterval) {
-        timefilterService.setRefreshInterval(savedDashboard.refreshInterval);
-      }
-    }
-  }
+  // apply initial dashboard filter state.
+  applyDashboardFilterState({
+    currentDashboardState: initialDashboardState,
+    kbnUrlStateStorage,
+    savedDashboard,
+    queryService,
+  });
 
   // this callback will be used any time new filters and query need to be applied.
   const applyFilters = (query: Query, filters: Filter[]) => {
@@ -155,3 +134,49 @@ export const syncDashboardFilterState = ({
 
   return { applyFilters, stopSyncingDashboardFilterState };
 };
+
+interface ApplyDashboardFilterStateProps {
+  kbnUrlStateStorage: DashboardBuildContext['kbnUrlStateStorage'];
+  queryService: DashboardBuildContext['query'];
+  currentDashboardState: DashboardState;
+  savedDashboard: DashboardSavedObject;
+}
+
+export const applyDashboardFilterState = ({
+  currentDashboardState,
+  kbnUrlStateStorage,
+  savedDashboard,
+  queryService,
+}: ApplyDashboardFilterStateProps) => {
+  const { filterManager, queryString, timefilter } = queryService;
+  const { timefilter: timefilterService } = timefilter;
+
+  // apply filters to the query service and to the saved dashboard
+  filterManager.setAppFilters(_.cloneDeep(currentDashboardState.filters));
+  savedDashboard.searchSource.setField('filter', currentDashboardState.filters);
+
+  // apply query to the query service and to the saved dashboard
+  queryString.setQuery(currentDashboardState.query);
+  savedDashboard.searchSource.setField('query', currentDashboardState.query);
+
+  /**
+   * If a global time range is not set explicitly and the time range was saved with the dashboard, apply
+   * time range and refresh interval to the query service.
+   */
+  if (currentDashboardState.timeRestore) {
+    const globalQueryState = kbnUrlStateStorage.get<QueryState>('_g');
+    if (!globalQueryState?.time) {
+      if (savedDashboard.timeFrom && savedDashboard.timeTo) {
+        timefilterService.setTime({
+          from: savedDashboard.timeFrom,
+          to: savedDashboard.timeTo,
+        });
+      }
+    }
+    if (!globalQueryState?.refreshInterval) {
+      if (savedDashboard.refreshInterval) {
+        timefilterService.setRefreshInterval(savedDashboard.refreshInterval);
+      }
+    }
+  }
+};
diff --git a/src/plugins/dashboard/public/application/lib/load_dashboard_url_state.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts
similarity index 52%
rename from src/plugins/dashboard/public/application/lib/load_dashboard_url_state.ts
rename to src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts
index f76382c1fbbdd..00b8f8217e25f 100644
--- a/src/plugins/dashboard/public/application/lib/load_dashboard_url_state.ts
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_url_state.ts
@@ -9,7 +9,11 @@
 import _ from 'lodash';
 
 import { migrateAppState } from '.';
+import { DashboardSavedObject } from '../..';
+import { setDashboardState } from '../state';
+import { migrateLegacyQuery } from './migrate_legacy_query';
 import { replaceUrlHashQuery } from '../../../../kibana_utils/public';
+import { applyDashboardFilterState } from './sync_dashboard_filter_state';
 import { DASHBOARD_STATE_STORAGE_KEY } from '../../dashboard_constants';
 import type {
   DashboardBuildContext,
@@ -17,17 +21,60 @@ import type {
   DashboardState,
   RawDashboardState,
 } from '../../types';
-import { migrateLegacyQuery } from './migrate_legacy_query';
 import { convertSavedPanelsToPanelMap } from './convert_saved_panels_to_panel_map';
 
+type SyncDashboardUrlStateProps = DashboardBuildContext & { savedDashboard: DashboardSavedObject };
+
+export const syncDashboardUrlState = ({
+  dispatchDashboardStateChange,
+  getLatestDashboardState,
+  query: queryService,
+  kbnUrlStateStorage,
+  usageCollection,
+  savedDashboard,
+  kibanaVersion,
+}: SyncDashboardUrlStateProps) => {
+  // load initial state before subscribing to avoid state removal triggering update.
+  const loadDashboardStateProps = { kbnUrlStateStorage, usageCollection, kibanaVersion };
+  const initialDashboardStateFromUrl = loadDashboardUrlState(loadDashboardStateProps);
+
+  const appStateSubscription = kbnUrlStateStorage
+    .change$(DASHBOARD_STATE_STORAGE_KEY)
+    .subscribe(() => {
+      const stateFromUrl = loadDashboardUrlState(loadDashboardStateProps);
+
+      const updatedDashboardState = { ...getLatestDashboardState(), ...stateFromUrl };
+      applyDashboardFilterState({
+        currentDashboardState: updatedDashboardState,
+        kbnUrlStateStorage,
+        queryService,
+        savedDashboard,
+      });
+
+      if (Object.keys(stateFromUrl).length === 0) return;
+      dispatchDashboardStateChange(setDashboardState(updatedDashboardState));
+    });
+
+  const stopWatchingAppStateInUrl = () => {
+    appStateSubscription.unsubscribe();
+  };
+  return { initialDashboardStateFromUrl, stopWatchingAppStateInUrl };
+};
+
+interface LoadDashboardUrlStateProps {
+  kibanaVersion: DashboardBuildContext['kibanaVersion'];
+  usageCollection: DashboardBuildContext['usageCollection'];
+  kbnUrlStateStorage: DashboardBuildContext['kbnUrlStateStorage'];
+}
+
 /**
  * Loads any dashboard state from the URL, and removes the state from the URL.
  */
-export const loadDashboardUrlState = ({
+const loadDashboardUrlState = ({
   kibanaVersion,
   usageCollection,
   kbnUrlStateStorage,
-}: DashboardBuildContext): Partial<DashboardState> => {
+}: LoadDashboardUrlStateProps): Partial<DashboardState> => {
   const rawAppStateInUrl = kbnUrlStateStorage.get<RawDashboardState>(DASHBOARD_STATE_STORAGE_KEY);
   if (!rawAppStateInUrl) return {};
 
diff --git a/src/plugins/kibana_usage_collection/server/plugin.test.ts b/src/plugins/kibana_usage_collection/server/plugin.test.ts
index 1584366a42dc1..75c323ba0332f 100644
--- a/src/plugins/kibana_usage_collection/server/plugin.test.ts
+++ b/src/plugins/kibana_usage_collection/server/plugin.test.ts
@@ -42,6 +42,8 @@ describe('kibana_usage_collection', () => {
 
     expect(pluginInstance.setup(coreSetup, { usageCollection })).toBe(undefined);
 
+    expect(coreSetup.coreUsageData.registerUsageCounter).toHaveBeenCalled();
+
     await expect(
       Promise.all(
         usageCollectors.map(async (usageCollector) => {
diff --git a/src/plugins/kibana_usage_collection/server/plugin.ts b/src/plugins/kibana_usage_collection/server/plugin.ts
index dadb4283e84a7..275dcc761125e 100644
--- a/src/plugins/kibana_usage_collection/server/plugin.ts
+++ b/src/plugins/kibana_usage_collection/server/plugin.ts
@@ -73,6 +73,7 @@ export class KibanaUsageCollectionPlugin implements Plugin {
   public setup(coreSetup: CoreSetup, { usageCollection }: KibanaUsageCollectionPluginsDepsSetup) {
     usageCollection.createUsageCounter('uiCounters');
     this.eventLoopUsageCounter = usageCollection.createUsageCounter('eventLoop');
+    coreSetup.coreUsageData.registerUsageCounter(usageCollection.createUsageCounter('core'));
     this.registerUsageCollectors(
       usageCollection,
       coreSetup,
diff --git a/src/plugins/vis_type_metric/tsconfig.json b/src/plugins/vis_type_metric/tsconfig.json
deleted file mode 100644
index e430ec2460796..0000000000000
--- a/src/plugins/vis_type_metric/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./target/types",
-    "emitDeclarationOnly": true,
-    "declaration": true,
-    "declarationMap": true
-  },
-  "include": ["public/**/*", "server/**/*", "*.ts"],
-  "references": [
-    { "path": "../../core/tsconfig.json" },
-    { "path": "../data/tsconfig.json" },
-    { "path": "../visualizations/tsconfig.json" },
-    { "path": "../charts/tsconfig.json" },
-    { "path": "../expressions/tsconfig.json" },
-    { "path": "../kibana_utils/tsconfig.json" },
-    { "path": "../vis_default_editor/tsconfig.json" },
-    { "path": "../field_formats/tsconfig.json" }
-  ]
-}
diff --git a/src/plugins/vis_type_tagcloud/tsconfig.json b/src/plugins/vis_type_tagcloud/tsconfig.json
deleted file mode 100644
index 043eed06c6bcb..0000000000000
--- a/src/plugins/vis_type_tagcloud/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./target/types",
-    "emitDeclarationOnly": true,
-    "declaration": true,
-    "declarationMap": true
-  },
-  "include": [
-    "public/**/*",
-    "server/**/*",
-    "*.ts"
-  ],
-  "references": [
-    { "path": "../../core/tsconfig.json" },
-    { "path": "../data/tsconfig.json" },
-    { "path": "../expressions/tsconfig.json" },
-    { "path": "../visualizations/tsconfig.json" },
-    { "path": "../charts/tsconfig.json" },
-    { "path": "../kibana_react/tsconfig.json" },
-    { "path": "../vis_default_editor/tsconfig.json" },
-  ]
-}
diff --git a/src/plugins/vis_type_vega/tsconfig.json b/src/plugins/vis_type_vega/tsconfig.json
deleted file mode 100644
index 62bdd0262b4a5..0000000000000
--- a/src/plugins/vis_type_vega/tsconfig.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./target/types",
-    "emitDeclarationOnly": true,
-    "declaration": true,
-    "declarationMap": true,
-    "strictNullChecks": false
-  },
-  "include": [
-    "server/**/*",
-    "public/**/*",
-    "*.ts",
-    // have to declare *.json explicitly due to https://github.com/microsoft/TypeScript/issues/25636
-    "public/test_utils/vega_map_test.json"
-  ],
-  "references": [
-    { "path": "../../core/tsconfig.json" },
-    { "path": "../data/tsconfig.json" },
-    { "path": "../visualizations/tsconfig.json" },
-    { "path": "../maps_ems/tsconfig.json" },
-    { "path": "../expressions/tsconfig.json" },
-    { "path": "../inspector/tsconfig.json" },
-    { "path": "../home/tsconfig.json" },
-    { "path": "../usage_collection/tsconfig.json" },
-    { "path": "../kibana_utils/tsconfig.json" },
-    { "path": "../kibana_react/tsconfig.json" },
-    { "path": "../vis_default_editor/tsconfig.json" },
-    { "path": "../es_ui_shared/tsconfig.json" },
-  ]
-}
diff --git a/src/plugins/vis_type_metric/config.ts b/src/plugins/vis_types/metric/config.ts
similarity index 100%
rename from src/plugins/vis_type_metric/config.ts
rename to src/plugins/vis_types/metric/config.ts
diff --git a/src/plugins/vis_type_vega/jest.config.js b/src/plugins/vis_types/metric/jest.config.js
similarity index 83%
rename from src/plugins/vis_type_vega/jest.config.js
rename to src/plugins/vis_types/metric/jest.config.js
index c3e2ea5203364..a84929a3805b8 100644
--- a/src/plugins/vis_type_vega/jest.config.js
+++ b/src/plugins/vis_types/metric/jest.config.js
@@ -8,6 +8,6 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../..',
-  roots: ['<rootDir>/src/plugins/vis_type_vega'],
+  rootDir: '../../../..',
+  roots: ['<rootDir>/src/plugins/vis_types/metric'],
 };
diff --git a/src/plugins/vis_type_metric/kibana.json b/src/plugins/vis_types/metric/kibana.json
similarity index 100%
rename from src/plugins/vis_type_metric/kibana.json
rename to src/plugins/vis_types/metric/kibana.json
diff --git a/src/plugins/vis_type_metric/public/__snapshots__/metric_vis_fn.test.ts.snap b/src/plugins/vis_types/metric/public/__snapshots__/metric_vis_fn.test.ts.snap
similarity index 100%
rename from src/plugins/vis_type_metric/public/__snapshots__/metric_vis_fn.test.ts.snap
rename to src/plugins/vis_types/metric/public/__snapshots__/metric_vis_fn.test.ts.snap
diff --git a/src/plugins/vis_type_metric/public/__snapshots__/to_ast.test.ts.snap b/src/plugins/vis_types/metric/public/__snapshots__/to_ast.test.ts.snap
similarity index 100%
rename from src/plugins/vis_type_metric/public/__snapshots__/to_ast.test.ts.snap
rename to src/plugins/vis_types/metric/public/__snapshots__/to_ast.test.ts.snap
diff --git a/src/plugins/vis_type_metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap b/src/plugins/vis_types/metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap
similarity index 100%
rename from src/plugins/vis_type_metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap
rename to src/plugins/vis_types/metric/public/components/__snapshots__/metric_vis_component.test.tsx.snap
diff --git a/src/plugins/vis_type_metric/public/components/metric_vis.scss b/src/plugins/vis_types/metric/public/components/metric_vis.scss
similarity index 100%
rename from src/plugins/vis_type_metric/public/components/metric_vis.scss
rename to src/plugins/vis_types/metric/public/components/metric_vis.scss
diff --git a/src/plugins/vis_type_metric/public/components/metric_vis_component.test.tsx b/src/plugins/vis_types/metric/public/components/metric_vis_component.test.tsx
similarity index 100%
rename from src/plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
rename to src/plugins/vis_types/metric/public/components/metric_vis_component.test.tsx
diff --git a/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx b/src/plugins/vis_types/metric/public/components/metric_vis_component.tsx
similarity index 95%
rename from src/plugins/vis_type_metric/public/components/metric_vis_component.tsx
rename to src/plugins/vis_types/metric/public/components/metric_vis_component.tsx
index 87ca902f6c090..c3735bdc0d79a 100644
--- a/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx
+++ b/src/plugins/vis_types/metric/public/components/metric_vis_component.tsx
@@ -11,13 +11,13 @@ import React, { Component } from 'react';
 import { isColorDark } from '@elastic/eui';
 import { MetricVisValue } from './metric_vis_value';
 import { Input } from '../metric_vis_fn';
-import type { FieldFormatsContentType, IFieldFormat } from '../../../field_formats/common';
-import { Datatable } from '../../../expressions/public';
-import { getHeatmapColors } from '../../../charts/public';
+import type { FieldFormatsContentType, IFieldFormat } from '../../../../field_formats/common';
+import { Datatable } from '../../../../expressions/public';
+import { getHeatmapColors } from '../../../../charts/public';
 import { VisParams, MetricVisMetric } from '../types';
 import { getFormatService } from '../services';
-import { SchemaConfig } from '../../../visualizations/public';
-import { Range } from '../../../expressions/public';
+import { SchemaConfig } from '../../../../visualizations/public';
+import { Range } from '../../../../expressions/public';
 
 import './metric_vis.scss';
 
diff --git a/src/plugins/vis_type_metric/public/components/metric_vis_options.tsx b/src/plugins/vis_types/metric/public/components/metric_vis_options.tsx
similarity index 98%
rename from src/plugins/vis_type_metric/public/components/metric_vis_options.tsx
rename to src/plugins/vis_types/metric/public/components/metric_vis_options.tsx
index 5c6c4bf95b4f2..22152b331a907 100644
--- a/src/plugins/vis_type_metric/public/components/metric_vis_options.tsx
+++ b/src/plugins/vis_types/metric/public/components/metric_vis_options.tsx
@@ -27,8 +27,8 @@ import {
   ColorSchemaOptions,
   RangeOption,
   PercentageModeOption,
-} from '../../../vis_default_editor/public';
-import { ColorMode, colorSchemas } from '../../../charts/public';
+} from '../../../../vis_default_editor/public';
+import { ColorMode, colorSchemas } from '../../../../charts/public';
 import { MetricVisParam, VisParams } from '../types';
 
 const metricColorMode = [
diff --git a/src/plugins/vis_type_metric/public/components/metric_vis_value.test.tsx b/src/plugins/vis_types/metric/public/components/metric_vis_value.test.tsx
similarity index 100%
rename from src/plugins/vis_type_metric/public/components/metric_vis_value.test.tsx
rename to src/plugins/vis_types/metric/public/components/metric_vis_value.test.tsx
diff --git a/src/plugins/vis_type_metric/public/components/metric_vis_value.tsx b/src/plugins/vis_types/metric/public/components/metric_vis_value.tsx
similarity index 100%
rename from src/plugins/vis_type_metric/public/components/metric_vis_value.tsx
rename to src/plugins/vis_types/metric/public/components/metric_vis_value.tsx
diff --git a/src/plugins/vis_type_metric/public/index.ts b/src/plugins/vis_types/metric/public/index.ts
similarity index 100%
rename from src/plugins/vis_type_metric/public/index.ts
rename to src/plugins/vis_types/metric/public/index.ts
diff --git a/src/plugins/vis_type_metric/public/metric_vis_fn.test.ts b/src/plugins/vis_types/metric/public/metric_vis_fn.test.ts
similarity index 90%
rename from src/plugins/vis_type_metric/public/metric_vis_fn.test.ts
rename to src/plugins/vis_types/metric/public/metric_vis_fn.test.ts
index 432b1f2fe02b7..3844c0f21ed05 100644
--- a/src/plugins/vis_type_metric/public/metric_vis_fn.test.ts
+++ b/src/plugins/vis_types/metric/public/metric_vis_fn.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { createMetricVisFn } from './metric_vis_fn';
-import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../expressions/common/expression_types/specs';
+import { functionWrapper } from '../../../expressions/common/expression_functions/specs/tests/utils';
+import { Datatable } from '../../../expressions/common/expression_types/specs';
 
 describe('interpreter/functions#metric', () => {
   const fn = functionWrapper(createMetricVisFn());
diff --git a/src/plugins/vis_type_metric/public/metric_vis_fn.ts b/src/plugins/vis_types/metric/public/metric_vis_fn.ts
similarity index 97%
rename from src/plugins/vis_type_metric/public/metric_vis_fn.ts
rename to src/plugins/vis_types/metric/public/metric_vis_fn.ts
index ab62c3e941e28..9a144defed4e7 100644
--- a/src/plugins/vis_type_metric/public/metric_vis_fn.ts
+++ b/src/plugins/vis_types/metric/public/metric_vis_fn.ts
@@ -14,10 +14,10 @@ import {
   Range,
   Render,
   Style,
-} from '../../expressions/public';
+} from '../../../expressions/public';
 import { visType, DimensionsVisParam, VisParams } from './types';
-import { prepareLogTable, Dimension } from '../../visualizations/public';
-import { ColorSchemas, vislibColorMaps, ColorMode } from '../../charts/public';
+import { prepareLogTable, Dimension } from '../../../visualizations/public';
+import { ColorSchemas, vislibColorMaps, ColorMode } from '../../../charts/public';
 
 export type Input = Datatable;
 
diff --git a/src/plugins/vis_type_metric/public/metric_vis_renderer.tsx b/src/plugins/vis_types/metric/public/metric_vis_renderer.tsx
similarity index 88%
rename from src/plugins/vis_type_metric/public/metric_vis_renderer.tsx
rename to src/plugins/vis_types/metric/public/metric_vis_renderer.tsx
index 0fc904a325a99..0bd2efbfe2efb 100644
--- a/src/plugins/vis_type_metric/public/metric_vis_renderer.tsx
+++ b/src/plugins/vis_types/metric/public/metric_vis_renderer.tsx
@@ -9,8 +9,8 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { VisualizationContainer } from '../../visualizations/public';
-import { ExpressionRenderDefinition } from '../../expressions/common/expression_renderers';
+import { VisualizationContainer } from '../../../visualizations/public';
+import { ExpressionRenderDefinition } from '../../../expressions/common/expression_renderers';
 import { MetricVisRenderValue } from './metric_vis_fn';
 // @ts-ignore
 const MetricVisComponent = lazy(() => import('./components/metric_vis_component'));
diff --git a/src/plugins/vis_type_metric/public/metric_vis_type.ts b/src/plugins/vis_types/metric/public/metric_vis_type.ts
similarity index 93%
rename from src/plugins/vis_type_metric/public/metric_vis_type.ts
rename to src/plugins/vis_types/metric/public/metric_vis_type.ts
index 382ef925c5282..9fc3856ba0edf 100644
--- a/src/plugins/vis_type_metric/public/metric_vis_type.ts
+++ b/src/plugins/vis_types/metric/public/metric_vis_type.ts
@@ -8,9 +8,9 @@
 
 import { i18n } from '@kbn/i18n';
 import { MetricVisOptions } from './components/metric_vis_options';
-import { ColorSchemas, ColorMode } from '../../charts/public';
-import { VisTypeDefinition } from '../../visualizations/public';
-import { AggGroupNames } from '../../data/public';
+import { ColorSchemas, ColorMode } from '../../../charts/public';
+import { VisTypeDefinition } from '../../../visualizations/public';
+import { AggGroupNames } from '../../../data/public';
 import { toExpressionAst } from './to_ast';
 import { VisParams } from './types';
 
diff --git a/src/plugins/vis_type_metric/public/plugin.ts b/src/plugins/vis_types/metric/public/plugin.ts
similarity index 86%
rename from src/plugins/vis_type_metric/public/plugin.ts
rename to src/plugins/vis_types/metric/public/plugin.ts
index 051a10eb3c72f..205c02d8e9c3b 100644
--- a/src/plugins/vis_type_metric/public/plugin.ts
+++ b/src/plugins/vis_types/metric/public/plugin.ts
@@ -7,13 +7,13 @@
  */
 
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
-import { VisualizationsSetup } from '../../visualizations/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
+import { VisualizationsSetup } from '../../../visualizations/public';
 
 import { createMetricVisFn } from './metric_vis_fn';
 import { createMetricVisTypeDefinition } from './metric_vis_type';
-import { ChartsPluginSetup } from '../../charts/public';
-import { DataPublicPluginStart } from '../../data/public';
+import { ChartsPluginSetup } from '../../../charts/public';
+import { DataPublicPluginStart } from '../../../data/public';
 import { setFormatService } from './services';
 import { ConfigSchema } from '../config';
 import { metricVisRenderer } from './metric_vis_renderer';
diff --git a/src/plugins/vis_type_metric/public/services.ts b/src/plugins/vis_types/metric/public/services.ts
similarity index 79%
rename from src/plugins/vis_type_metric/public/services.ts
rename to src/plugins/vis_types/metric/public/services.ts
index 96d6b0f7a1cd3..e705513675e71 100644
--- a/src/plugins/vis_type_metric/public/services.ts
+++ b/src/plugins/vis_types/metric/public/services.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { createGetterSetter } from '../../kibana_utils/common';
-import { DataPublicPluginStart } from '../../data/public';
+import { createGetterSetter } from '../../../kibana_utils/common';
+import { DataPublicPluginStart } from '../../../data/public';
 
 export const [getFormatService, setFormatService] = createGetterSetter<
   DataPublicPluginStart['fieldFormats']
diff --git a/src/plugins/vis_type_metric/public/to_ast.test.ts b/src/plugins/vis_types/metric/public/to_ast.test.ts
similarity index 100%
rename from src/plugins/vis_type_metric/public/to_ast.test.ts
rename to src/plugins/vis_types/metric/public/to_ast.test.ts
diff --git a/src/plugins/vis_type_metric/public/to_ast.ts b/src/plugins/vis_types/metric/public/to_ast.ts
similarity index 97%
rename from src/plugins/vis_type_metric/public/to_ast.ts
rename to src/plugins/vis_types/metric/public/to_ast.ts
index ec9c2b3b0157e..10c782c9a50fb 100644
--- a/src/plugins/vis_type_metric/public/to_ast.ts
+++ b/src/plugins/vis_types/metric/public/to_ast.ts
@@ -7,13 +7,13 @@
  */
 
 import { get } from 'lodash';
-import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../expressions/public';
+import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
 import { MetricVisExpressionFunctionDefinition } from './metric_vis_fn';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../data/public';
+} from '../../../data/public';
 import { VisParams } from './types';
 
 const prepareDimension = (params: SchemaConfig) => {
diff --git a/src/plugins/vis_type_metric/public/types.ts b/src/plugins/vis_types/metric/public/types.ts
similarity index 84%
rename from src/plugins/vis_type_metric/public/types.ts
rename to src/plugins/vis_types/metric/public/types.ts
index 45b8e17425891..1baaa25959f31 100644
--- a/src/plugins/vis_type_metric/public/types.ts
+++ b/src/plugins/vis_types/metric/public/types.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { Range } from '../../expressions/public';
-import { SchemaConfig } from '../../visualizations/public';
-import { ColorMode, Labels, Style, ColorSchemas } from '../../charts/public';
+import { Range } from '../../../expressions/public';
+import { SchemaConfig } from '../../../visualizations/public';
+import { ColorMode, Labels, Style, ColorSchemas } from '../../../charts/public';
 
 export const visType = 'metric';
 
diff --git a/src/plugins/vis_type_metric/server/index.ts b/src/plugins/vis_types/metric/server/index.ts
similarity index 100%
rename from src/plugins/vis_type_metric/server/index.ts
rename to src/plugins/vis_types/metric/server/index.ts
diff --git a/src/plugins/vis_types/metric/tsconfig.json b/src/plugins/vis_types/metric/tsconfig.json
new file mode 100644
index 0000000000000..e8c878425ff70
--- /dev/null
+++ b/src/plugins/vis_types/metric/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "extends": "../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": ["public/**/*", "server/**/*", "*.ts"],
+  "references": [
+    { "path": "../../../core/tsconfig.json" },
+    { "path": "../../data/tsconfig.json" },
+    { "path": "../../visualizations/tsconfig.json" },
+    { "path": "../../charts/tsconfig.json" },
+    { "path": "../../expressions/tsconfig.json" },
+    { "path": "../../kibana_utils/tsconfig.json" },
+    { "path": "../../vis_default_editor/tsconfig.json" },
+    { "path": "../../field_formats/tsconfig.json" }
+  ]
+}
diff --git a/src/plugins/vis_type_tagcloud/config.ts b/src/plugins/vis_types/tagcloud/config.ts
similarity index 100%
rename from src/plugins/vis_type_tagcloud/config.ts
rename to src/plugins/vis_types/tagcloud/config.ts
diff --git a/src/plugins/vis_type_tagcloud/jest.config.js b/src/plugins/vis_types/tagcloud/jest.config.js
similarity index 84%
rename from src/plugins/vis_type_tagcloud/jest.config.js
rename to src/plugins/vis_types/tagcloud/jest.config.js
index 3d24c536792bb..20dfd8ad0d11c 100644
--- a/src/plugins/vis_type_tagcloud/jest.config.js
+++ b/src/plugins/vis_types/tagcloud/jest.config.js
@@ -8,7 +8,7 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../..',
-  roots: ['<rootDir>/src/plugins/vis_type_tagcloud'],
+  rootDir: '../../../..',
+  roots: ['<rootDir>/src/plugins/vis_types/tagcloud'],
   testRunner: 'jasmine2',
 };
diff --git a/src/plugins/vis_type_tagcloud/kibana.json b/src/plugins/vis_types/tagcloud/kibana.json
similarity index 100%
rename from src/plugins/vis_type_tagcloud/kibana.json
rename to src/plugins/vis_types/tagcloud/kibana.json
diff --git a/src/plugins/vis_type_tagcloud/public/__snapshots__/to_ast.test.ts.snap b/src/plugins/vis_types/tagcloud/public/__snapshots__/to_ast.test.ts.snap
similarity index 100%
rename from src/plugins/vis_type_tagcloud/public/__snapshots__/to_ast.test.ts.snap
rename to src/plugins/vis_types/tagcloud/public/__snapshots__/to_ast.test.ts.snap
diff --git a/src/plugins/vis_type_tagcloud/public/components/collections.ts b/src/plugins/vis_types/tagcloud/public/components/collections.ts
similarity index 100%
rename from src/plugins/vis_type_tagcloud/public/components/collections.ts
rename to src/plugins/vis_types/tagcloud/public/components/collections.ts
diff --git a/src/plugins/vis_type_tagcloud/public/components/get_tag_cloud_options.tsx b/src/plugins/vis_types/tagcloud/public/components/get_tag_cloud_options.tsx
similarity index 100%
rename from src/plugins/vis_type_tagcloud/public/components/get_tag_cloud_options.tsx
rename to src/plugins/vis_types/tagcloud/public/components/get_tag_cloud_options.tsx
diff --git a/src/plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx b/src/plugins/vis_types/tagcloud/public/components/tag_cloud_options.tsx
similarity index 92%
rename from src/plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx
rename to src/plugins/vis_types/tagcloud/public/components/tag_cloud_options.tsx
index 6682799a8038a..ff5f1e6edd6f8 100644
--- a/src/plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx
+++ b/src/plugins/vis_types/tagcloud/public/components/tag_cloud_options.tsx
@@ -9,10 +9,10 @@
 import React, { useState, useEffect } from 'react';
 import { EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import type { PaletteRegistry } from '../../../charts/public';
-import { VisEditorOptionsProps } from '../../../visualizations/public';
-import { SelectOption, SwitchOption, PalettePicker } from '../../../vis_default_editor/public';
-import { ValidatedDualRange } from '../../../kibana_react/public';
+import type { PaletteRegistry } from '../../../../charts/public';
+import { VisEditorOptionsProps } from '../../../../visualizations/public';
+import { SelectOption, SwitchOption, PalettePicker } from '../../../../vis_default_editor/public';
+import { ValidatedDualRange } from '../../../../kibana_react/public';
 import { TagCloudVisParams, TagCloudTypeProps } from '../types';
 import { collections } from './collections';
 
diff --git a/src/plugins/vis_type_tagcloud/public/index.ts b/src/plugins/vis_types/tagcloud/public/index.ts
similarity index 100%
rename from src/plugins/vis_type_tagcloud/public/index.ts
rename to src/plugins/vis_types/tagcloud/public/index.ts
diff --git a/src/plugins/vis_type_tagcloud/public/plugin.ts b/src/plugins/vis_types/tagcloud/public/plugin.ts
similarity index 91%
rename from src/plugins/vis_type_tagcloud/public/plugin.ts
rename to src/plugins/vis_types/tagcloud/public/plugin.ts
index 06e1c516d9e61..cc99480de7099 100644
--- a/src/plugins/vis_type_tagcloud/public/plugin.ts
+++ b/src/plugins/vis_types/tagcloud/public/plugin.ts
@@ -7,8 +7,8 @@
  */
 
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { VisualizationsSetup } from '../../visualizations/public';
-import { ChartsPluginSetup } from '../../charts/public';
+import { VisualizationsSetup } from '../../../visualizations/public';
+import { ChartsPluginSetup } from '../../../charts/public';
 
 import { getTagCloudVisTypeDefinition } from './tag_cloud_type';
 import { ConfigSchema } from '../config';
diff --git a/src/plugins/vis_type_tagcloud/public/tag_cloud_type.ts b/src/plugins/vis_types/tagcloud/public/tag_cloud_type.ts
similarity index 94%
rename from src/plugins/vis_type_tagcloud/public/tag_cloud_type.ts
rename to src/plugins/vis_types/tagcloud/public/tag_cloud_type.ts
index b3ab5cd3d7af7..a193a7fecc1fd 100644
--- a/src/plugins/vis_type_tagcloud/public/tag_cloud_type.ts
+++ b/src/plugins/vis_types/tagcloud/public/tag_cloud_type.ts
@@ -7,8 +7,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { AggGroupNames } from '../../data/public';
-import { VIS_EVENT_TO_TRIGGER } from '../../visualizations/public';
+import { AggGroupNames } from '../../../data/public';
+import { VIS_EVENT_TO_TRIGGER } from '../../../visualizations/public';
 
 import { getTagCloudOptions } from './components/get_tag_cloud_options';
 import { toExpressionAst } from './to_ast';
diff --git a/src/plugins/vis_type_tagcloud/public/to_ast.test.ts b/src/plugins/vis_types/tagcloud/public/to_ast.test.ts
similarity index 97%
rename from src/plugins/vis_type_tagcloud/public/to_ast.test.ts
rename to src/plugins/vis_types/tagcloud/public/to_ast.test.ts
index 4da9c525a4f93..c70448ab113cb 100644
--- a/src/plugins/vis_type_tagcloud/public/to_ast.test.ts
+++ b/src/plugins/vis_types/tagcloud/public/to_ast.test.ts
@@ -30,7 +30,7 @@ const mockSchemas = {
   ],
 };
 
-jest.mock('../../visualizations/public', () => ({
+jest.mock('../../../visualizations/public', () => ({
   getVisSchemas: () => mockSchemas,
 }));
 
diff --git a/src/plugins/vis_type_tagcloud/public/to_ast.ts b/src/plugins/vis_types/tagcloud/public/to_ast.ts
similarity index 95%
rename from src/plugins/vis_type_tagcloud/public/to_ast.ts
rename to src/plugins/vis_types/tagcloud/public/to_ast.ts
index c8810aa0397ee..b5256c586d1da 100644
--- a/src/plugins/vis_type_tagcloud/public/to_ast.ts
+++ b/src/plugins/vis_types/tagcloud/public/to_ast.ts
@@ -9,9 +9,9 @@
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../data/public';
-import { buildExpression, buildExpressionFunction } from '../../expressions/public';
-import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../visualizations/public';
+} from '../../../data/public';
+import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../../visualizations/public';
 import { TagCloudVisParams } from './types';
 
 const prepareDimension = (params: SchemaConfig) => {
diff --git a/src/plugins/vis_type_tagcloud/public/types.ts b/src/plugins/vis_types/tagcloud/public/types.ts
similarity index 85%
rename from src/plugins/vis_type_tagcloud/public/types.ts
rename to src/plugins/vis_types/tagcloud/public/types.ts
index d855ae5ab65c6..28a7c6506eb31 100644
--- a/src/plugins/vis_type_tagcloud/public/types.ts
+++ b/src/plugins/vis_types/tagcloud/public/types.ts
@@ -5,8 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import type { ChartsPluginSetup, PaletteOutput } from '../../charts/public';
-import type { SerializedFieldFormat } from '../../expressions/public';
+import type { ChartsPluginSetup, PaletteOutput } from '../../../charts/public';
+import type { SerializedFieldFormat } from '../../../expressions/public';
 
 interface Dimension {
   accessor: number;
diff --git a/src/plugins/vis_type_tagcloud/server/index.ts b/src/plugins/vis_types/tagcloud/server/index.ts
similarity index 100%
rename from src/plugins/vis_type_tagcloud/server/index.ts
rename to src/plugins/vis_types/tagcloud/server/index.ts
diff --git a/src/plugins/vis_types/tagcloud/tsconfig.json b/src/plugins/vis_types/tagcloud/tsconfig.json
new file mode 100644
index 0000000000000..4087f9f04c92b
--- /dev/null
+++ b/src/plugins/vis_types/tagcloud/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "extends": "../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "public/**/*",
+    "server/**/*",
+    "*.ts"
+  ],
+  "references": [
+    { "path": "../../../core/tsconfig.json" },
+    { "path": "../../data/tsconfig.json" },
+    { "path": "../../expressions/tsconfig.json" },
+    { "path": "../../visualizations/tsconfig.json" },
+    { "path": "../../charts/tsconfig.json" },
+    { "path": "../../kibana_react/tsconfig.json" },
+    { "path": "../../vis_default_editor/tsconfig.json" },
+  ]
+}
diff --git a/src/plugins/vis_type_vega/config.ts b/src/plugins/vis_types/vega/config.ts
similarity index 100%
rename from src/plugins/vis_type_vega/config.ts
rename to src/plugins/vis_types/vega/config.ts
diff --git a/src/plugins/vis_type_metric/jest.config.js b/src/plugins/vis_types/vega/jest.config.js
similarity index 83%
rename from src/plugins/vis_type_metric/jest.config.js
rename to src/plugins/vis_types/vega/jest.config.js
index 3029320d2e4d4..d7e1653e891a5 100644
--- a/src/plugins/vis_type_metric/jest.config.js
+++ b/src/plugins/vis_types/vega/jest.config.js
@@ -8,6 +8,6 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../..',
-  roots: ['<rootDir>/src/plugins/vis_type_metric'],
+  rootDir: '../../../..',
+  roots: ['<rootDir>/src/plugins/vis_types/vega'],
 };
diff --git a/src/plugins/vis_type_vega/kibana.json b/src/plugins/vis_types/vega/kibana.json
similarity index 100%
rename from src/plugins/vis_type_vega/kibana.json
rename to src/plugins/vis_types/vega/kibana.json
diff --git a/src/plugins/vis_type_vega/public/__snapshots__/vega_visualization.test.js.snap b/src/plugins/vis_types/vega/public/__snapshots__/vega_visualization.test.js.snap
similarity index 100%
rename from src/plugins/vis_type_vega/public/__snapshots__/vega_visualization.test.js.snap
rename to src/plugins/vis_types/vega/public/__snapshots__/vega_visualization.test.js.snap
diff --git a/src/plugins/vis_type_vega/public/components/experimental_map_vis_info.tsx b/src/plugins/vis_types/vega/public/components/experimental_map_vis_info.tsx
similarity index 96%
rename from src/plugins/vis_type_vega/public/components/experimental_map_vis_info.tsx
rename to src/plugins/vis_types/vega/public/components/experimental_map_vis_info.tsx
index ca0cb0f0ff797..2de6eb490196c 100644
--- a/src/plugins/vis_type_vega/public/components/experimental_map_vis_info.tsx
+++ b/src/plugins/vis_types/vega/public/components/experimental_map_vis_info.tsx
@@ -10,7 +10,7 @@ import { parse } from 'hjson';
 import React from 'react';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Vis } from '../../../visualizations/public';
+import { Vis } from '../../../../visualizations/public';
 
 function ExperimentalMapLayerInfo() {
   const title = (
diff --git a/src/plugins/vis_type_vega/public/components/vega_actions_menu.tsx b/src/plugins/vis_types/vega/public/components/vega_actions_menu.tsx
similarity index 100%
rename from src/plugins/vis_type_vega/public/components/vega_actions_menu.tsx
rename to src/plugins/vis_types/vega/public/components/vega_actions_menu.tsx
diff --git a/src/plugins/vis_type_vega/public/components/vega_editor.scss b/src/plugins/vis_types/vega/public/components/vega_editor.scss
similarity index 100%
rename from src/plugins/vis_type_vega/public/components/vega_editor.scss
rename to src/plugins/vis_types/vega/public/components/vega_editor.scss
diff --git a/src/plugins/vis_type_vega/public/components/vega_help_menu.tsx b/src/plugins/vis_types/vega/public/components/vega_help_menu.tsx
similarity index 100%
rename from src/plugins/vis_type_vega/public/components/vega_help_menu.tsx
rename to src/plugins/vis_types/vega/public/components/vega_help_menu.tsx
diff --git a/src/plugins/vis_type_vega/public/components/vega_vis.scss b/src/plugins/vis_types/vega/public/components/vega_vis.scss
similarity index 100%
rename from src/plugins/vis_type_vega/public/components/vega_vis.scss
rename to src/plugins/vis_types/vega/public/components/vega_vis.scss
diff --git a/src/plugins/vis_type_vega/public/components/vega_vis_component.tsx b/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx
similarity index 100%
rename from src/plugins/vis_type_vega/public/components/vega_vis_component.tsx
rename to src/plugins/vis_types/vega/public/components/vega_vis_component.tsx
diff --git a/src/plugins/vis_type_vega/public/components/vega_vis_editor.tsx b/src/plugins/vis_types/vega/public/components/vega_vis_editor.tsx
similarity index 97%
rename from src/plugins/vis_type_vega/public/components/vega_vis_editor.tsx
rename to src/plugins/vis_types/vega/public/components/vega_vis_editor.tsx
index 9150b31343799..d2f586eac9885 100644
--- a/src/plugins/vis_type_vega/public/components/vega_vis_editor.tsx
+++ b/src/plugins/vis_types/vega/public/components/vega_vis_editor.tsx
@@ -13,7 +13,7 @@ import 'brace/mode/hjson';
 import { i18n } from '@kbn/i18n';
 
 import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { EuiCodeEditor } from '../../../es_ui_shared/public';
+import { EuiCodeEditor } from '../../../../es_ui_shared/public';
 import { getNotifications } from '../services';
 import { VisParams } from '../vega_fn';
 import { VegaHelpMenu } from './vega_help_menu';
diff --git a/src/plugins/vis_type_vega/public/components/vega_vis_editor_lazy.tsx b/src/plugins/vis_types/vega/public/components/vega_vis_editor_lazy.tsx
similarity index 100%
rename from src/plugins/vis_type_vega/public/components/vega_vis_editor_lazy.tsx
rename to src/plugins/vis_types/vega/public/components/vega_vis_editor_lazy.tsx
diff --git a/src/plugins/vis_type_vega/public/data_model/ems_file_parser.ts b/src/plugins/vis_types/vega/public/data_model/ems_file_parser.ts
similarity index 97%
rename from src/plugins/vis_type_vega/public/data_model/ems_file_parser.ts
rename to src/plugins/vis_types/vega/public/data_model/ems_file_parser.ts
index c79ebe02c0d3f..3001da2008e40 100644
--- a/src/plugins/vis_type_vega/public/data_model/ems_file_parser.ts
+++ b/src/plugins/vis_types/vega/public/data_model/ems_file_parser.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
 import { bypassExternalUrlCheck } from '../vega_view/vega_base_view';
-import { IServiceSettings, FileLayer } from '../../../maps_ems/public';
+import { IServiceSettings, FileLayer } from '../../../../maps_ems/public';
 import { Data, UrlObject, EmsQueryRequest } from './types';
 
 /**
diff --git a/src/plugins/vis_type_vega/public/data_model/es_query_parser.test.js b/src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js
similarity index 100%
rename from src/plugins/vis_type_vega/public/data_model/es_query_parser.test.js
rename to src/plugins/vis_types/vega/public/data_model/es_query_parser.test.js
diff --git a/src/plugins/vis_type_vega/public/data_model/es_query_parser.ts b/src/plugins/vis_types/vega/public/data_model/es_query_parser.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/data_model/es_query_parser.ts
rename to src/plugins/vis_types/vega/public/data_model/es_query_parser.ts
diff --git a/src/plugins/vis_type_vega/public/data_model/search_api.test.ts b/src/plugins/vis_types/vega/public/data_model/search_api.test.ts
similarity index 95%
rename from src/plugins/vis_type_vega/public/data_model/search_api.test.ts
rename to src/plugins/vis_types/vega/public/data_model/search_api.test.ts
index d0739453e43ec..27dc1627ae229 100644
--- a/src/plugins/vis_type_vega/public/data_model/search_api.test.ts
+++ b/src/plugins/vis_types/vega/public/data_model/search_api.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { extendSearchParamsWithRuntimeFields } from './search_api';
-import { dataPluginMock } from '../../../data/public/mocks';
+import { dataPluginMock } from '../../../../data/public/mocks';
 
-import { getSearchParamsFromRequest, DataPublicPluginStart } from '../../../data/public';
+import { getSearchParamsFromRequest, DataPublicPluginStart } from '../../../../data/public';
 
 const mockComputedFields = (
   dataStart: DataPublicPluginStart,
diff --git a/src/plugins/vis_type_vega/public/data_model/search_api.ts b/src/plugins/vis_types/vega/public/data_model/search_api.ts
similarity index 95%
rename from src/plugins/vis_type_vega/public/data_model/search_api.ts
rename to src/plugins/vis_types/vega/public/data_model/search_api.ts
index efdbf96e54f05..e00cf647930a8 100644
--- a/src/plugins/vis_type_vega/public/data_model/search_api.ts
+++ b/src/plugins/vis_types/vega/public/data_model/search_api.ts
@@ -14,10 +14,10 @@ import {
   SearchRequest,
   DataPublicPluginStart,
   IEsSearchResponse,
-} from '../../../data/public';
-import { search as dataPluginSearch } from '../../../data/public';
+} from '../../../../data/public';
+import { search as dataPluginSearch } from '../../../../data/public';
 import type { VegaInspectorAdapters } from '../vega_inspector';
-import type { RequestResponder } from '../../../inspector/public';
+import type { RequestResponder } from '../../../../inspector/public';
 
 /** @internal **/
 export const extendSearchParamsWithRuntimeFields = async (
diff --git a/src/plugins/vis_type_vega/public/data_model/time_cache.test.js b/src/plugins/vis_types/vega/public/data_model/time_cache.test.js
similarity index 100%
rename from src/plugins/vis_type_vega/public/data_model/time_cache.test.js
rename to src/plugins/vis_types/vega/public/data_model/time_cache.test.js
diff --git a/src/plugins/vis_type_vega/public/data_model/time_cache.ts b/src/plugins/vis_types/vega/public/data_model/time_cache.ts
similarity index 95%
rename from src/plugins/vis_type_vega/public/data_model/time_cache.ts
rename to src/plugins/vis_types/vega/public/data_model/time_cache.ts
index 13c01b5fe83bc..cc9619e143437 100644
--- a/src/plugins/vis_type_vega/public/data_model/time_cache.ts
+++ b/src/plugins/vis_types/vega/public/data_model/time_cache.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { TimefilterContract } from '../../../data/public';
-import { TimeRange } from '../../../data/common';
+import { TimefilterContract } from '../../../../data/public';
+import { TimeRange } from '../../../../data/common';
 import { CacheBounds } from './types';
 
 /**
diff --git a/src/plugins/vis_type_vega/public/data_model/types.ts b/src/plugins/vis_types/vega/public/data_model/types.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/data_model/types.ts
rename to src/plugins/vis_types/vega/public/data_model/types.ts
diff --git a/src/plugins/vis_type_vega/public/data_model/url_parser.ts b/src/plugins/vis_types/vega/public/data_model/url_parser.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/data_model/url_parser.ts
rename to src/plugins/vis_types/vega/public/data_model/url_parser.ts
diff --git a/src/plugins/vis_type_vega/public/data_model/utils.ts b/src/plugins/vis_types/vega/public/data_model/utils.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/data_model/utils.ts
rename to src/plugins/vis_types/vega/public/data_model/utils.ts
diff --git a/src/plugins/vis_type_vega/public/data_model/vega_parser.test.js b/src/plugins/vis_types/vega/public/data_model/vega_parser.test.js
similarity index 100%
rename from src/plugins/vis_type_vega/public/data_model/vega_parser.test.js
rename to src/plugins/vis_types/vega/public/data_model/vega_parser.test.js
diff --git a/src/plugins/vis_type_vega/public/data_model/vega_parser.ts b/src/plugins/vis_types/vega/public/data_model/vega_parser.ts
similarity index 99%
rename from src/plugins/vis_type_vega/public/data_model/vega_parser.ts
rename to src/plugins/vis_types/vega/public/data_model/vega_parser.ts
index bc7d72c042841..3ae95c0393b5a 100644
--- a/src/plugins/vis_type_vega/public/data_model/vega_parser.ts
+++ b/src/plugins/vis_types/vega/public/data_model/vega_parser.ts
@@ -22,7 +22,7 @@ import { EmsFileParser } from './ems_file_parser';
 import { UrlParser } from './url_parser';
 import { SearchAPI } from './search_api';
 import { TimeCache } from './time_cache';
-import { IServiceSettings } from '../../../maps_ems/public';
+import { IServiceSettings } from '../../../../maps_ems/public';
 import {
   Bool,
   Data,
diff --git a/src/plugins/vis_type_vega/public/default.spec.hjson b/src/plugins/vis_types/vega/public/default.spec.hjson
similarity index 100%
rename from src/plugins/vis_type_vega/public/default.spec.hjson
rename to src/plugins/vis_types/vega/public/default.spec.hjson
diff --git a/src/plugins/vis_type_vega/public/default_spec.ts b/src/plugins/vis_types/vega/public/default_spec.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/default_spec.ts
rename to src/plugins/vis_types/vega/public/default_spec.ts
diff --git a/src/plugins/vis_type_vega/public/index.ts b/src/plugins/vis_types/vega/public/index.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/index.ts
rename to src/plugins/vis_types/vega/public/index.ts
diff --git a/src/plugins/vis_type_vega/public/lib/extract_index_pattern.test.ts b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.test.ts
similarity index 97%
rename from src/plugins/vis_type_vega/public/lib/extract_index_pattern.test.ts
rename to src/plugins/vis_types/vega/public/lib/extract_index_pattern.test.ts
index 6feb8fce9c5a3..39aadc009b93c 100644
--- a/src/plugins/vis_type_vega/public/lib/extract_index_pattern.test.ts
+++ b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { dataPluginMock } from '../../../data/public/mocks';
+import { dataPluginMock } from '../../../../data/public/mocks';
 import { extractIndexPatternsFromSpec } from './extract_index_pattern';
 import { setData } from '../services';
 
diff --git a/src/plugins/vis_type_vega/public/lib/extract_index_pattern.ts b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.ts
similarity index 94%
rename from src/plugins/vis_type_vega/public/lib/extract_index_pattern.ts
rename to src/plugins/vis_types/vega/public/lib/extract_index_pattern.ts
index 81f30ca9bbe2c..0d25db665ce7f 100644
--- a/src/plugins/vis_type_vega/public/lib/extract_index_pattern.ts
+++ b/src/plugins/vis_types/vega/public/lib/extract_index_pattern.ts
@@ -10,7 +10,7 @@ import { flatten } from 'lodash';
 import { getData } from '../services';
 
 import type { Data, VegaSpec } from '../data_model/types';
-import type { IndexPattern } from '../../../data/public';
+import type { IndexPattern } from '../../../../data/public';
 
 export const extractIndexPatternsFromSpec = async (spec: VegaSpec) => {
   const { indexPatterns } = getData();
diff --git a/src/plugins/vis_type_vega/public/lib/vega_state_restorer.test.ts b/src/plugins/vis_types/vega/public/lib/vega_state_restorer.test.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/lib/vega_state_restorer.test.ts
rename to src/plugins/vis_types/vega/public/lib/vega_state_restorer.test.ts
diff --git a/src/plugins/vis_type_vega/public/lib/vega_state_restorer.ts b/src/plugins/vis_types/vega/public/lib/vega_state_restorer.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/lib/vega_state_restorer.ts
rename to src/plugins/vis_types/vega/public/lib/vega_state_restorer.ts
diff --git a/src/plugins/vis_type_vega/public/plugin.ts b/src/plugins/vis_types/vega/public/plugin.ts
similarity index 89%
rename from src/plugins/vis_type_vega/public/plugin.ts
rename to src/plugins/vis_types/vega/public/plugin.ts
index f935362d21604..942c1673ad202 100644
--- a/src/plugins/vis_type_vega/public/plugin.ts
+++ b/src/plugins/vis_types/vega/public/plugin.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
-import { DataPublicPluginSetup, DataPublicPluginStart } from '../../data/public';
-import { VisualizationsSetup } from '../../visualizations/public';
-import { Setup as InspectorSetup } from '../../inspector/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../../core/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
+import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../data/public';
+import { VisualizationsSetup } from '../../../visualizations/public';
+import { Setup as InspectorSetup } from '../../../inspector/public';
 
 import {
   setNotifications,
@@ -24,7 +24,7 @@ import {
 
 import { createVegaFn } from './vega_fn';
 import { createVegaTypeDefinition } from './vega_type';
-import { IServiceSettings, MapsEmsPluginSetup } from '../../maps_ems/public';
+import { IServiceSettings, MapsEmsPluginSetup } from '../../../maps_ems/public';
 import { ConfigSchema } from '../config';
 
 import { getVegaInspectorView } from './vega_inspector';
diff --git a/src/plugins/vis_type_vega/public/services.ts b/src/plugins/vis_types/vega/public/services.ts
similarity index 91%
rename from src/plugins/vis_type_vega/public/services.ts
rename to src/plugins/vis_types/vega/public/services.ts
index f67fe4794e783..1cdb24ff7b02c 100644
--- a/src/plugins/vis_type_vega/public/services.ts
+++ b/src/plugins/vis_types/vega/public/services.ts
@@ -8,8 +8,8 @@
 
 import { CoreStart, NotificationsStart, IUiSettingsClient, DocLinksStart } from 'src/core/public';
 
-import { DataPublicPluginStart } from '../../data/public';
-import { createGetterSetter } from '../../kibana_utils/public';
+import { DataPublicPluginStart } from '../../../data/public';
+import { createGetterSetter } from '../../../kibana_utils/public';
 import { MapServiceSettings } from './vega_view/vega_map_view/map_service_settings';
 
 export const [getData, setData] = createGetterSetter<DataPublicPluginStart>('Data');
diff --git a/src/plugins/vis_type_vega/public/test_utils/default.spec.json b/src/plugins/vis_types/vega/public/test_utils/default.spec.json
similarity index 100%
rename from src/plugins/vis_type_vega/public/test_utils/default.spec.json
rename to src/plugins/vis_types/vega/public/test_utils/default.spec.json
diff --git a/src/plugins/vis_type_vega/public/test_utils/vega_graph.json b/src/plugins/vis_types/vega/public/test_utils/vega_graph.json
similarity index 100%
rename from src/plugins/vis_type_vega/public/test_utils/vega_graph.json
rename to src/plugins/vis_types/vega/public/test_utils/vega_graph.json
diff --git a/src/plugins/vis_type_vega/public/test_utils/vega_map_test.json b/src/plugins/vis_types/vega/public/test_utils/vega_map_test.json
similarity index 100%
rename from src/plugins/vis_type_vega/public/test_utils/vega_map_test.json
rename to src/plugins/vis_types/vega/public/test_utils/vega_map_test.json
diff --git a/src/plugins/vis_type_vega/public/test_utils/vegalite_graph.json b/src/plugins/vis_types/vega/public/test_utils/vegalite_graph.json
similarity index 100%
rename from src/plugins/vis_type_vega/public/test_utils/vegalite_graph.json
rename to src/plugins/vis_types/vega/public/test_utils/vegalite_graph.json
diff --git a/src/plugins/vis_type_vega/public/to_ast.ts b/src/plugins/vis_types/vega/public/to_ast.ts
similarity index 90%
rename from src/plugins/vis_type_vega/public/to_ast.ts
rename to src/plugins/vis_types/vega/public/to_ast.ts
index 8f0bd952bc54e..f9ff7effafe49 100644
--- a/src/plugins/vis_type_vega/public/to_ast.ts
+++ b/src/plugins/vis_types/vega/public/to_ast.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { buildExpression, buildExpressionFunction } from '../../expressions/public';
-import { Vis } from '../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '../../../visualizations/public';
 import { VegaExpressionFunctionDefinition, VisParams } from './vega_fn';
 
 export const toExpressionAst = (vis: Vis<VisParams>) => {
diff --git a/src/plugins/vis_type_vega/public/vega_fn.ts b/src/plugins/vis_types/vega/public/vega_fn.ts
similarity index 89%
rename from src/plugins/vis_type_vega/public/vega_fn.ts
rename to src/plugins/vis_types/vega/public/vega_fn.ts
index 775bd2623028b..cbdc131ab7e2a 100644
--- a/src/plugins/vis_type_vega/public/vega_fn.ts
+++ b/src/plugins/vis_types/vega/public/vega_fn.ts
@@ -8,12 +8,16 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ExecutionContextSearch } from '../../data/public';
-import { ExecutionContext, ExpressionFunctionDefinition, Render } from '../../expressions/public';
+import { ExecutionContextSearch } from '../../../data/public';
+import {
+  ExecutionContext,
+  ExpressionFunctionDefinition,
+  Render,
+} from '../../../expressions/public';
 import { VegaVisualizationDependencies } from './plugin';
 import { createVegaRequestHandler } from './vega_request_handler';
 import { VegaInspectorAdapters } from './vega_inspector/index';
-import { KibanaContext, TimeRange, Query } from '../../data/public';
+import { KibanaContext, TimeRange, Query } from '../../../data/public';
 import { VegaParser } from './data_model/vega_parser';
 
 type Input = KibanaContext | { type: 'null' };
diff --git a/src/plugins/vis_type_vega/public/vega_inspector/components/data_viewer.tsx b/src/plugins/vis_types/vega/public/vega_inspector/components/data_viewer.tsx
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_inspector/components/data_viewer.tsx
rename to src/plugins/vis_types/vega/public/vega_inspector/components/data_viewer.tsx
diff --git a/src/plugins/vis_type_vega/public/vega_inspector/components/index.ts b/src/plugins/vis_types/vega/public/vega_inspector/components/index.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_inspector/components/index.ts
rename to src/plugins/vis_types/vega/public/vega_inspector/components/index.ts
diff --git a/src/plugins/vis_type_vega/public/vega_inspector/components/inspector_data_grid.tsx b/src/plugins/vis_types/vega/public/vega_inspector/components/inspector_data_grid.tsx
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_inspector/components/inspector_data_grid.tsx
rename to src/plugins/vis_types/vega/public/vega_inspector/components/inspector_data_grid.tsx
diff --git a/src/plugins/vis_type_vega/public/vega_inspector/components/signal_viewer.tsx b/src/plugins/vis_types/vega/public/vega_inspector/components/signal_viewer.tsx
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_inspector/components/signal_viewer.tsx
rename to src/plugins/vis_types/vega/public/vega_inspector/components/signal_viewer.tsx
diff --git a/src/plugins/vis_type_vega/public/vega_inspector/components/spec_viewer.tsx b/src/plugins/vis_types/vega/public/vega_inspector/components/spec_viewer.tsx
similarity index 97%
rename from src/plugins/vis_type_vega/public/vega_inspector/components/spec_viewer.tsx
rename to src/plugins/vis_types/vega/public/vega_inspector/components/spec_viewer.tsx
index 135c23b21d7d4..9c13857076d8b 100644
--- a/src/plugins/vis_type_vega/public/vega_inspector/components/spec_viewer.tsx
+++ b/src/plugins/vis_types/vega/public/vega_inspector/components/spec_viewer.tsx
@@ -19,7 +19,7 @@ import {
   CommonProps,
 } from '@elastic/eui';
 import { VegaAdapter } from '../vega_adapter';
-import { CodeEditor } from '../../../../kibana_react/public';
+import { CodeEditor } from '../../../../../kibana_react/public';
 
 interface SpecViewerProps extends CommonProps {
   vegaAdapter: VegaAdapter;
diff --git a/src/plugins/vis_type_vega/public/vega_inspector/index.ts b/src/plugins/vis_types/vega/public/vega_inspector/index.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_inspector/index.ts
rename to src/plugins/vis_types/vega/public/vega_inspector/index.ts
diff --git a/src/plugins/vis_type_vega/public/vega_inspector/vega_adapter.ts b/src/plugins/vis_types/vega/public/vega_inspector/vega_adapter.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_inspector/vega_adapter.ts
rename to src/plugins/vis_types/vega/public/vega_inspector/vega_adapter.ts
diff --git a/src/plugins/vis_type_vega/public/vega_inspector/vega_data_inspector.scss b/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.scss
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_inspector/vega_data_inspector.scss
rename to src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.scss
diff --git a/src/plugins/vis_type_vega/public/vega_inspector/vega_data_inspector.tsx b/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
similarity index 96%
rename from src/plugins/vis_type_vega/public/vega_inspector/vega_data_inspector.tsx
rename to src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
index 497c8a9ed1af3..75618df307150 100644
--- a/src/plugins/vis_type_vega/public/vega_inspector/vega_data_inspector.tsx
+++ b/src/plugins/vis_types/vega/public/vega_inspector/vega_data_inspector.tsx
@@ -14,7 +14,7 @@ import { EuiTabbedContent } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { VegaInspectorAdapters } from './vega_inspector';
 import { DataViewer, SignalViewer, SpecViewer } from './components';
-import { InspectorViewProps } from '../../../inspector/public';
+import { InspectorViewProps } from '../../../../inspector/public';
 
 export type VegaDataInspectorProps = InspectorViewProps<VegaInspectorAdapters>;
 
diff --git a/src/plugins/vis_type_vega/public/vega_inspector/vega_inspector.tsx b/src/plugins/vis_types/vega/public/vega_inspector/vega_inspector.tsx
similarity index 94%
rename from src/plugins/vis_type_vega/public/vega_inspector/vega_inspector.tsx
rename to src/plugins/vis_types/vega/public/vega_inspector/vega_inspector.tsx
index e02ae780acab1..1ca95b84f53ae 100644
--- a/src/plugins/vis_type_vega/public/vega_inspector/vega_inspector.tsx
+++ b/src/plugins/vis_types/vega/public/vega_inspector/vega_inspector.tsx
@@ -11,8 +11,8 @@ import { EuiLoadingSpinner } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 import { IUiSettingsClient } from 'kibana/public';
-import { KibanaContextProvider } from '../../../kibana_react/public';
-import { Adapters, RequestAdapter, InspectorViewDescription } from '../../../inspector/public';
+import { KibanaContextProvider } from '../../../../kibana_react/public';
+import { Adapters, RequestAdapter, InspectorViewDescription } from '../../../../inspector/public';
 import { VegaAdapter } from './vega_adapter';
 import type { VegaDataInspectorProps } from './vega_data_inspector';
 
diff --git a/src/plugins/vis_type_vega/public/vega_request_handler.ts b/src/plugins/vis_types/vega/public/vega_request_handler.ts
similarity index 96%
rename from src/plugins/vis_type_vega/public/vega_request_handler.ts
rename to src/plugins/vis_types/vega/public/vega_request_handler.ts
index 4f07785f43c4f..2ae7169c2f732 100644
--- a/src/plugins/vis_type_vega/public/vega_request_handler.ts
+++ b/src/plugins/vis_types/vega/public/vega_request_handler.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import type { KibanaExecutionContext } from 'src/core/public';
-import { Filter, esQuery, TimeRange, Query } from '../../data/public';
+import { Filter, esQuery, TimeRange, Query } from '../../../data/public';
 
 import { SearchAPI } from './data_model/search_api';
 import { TimeCache } from './data_model/time_cache';
diff --git a/src/plugins/vis_type_vega/public/vega_type.ts b/src/plugins/vis_types/vega/public/vega_type.ts
similarity index 95%
rename from src/plugins/vis_type_vega/public/vega_type.ts
rename to src/plugins/vis_types/vega/public/vega_type.ts
index 902f79d03e680..74899f5cfb3a4 100644
--- a/src/plugins/vis_type_vega/public/vega_type.ts
+++ b/src/plugins/vis_types/vega/public/vega_type.ts
@@ -9,8 +9,8 @@
 import { i18n } from '@kbn/i18n';
 import { parse } from 'hjson';
 
-import { DefaultEditorSize } from '../../vis_default_editor/public';
-import { VIS_EVENT_TO_TRIGGER, VisGroups, VisTypeDefinition } from '../../visualizations/public';
+import { DefaultEditorSize } from '../../../vis_default_editor/public';
+import { VIS_EVENT_TO_TRIGGER, VisGroups, VisTypeDefinition } from '../../../visualizations/public';
 
 import { getDefaultSpec } from './default_spec';
 import { extractIndexPatternsFromSpec } from './lib/extract_index_pattern';
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_base_view.d.ts b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_base_view.d.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_base_view.js b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js
similarity index 99%
rename from src/plugins/vis_type_vega/public/vega_view/vega_base_view.js
rename to src/plugins/vis_types/vega/public/vega_view/vega_base_view.js
index 0cf3f16c3d20c..a41197293bbdc 100644
--- a/src/plugins/vis_type_vega/public/vega_view/vega_base_view.js
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.js
@@ -16,7 +16,7 @@ import { Utils } from '../data_model/utils';
 import { euiPaletteColorBlind } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { TooltipHandler } from './vega_tooltip';
-import { esFilters } from '../../../data/public';
+import { esFilters } from '../../../../data/public';
 
 import { getEnableExternalUrls, getData } from '../services';
 import { extractIndexPatternsFromSpec } from '../lib/extract_index_pattern';
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/constants.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/constants.ts
similarity index 94%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/constants.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/constants.ts
index 04957fda5b8ff..a2a3cd464276f 100644
--- a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/constants.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/constants.ts
@@ -7,7 +7,7 @@
  */
 
 import type { Style } from '@kbn/mapbox-gl';
-import { TMS_IN_YML_ID } from '../../../../maps_ems/public';
+import { TMS_IN_YML_ID } from '../../../../../maps_ems/public';
 
 export const vegaLayerId = 'vega';
 export const userConfiguredLayerId = TMS_IN_YML_ID;
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/index.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/index.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/index.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/index.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/tms_raster_layer.test.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/tms_raster_layer.test.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/tms_raster_layer.test.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/tms_raster_layer.test.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/tms_raster_layer.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/tms_raster_layer.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/tms_raster_layer.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/tms_raster_layer.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/types.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/types.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/types.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/types.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/vega_layer.test.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/vega_layer.test.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/vega_layer.test.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/vega_layer.test.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/vega_layer.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/vega_layer.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/layers/vega_layer.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/layers/vega_layer.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/map_service_settings.test.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/map_service_settings.test.ts
similarity index 98%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/map_service_settings.test.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/map_service_settings.test.ts
index c459220d4aa86..95fee2ea3820d 100644
--- a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/map_service_settings.test.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/map_service_settings.test.ts
@@ -10,7 +10,7 @@ import { get } from 'lodash';
 import { uiSettingsServiceMock } from 'src/core/public/mocks';
 
 import { MapServiceSettings, getAttributionsForTmsService } from './map_service_settings';
-import type { MapsEmsConfig } from '../../../../maps_ems/public';
+import type { MapsEmsConfig } from '../../../../../maps_ems/public';
 import { EMSClient, TMSService } from '@elastic/ems-client';
 import { setUISettings } from '../../services';
 
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/map_service_settings.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/map_service_settings.ts
similarity index 97%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/map_service_settings.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/map_service_settings.ts
index 8874db7737a4e..3399d0628ad65 100644
--- a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/map_service_settings.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/map_service_settings.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import type { EMSClient, TMSService } from '@elastic/ems-client';
 import { getUISettings } from '../../services';
 import { userConfiguredLayerId } from './constants';
-import type { MapsEmsConfig } from '../../../../maps_ems/public';
+import type { MapsEmsConfig } from '../../../../../maps_ems/public';
 
 type EmsClientConfig = ConstructorParameters<typeof EMSClient>[0];
 
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/utils/index.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/utils/index.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/utils/index.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/utils/index.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/utils/validation_helper.test.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/utils/validation_helper.test.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/utils/validation_helper.test.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/utils/validation_helper.test.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/utils/validation_helper.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/utils/validation_helper.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/utils/validation_helper.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/utils/validation_helper.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/utils/vsi_helper.test.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/utils/vsi_helper.test.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/utils/vsi_helper.test.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/utils/vsi_helper.test.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/utils/vsi_helper.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/utils/vsi_helper.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/utils/vsi_helper.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/utils/vsi_helper.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/vega_map_view.scss b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/vega_map_view.scss
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/vega_map_view.scss
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/vega_map_view.scss
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/view.test.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts
similarity index 97%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/view.test.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts
index 17a098649ebbf..e4bf4977094fd 100644
--- a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/view.test.ts
+++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts
@@ -15,9 +15,9 @@ import { VegaParser } from '../../data_model/vega_parser';
 import { TimeCache } from '../../data_model/time_cache';
 import { SearchAPI } from '../../data_model/search_api';
 import vegaMap from '../../test_utils/vega_map_test.json';
-import { coreMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import type { IServiceSettings, MapsEmsConfig } from '../../../../maps_ems/public';
+import { coreMock } from '../../../../../../core/public/mocks';
+import { dataPluginMock } from '../../../../../data/public/mocks';
+import type { IServiceSettings, MapsEmsConfig } from '../../../../../maps_ems/public';
 import { MapServiceSettings } from './map_service_settings';
 import { userConfiguredLayerId } from './constants';
 import {
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view/view.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_map_view/view.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_tooltip.js b/src/plugins/vis_types/vega/public/vega_view/vega_tooltip.js
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_tooltip.js
rename to src/plugins/vis_types/vega/public/vega_view/vega_tooltip.js
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_view.d.ts b/src/plugins/vis_types/vega/public/vega_view/vega_view.d.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_view.d.ts
rename to src/plugins/vis_types/vega/public/vega_view/vega_view.d.ts
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_view.js b/src/plugins/vis_types/vega/public/vega_view/vega_view.js
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_view/vega_view.js
rename to src/plugins/vis_types/vega/public/vega_view/vega_view.js
diff --git a/src/plugins/vis_type_vega/public/vega_vis_renderer.tsx b/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx
similarity index 94%
rename from src/plugins/vis_type_vega/public/vega_vis_renderer.tsx
rename to src/plugins/vis_types/vega/public/vega_vis_renderer.tsx
index 0d9ba493281fa..77af6dfdcf042 100644
--- a/src/plugins/vis_type_vega/public/vega_vis_renderer.tsx
+++ b/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx
@@ -10,7 +10,7 @@ import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
 import { ExpressionRenderDefinition } from 'src/plugins/expressions';
-import { VisualizationContainer } from '../../visualizations/public';
+import { VisualizationContainer } from '../../../visualizations/public';
 import { VegaVisualizationDependencies } from './plugin';
 import { RenderValue } from './vega_fn';
 const VegaVisComponent = lazy(() => import('./components/vega_vis_component'));
diff --git a/src/plugins/vis_type_vega/public/vega_visualization.test.js b/src/plugins/vis_types/vega/public/vega_visualization.test.js
similarity index 97%
rename from src/plugins/vis_type_vega/public/vega_visualization.test.js
rename to src/plugins/vis_types/vega/public/vega_visualization.test.js
index ba1121b8894e0..8c47b2fdfd7c0 100644
--- a/src/plugins/vis_type_vega/public/vega_visualization.test.js
+++ b/src/plugins/vis_types/vega/public/vega_visualization.test.js
@@ -19,8 +19,8 @@ import { VegaParser } from './data_model/vega_parser';
 import { SearchAPI } from './data_model/search_api';
 
 import { setInjectedVars, setData, setNotifications } from './services';
-import { coreMock } from '../../../core/public/mocks';
-import { dataPluginMock } from '../../data/public/mocks';
+import { coreMock } from '../../../../core/public/mocks';
+import { dataPluginMock } from '../../../data/public/mocks';
 
 jest.mock('./default_spec', () => ({
   getDefaultSpec: () => jest.requireActual('./test_utils/default.spec.json'),
diff --git a/src/plugins/vis_type_vega/public/vega_visualization.ts b/src/plugins/vis_types/vega/public/vega_visualization.ts
similarity index 100%
rename from src/plugins/vis_type_vega/public/vega_visualization.ts
rename to src/plugins/vis_types/vega/public/vega_visualization.ts
diff --git a/src/plugins/vis_type_vega/server/index.ts b/src/plugins/vis_types/vega/server/index.ts
similarity index 100%
rename from src/plugins/vis_type_vega/server/index.ts
rename to src/plugins/vis_types/vega/server/index.ts
diff --git a/src/plugins/vis_type_vega/server/plugin.ts b/src/plugins/vis_types/vega/server/plugin.ts
similarity index 97%
rename from src/plugins/vis_type_vega/server/plugin.ts
rename to src/plugins/vis_types/vega/server/plugin.ts
index b884dcd1a1d15..51a783456d6b2 100644
--- a/src/plugins/vis_type_vega/server/plugin.ts
+++ b/src/plugins/vis_types/vega/server/plugin.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/server';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../../core/server';
 import { registerVegaUsageCollector } from './usage_collector';
 import {
   ConfigObservable,
diff --git a/src/plugins/vis_type_vega/server/types.ts b/src/plugins/vis_types/vega/server/types.ts
similarity index 87%
rename from src/plugins/vis_type_vega/server/types.ts
rename to src/plugins/vis_types/vega/server/types.ts
index affd93dedb8ca..626d22b59181a 100644
--- a/src/plugins/vis_type_vega/server/types.ts
+++ b/src/plugins/vis_types/vega/server/types.ts
@@ -8,8 +8,8 @@
 
 import { Observable } from 'rxjs';
 import { SharedGlobalConfig } from 'kibana/server';
-import { HomeServerPluginSetup } from '../../home/server';
-import { UsageCollectionSetup } from '../../usage_collection/server';
+import { HomeServerPluginSetup } from '../../../home/server';
+import { UsageCollectionSetup } from '../../../usage_collection/server';
 
 export type ConfigObservable = Observable<SharedGlobalConfig>;
 
diff --git a/src/plugins/vis_type_vega/server/usage_collector/get_usage_collector.mock.ts b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.mock.ts
similarity index 100%
rename from src/plugins/vis_type_vega/server/usage_collector/get_usage_collector.mock.ts
rename to src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.mock.ts
diff --git a/src/plugins/vis_type_vega/server/usage_collector/get_usage_collector.test.ts b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.test.ts
similarity index 94%
rename from src/plugins/vis_type_vega/server/usage_collector/get_usage_collector.test.ts
rename to src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.test.ts
index 82aba087dedc1..aa1b8e447bbca 100644
--- a/src/plugins/vis_type_vega/server/usage_collector/get_usage_collector.test.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { getStats } from './get_usage_collector';
-import { createCollectorFetchContextMock } from '../../../usage_collection/server/mocks';
-import type { HomeServerPluginSetup } from '../../../home/server';
-import type { SavedObjectsClientContract } from '../../../../core/server';
+import { createCollectorFetchContextMock } from '../../../../usage_collection/server/mocks';
+import type { HomeServerPluginSetup } from '../../../../home/server';
+import type { SavedObjectsClientContract } from '../../../../../core/server';
 
 const mockedSavedObjects = [
   // vega-lite lib spec
diff --git a/src/plugins/vis_type_vega/server/usage_collector/get_usage_collector.ts b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.ts
similarity index 95%
rename from src/plugins/vis_type_vega/server/usage_collector/get_usage_collector.ts
rename to src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.ts
index ae99021745a0c..67fcb742c4240 100644
--- a/src/plugins/vis_type_vega/server/usage_collector/get_usage_collector.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/get_usage_collector.ts
@@ -8,8 +8,11 @@
 
 import { parse } from 'hjson';
 
-import type { SavedObjectsClientContract, SavedObjectsFindResult } from '../../../../core/server';
-import type { SavedVisState } from '../../../visualizations/common';
+import type {
+  SavedObjectsClientContract,
+  SavedObjectsFindResult,
+} from '../../../../../core/server';
+import type { SavedVisState } from '../../../../visualizations/common';
 import type { VegaSavedObjectAttributes, VisTypeVegaPluginSetupDependencies } from '../types';
 
 type UsageCollectorDependencies = Pick<VisTypeVegaPluginSetupDependencies, 'home'>;
diff --git a/src/plugins/vis_type_vega/server/usage_collector/index.ts b/src/plugins/vis_types/vega/server/usage_collector/index.ts
similarity index 100%
rename from src/plugins/vis_type_vega/server/usage_collector/index.ts
rename to src/plugins/vis_types/vega/server/usage_collector/index.ts
diff --git a/src/plugins/vis_type_vega/server/usage_collector/register_vega_collector.test.ts b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.test.ts
similarity index 95%
rename from src/plugins/vis_type_vega/server/usage_collector/register_vega_collector.test.ts
rename to src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.test.ts
index fc488540293ad..137dd2f17375c 100644
--- a/src/plugins/vis_type_vega/server/usage_collector/register_vega_collector.test.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.test.ts
@@ -9,11 +9,11 @@
 import {
   createUsageCollectionSetupMock,
   createCollectorFetchContextMock,
-} from '../../../usage_collection/server/mocks';
+} from '../../../../usage_collection/server/mocks';
 import { mockStats, mockGetStats } from './get_usage_collector.mock';
 import { registerVegaUsageCollector } from './register_vega_collector';
 
-import type { HomeServerPluginSetup } from '../../../home/server';
+import type { HomeServerPluginSetup } from '../../../../home/server';
 import type { ConfigObservable } from '../types';
 
 describe('registerVegaUsageCollector', () => {
diff --git a/src/plugins/vis_type_vega/server/usage_collector/register_vega_collector.ts b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.ts
similarity index 93%
rename from src/plugins/vis_type_vega/server/usage_collector/register_vega_collector.ts
rename to src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.ts
index ef65b58a8315b..27af5aa57e38b 100644
--- a/src/plugins/vis_type_vega/server/usage_collector/register_vega_collector.ts
+++ b/src/plugins/vis_types/vega/server/usage_collector/register_vega_collector.ts
@@ -7,7 +7,7 @@
  */
 
 import { getStats, VegaUsage } from './get_usage_collector';
-import type { UsageCollectionSetup } from '../../../usage_collection/server';
+import type { UsageCollectionSetup } from '../../../../usage_collection/server';
 import type { ConfigObservable, VisTypeVegaPluginSetupDependencies } from '../types';
 
 export function registerVegaUsageCollector(
diff --git a/src/plugins/vis_types/vega/tsconfig.json b/src/plugins/vis_types/vega/tsconfig.json
new file mode 100644
index 0000000000000..ed7690ac70d1a
--- /dev/null
+++ b/src/plugins/vis_types/vega/tsconfig.json
@@ -0,0 +1,31 @@
+{
+  "extends": "../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true,
+    "strictNullChecks": false
+  },
+  "include": [
+    "server/**/*",
+    "public/**/*",
+    "*.ts",
+    // have to declare *.json explicitly due to https://github.com/microsoft/TypeScript/issues/25636
+    "public/test_utils/vega_map_test.json"
+  ],
+  "references": [
+    { "path": "../../../core/tsconfig.json" },
+    { "path": "../../data/tsconfig.json" },
+    { "path": "../../visualizations/tsconfig.json" },
+    { "path": "../../maps_ems/tsconfig.json" },
+    { "path": "../../expressions/tsconfig.json" },
+    { "path": "../../inspector/tsconfig.json" },
+    { "path": "../../home/tsconfig.json" },
+    { "path": "../../usage_collection/tsconfig.json" },
+    { "path": "../../kibana_utils/tsconfig.json" },
+    { "path": "../../kibana_react/tsconfig.json" },
+    { "path": "../../vis_default_editor/tsconfig.json" },
+    { "path": "../../es_ui_shared/tsconfig.json" },
+  ]
+}
diff --git a/test/api_integration/apis/status/status.js b/test/api_integration/apis/status/status.js
index 22076b2cddbc5..e1545c448fce8 100644
--- a/test/api_integration/apis/status/status.js
+++ b/test/api_integration/apis/status/status.js
@@ -25,9 +25,10 @@ export default function ({ getService }) {
           expect(body.version.build_number).to.be.a('number');
 
           expect(body.status.overall).to.be.an('object');
-          expect(body.status.overall.state).to.be('green');
+          expect(body.status.overall.level).to.be('available');
 
-          expect(body.status.statuses).to.be.an('array');
+          expect(body.status.core).to.be.an('object');
+          expect(body.status.plugins).to.be.an('object');
 
           expect(body.metrics.collection_interval_in_millis).to.be.a('number');
 
diff --git a/test/common/services/es_archiver.ts b/test/common/services/es_archiver.ts
index d99a2e8d10236..2ea4b6ce3a434 100644
--- a/test/common/services/es_archiver.ts
+++ b/test/common/services/es_archiver.ts
@@ -8,8 +8,6 @@
 
 import { EsArchiver } from '@kbn/es-archiver';
 import { FtrProviderContext } from '../ftr_provider_context';
-
-// @ts-ignore not TS yet
 import * as KibanaServer from './kibana_server';
 
 export function EsArchiverProvider({ getService }: FtrProviderContext): EsArchiver {
diff --git a/test/functional/apps/dashboard/dashboard_back_button.ts b/test/functional/apps/dashboard/dashboard_back_button.ts
index 1e901cdbd48be..3b03ea525b903 100644
--- a/test/functional/apps/dashboard/dashboard_back_button.ts
+++ b/test/functional/apps/dashboard/dashboard_back_button.ts
@@ -14,12 +14,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');
   const PageObjects = getPageObjects(['dashboard', 'header', 'common', 'visualize', 'timePicker']);
   const browser = getService('browser');
+  const security = getService('security');
 
   describe('dashboard back button', () => {
     before(async () => {
       await esArchiver.loadIfNeeded(
         'test/functional/fixtures/es_archiver/dashboard/current/kibana'
       );
+      await security.testUser.setRoles(['kibana_admin', 'animals', 'test_logstash_reader']);
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
@@ -27,6 +29,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.dashboard.preserveCrossAppState();
     });
 
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
+
     it('after navigation from listing page to dashboard back button works', async () => {
       await PageObjects.dashboard.gotoDashboardLandingPage();
       await PageObjects.dashboard.loadSavedDashboard('dashboard with everything');
diff --git a/test/functional/apps/dashboard/dashboard_filter_bar.ts b/test/functional/apps/dashboard/dashboard_filter_bar.ts
index e1a15009afe51..2f561f3220158 100644
--- a/test/functional/apps/dashboard/dashboard_filter_bar.ts
+++ b/test/functional/apps/dashboard/dashboard_filter_bar.ts
@@ -20,6 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const browser = getService('browser');
+  const security = getService('security');
   const PageObjects = getPageObjects([
     'common',
     'dashboard',
@@ -32,12 +33,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('dashboard filter bar', () => {
     before(async () => {
       await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
+      await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader', 'animals']);
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
       await PageObjects.common.navigateToApp('dashboard');
     });
 
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
+
     describe('Add a filter bar', function () {
       before(async () => {
         await PageObjects.dashboard.gotoDashboardLandingPage();
@@ -181,7 +187,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       it('are added when a cell magnifying glass is clicked', async function () {
         await dashboardAddPanel.addSavedSearch('Rendering-Test:-saved-search');
         await PageObjects.dashboard.waitForRenderComplete();
-        const isLegacyDefault = PageObjects.discover.useLegacyTable();
+        const isLegacyDefault = await PageObjects.discover.useLegacyTable();
         if (isLegacyDefault) {
           await testSubjects.click('docTableCellFilter');
         } else {
diff --git a/test/functional/apps/dashboard/dashboard_state.ts b/test/functional/apps/dashboard/dashboard_state.ts
index 1a9cf3b7593a0..cd51faa4be0b7 100644
--- a/test/functional/apps/dashboard/dashboard_state.ts
+++ b/test/functional/apps/dashboard/dashboard_state.ts
@@ -171,7 +171,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     };
 
     const hardRefresh = async (newUrl: string) => {
-      // We need to add a timestamp to the URL because URL changes now only work with a hard refresh.
+      // We add a timestamp here to force a hard refresh
       await browser.get(newUrl.toString());
       const alert = await browser.getAlert();
       await alert?.accept();
@@ -186,16 +186,23 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await PageObjects.timePicker.setHistoricalDataRange();
       });
 
-      it('for query parameter', async function () {
-        const currentQuery = await queryBar.getQueryString();
-        expect(currentQuery).to.equal('');
+      const changeQuery = async (useHardRefresh: boolean, newQuery: string) => {
+        await queryBar.clickQuerySubmitButton();
+        const oldQuery = await queryBar.getQueryString();
         const currentUrl = await getUrlFromShare();
-        const newUrl = currentUrl.replace(`query:''`, `query:'hi:hello'`);
+        const newUrl = currentUrl.replace(`query:'${oldQuery}'`, `query:'${newQuery}'`);
+
+        await browser.get(newUrl.toString(), !useHardRefresh);
+        const queryBarContentsAfterRefresh = await queryBar.getQueryString();
+        expect(queryBarContentsAfterRefresh).to.equal(newQuery);
+      };
+
+      it('for query parameter with soft refresh', async function () {
+        await changeQuery(false, 'hi:goodbye');
+      });
 
-        // We need to add a timestamp to the URL because URL changes now only work with a hard refresh.
-        await browser.get(newUrl.toString());
-        const newQuery = await queryBar.getQueryString();
-        expect(newQuery).to.equal('hi:hello');
+      it('for query parameter with hard refresh', async function () {
+        await changeQuery(true, 'hi:hello');
         await queryBar.clearQuery();
         await queryBar.clickQuerySubmitButton();
       });
diff --git a/test/functional/apps/dashboard/data_shared_attributes.ts b/test/functional/apps/dashboard/data_shared_attributes.ts
index 34fd4ddb346ed..4b993287ffe42 100644
--- a/test/functional/apps/dashboard/data_shared_attributes.ts
+++ b/test/functional/apps/dashboard/data_shared_attributes.ts
@@ -15,6 +15,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const dashboardPanelActions = getService('dashboardPanelActions');
+  const security = getService('security');
   const PageObjects = getPageObjects(['common', 'dashboard', 'timePicker']);
 
   describe('dashboard data-shared attributes', function describeIndexTests() {
@@ -22,6 +23,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     before(async () => {
       await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
+      await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader', 'animals']);
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
@@ -31,6 +33,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.dashboard.waitForRenderComplete();
     });
 
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
+
     it('should have time picker with data-shared-timefilter-duration', async () => {
       await retry.try(async () => {
         const sharedData = await PageObjects.timePicker.getTimeDurationForSharing();
diff --git a/test/functional/apps/dashboard/legacy_urls.ts b/test/functional/apps/dashboard/legacy_urls.ts
index 96c7a5aac3f4b..b449c0f6728a5 100644
--- a/test/functional/apps/dashboard/legacy_urls.ts
+++ b/test/functional/apps/dashboard/legacy_urls.ts
@@ -32,7 +32,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('legacy urls', function describeIndexTests() {
     before(async function () {
-      await security.testUser.setRoles(['kibana_admin', 'animals']);
+      await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader', 'animals']);
       await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await PageObjects.common.navigateToApp('dashboard');
       await PageObjects.dashboard.clickNewDashboard();
diff --git a/test/functional/apps/dashboard/view_edit.ts b/test/functional/apps/dashboard/view_edit.ts
index b29b07f9df4e4..f0ee5aad7a7cf 100644
--- a/test/functional/apps/dashboard/view_edit.ts
+++ b/test/functional/apps/dashboard/view_edit.ts
@@ -18,10 +18,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['dashboard', 'header', 'common', 'visualize', 'timePicker']);
   const dashboardName = 'dashboard with filter';
   const filterBar = getService('filterBar');
+  const security = getService('security');
 
   describe('dashboard view edit mode', function viewEditModeTests() {
     before(async () => {
       await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
+      await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader', 'animals']);
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
@@ -29,6 +31,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.dashboard.preserveCrossAppState();
     });
 
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
+
     it('create new dashboard opens in edit mode', async function () {
       await PageObjects.dashboard.gotoDashboardLandingPage();
       await PageObjects.dashboard.clickNewDashboard();
diff --git a/test/functional_execution_context/config.ts b/test/functional_execution_context/config.ts
new file mode 100644
index 0000000000000..6e46189073001
--- /dev/null
+++ b/test/functional_execution_context/config.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+import Path from 'path';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
+
+  return {
+    ...functionalConfig.getAll(),
+    rootTags: ['skipCloud'],
+    testFiles: [require.resolve('./tests/')],
+    junit: {
+      reportName: 'Execution Context Functional Tests',
+    },
+    kbnTestServer: {
+      ...functionalConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...functionalConfig.get('kbnTestServer.serverArgs'),
+        '--execution_context.enabled=true',
+        '--logging.appenders.file.type=file',
+        `--logging.appenders.file.fileName=${Path.resolve(__dirname, './kibana.log')}`,
+        '--logging.appenders.file.layout.type=json',
+
+        '--logging.loggers[0].name=elasticsearch.query',
+        '--logging.loggers[0].level=all',
+        // eslint-disable-next-line prettier/prettier
+        '--logging.loggers[0].appenders=[\"file\"]',
+
+        '--logging.loggers[1].name=execution_context',
+        '--logging.loggers[1].level=debug',
+        // eslint-disable-next-line prettier/prettier
+        '--logging.loggers[1].appenders=[\"file\"]',
+      ],
+    },
+  };
+}
diff --git a/test/functional_execution_context/ftr_provider_context.ts b/test/functional_execution_context/ftr_provider_context.ts
new file mode 100644
index 0000000000000..d4ac701735efb
--- /dev/null
+++ b/test/functional_execution_context/ftr_provider_context.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { GenericFtrProviderContext } from '@kbn/test';
+import { pageObjects } from '../functional/page_objects';
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
+export { pageObjects };
diff --git a/test/functional_execution_context/services.ts b/test/functional_execution_context/services.ts
new file mode 100644
index 0000000000000..b0cf94fedd749
--- /dev/null
+++ b/test/functional_execution_context/services.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { services as functionalServices } from '../functional/services';
+
+export const services = functionalServices;
diff --git a/test/functional_execution_context/tests/execution_context.ts b/test/functional_execution_context/tests/execution_context.ts
new file mode 100644
index 0000000000000..ad9b4332c9f02
--- /dev/null
+++ b/test/functional_execution_context/tests/execution_context.ts
@@ -0,0 +1,374 @@
+/*
+ * Copyright 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 { Ecs, KibanaExecutionContext } from 'kibana/server';
+
+import Fs from 'fs/promises';
+import Path from 'path';
+import { isEqual } from 'lodash';
+import type { FtrProviderContext } from '../ftr_provider_context';
+
+const logFilePath = Path.resolve(__dirname, '../kibana.log');
+
+// to avoid splitting log record containing \n symbol
+const endOfLine = /(?<=})\s*\n/;
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'home']);
+  const retry = getService('retry');
+
+  async function assertLogContains(
+    description: string,
+    predicate: (record: Ecs) => boolean
+  ): Promise<void> {
+    // logs are written to disk asynchronously. I sacrificed performance to reduce flakiness.
+    await retry.waitFor(description, async () => {
+      const logsStr = await Fs.readFile(logFilePath, 'utf-8');
+      const normalizedRecords = logsStr
+        .split(endOfLine)
+        .filter(Boolean)
+        .map((s) => JSON.parse(s));
+
+      return normalizedRecords.some(predicate);
+    });
+  }
+
+  function isExecutionContextLog(
+    record: string | undefined,
+    executionContext: KibanaExecutionContext
+  ) {
+    if (!record) return false;
+    try {
+      const object = JSON.parse(record);
+      return isEqual(object, executionContext);
+    } catch (e) {
+      return false;
+    }
+  }
+
+  describe('Execution context service', () => {
+    before(async () => {
+      await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
+        useActualUrl: true,
+      });
+      await PageObjects.home.addSampleDataSet('flights');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+    });
+
+    after(async () => {
+      await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
+        useActualUrl: true,
+      });
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.home.removeSampleDataSet('flights');
+    });
+
+    describe('discover app', () => {
+      before(async () => {
+        await PageObjects.common.navigateToApp('discover');
+        await PageObjects.header.waitUntilLoadingHasFinished();
+      });
+
+      it('propagates context for Discover', async () => {
+        await assertLogContains(
+          'execution context propagates to Elasticsearch via "x-opaque-id" header',
+          (record) => Boolean(record.http?.request?.id?.includes('kibana:application:discover'))
+        );
+
+        await assertLogContains('execution context propagates to Kibana logs', (record) =>
+          isExecutionContextLog(record?.message, {
+            description: 'fetch documents',
+            id: '',
+            name: 'discover',
+            type: 'application',
+            // discovery doesn't have an URL since one of from the example dataset is not saved separately
+            url: '/app/discover',
+          })
+        );
+
+        await assertLogContains('execution context propagates to Kibana logs', (record) =>
+          isExecutionContextLog(record?.message, {
+            description: 'fetch chart data and total hits',
+            id: '',
+            name: 'discover',
+            type: 'application',
+            url: '/app/discover',
+          })
+        );
+      });
+    });
+
+    describe('dashboard app', () => {
+      before(async () => {
+        await PageObjects.common.navigateToApp('dashboard');
+        await PageObjects.dashboard.loadSavedDashboard('[Flights] Global Flight Dashboard');
+        await PageObjects.dashboard.waitForRenderComplete();
+        await PageObjects.header.waitUntilLoadingHasFinished();
+      });
+
+      describe('propagates context for Lens visualizations', () => {
+        it('lnsXY', async () => {
+          await assertLogContains(
+            'execution context propagates to Elasticsearch via "x-opaque-id" header',
+            (record) =>
+              Boolean(
+                record.http?.request?.id?.includes(
+                  'kibana:application:dashboard:7adfa750-4c81-11e8-b3d7-01146121b73d;lens:lnsXY:086ac2e9-dd16-4b45-92b8-1e43ff7e3f65'
+                )
+              )
+          );
+
+          await assertLogContains('execution context propagates to Kibana logs', (record) =>
+            isExecutionContextLog(record?.message, {
+              parent: {
+                type: 'application',
+                name: 'dashboard',
+                id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+                description: '[Flights] Global Flight Dashboard',
+                url: '/view/7adfa750-4c81-11e8-b3d7-01146121b73d',
+              },
+              type: 'lens',
+              name: 'lnsXY',
+              id: '086ac2e9-dd16-4b45-92b8-1e43ff7e3f65',
+              description: '[Flights] Flight count',
+              url: '/app/lens#/edit_by_value',
+            })
+          );
+        });
+
+        it('lnsMetric', async () => {
+          await assertLogContains(
+            'execution context propagates to Elasticsearch via "x-opaque-id" header',
+            (record) =>
+              Boolean(
+                record.http?.request?.id?.includes(
+                  'kibana:application:dashboard:7adfa750-4c81-11e8-b3d7-01146121b73d;lens:lnsMetric:b766e3b8-4544-46ed-99e6-9ecc4847e2a2'
+                )
+              )
+          );
+
+          await assertLogContains('execution context propagates to Kibana logs', (record) =>
+            isExecutionContextLog(record?.message, {
+              parent: {
+                type: 'application',
+                name: 'dashboard',
+                id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+                description: '[Flights] Global Flight Dashboard',
+                url: '/view/7adfa750-4c81-11e8-b3d7-01146121b73d',
+              },
+              type: 'lens',
+              name: 'lnsMetric',
+              id: '2e33ade5-96e5-40b4-b460-493e5d4fa834',
+              description: '',
+              url: '/app/lens#/edit_by_value',
+            })
+          );
+        });
+
+        it('lnsDatatable', async () => {
+          await assertLogContains(
+            'execution context propagates to Elasticsearch via "x-opaque-id" header',
+            (record) =>
+              Boolean(
+                record.http?.request?.id?.includes(
+                  'kibana:application:dashboard:7adfa750-4c81-11e8-b3d7-01146121b73d;lens:lnsDatatable:fb86b32f-fb7a-45cf-9511-f366fef51bbd'
+                )
+              )
+          );
+
+          await assertLogContains('execution context propagates to Kibana logs', (record) =>
+            isExecutionContextLog(record?.message, {
+              parent: {
+                type: 'application',
+                name: 'dashboard',
+                id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+                description: '[Flights] Global Flight Dashboard',
+                url: '/view/7adfa750-4c81-11e8-b3d7-01146121b73d',
+              },
+              type: 'lens',
+              name: 'lnsDatatable',
+              id: 'fb86b32f-fb7a-45cf-9511-f366fef51bbd',
+              description: 'Cities by delay, cancellation',
+              url: '/app/lens#/edit_by_value',
+            })
+          );
+        });
+
+        it('lnsPie', async () => {
+          await assertLogContains(
+            'execution context propagates to Elasticsearch via "x-opaque-id" header',
+            (record) =>
+              Boolean(
+                record.http?.request?.id?.includes(
+                  'kibana:application:dashboard:7adfa750-4c81-11e8-b3d7-01146121b73d;lens:lnsPie:5d53db36-2d5a-4adc-af7b-cec4c1a294e0'
+                )
+              )
+          );
+          await assertLogContains('execution context propagates to Kibana logs', (record) =>
+            isExecutionContextLog(record?.message, {
+              parent: {
+                type: 'application',
+                name: 'dashboard',
+                id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+                description: '[Flights] Global Flight Dashboard',
+                url: '/view/7adfa750-4c81-11e8-b3d7-01146121b73d',
+              },
+              type: 'lens',
+              name: 'lnsPie',
+              id: '5d53db36-2d5a-4adc-af7b-cec4c1a294e0',
+              description: '[Flights] Delay Type',
+              url: '/app/lens#/edit_by_value',
+            })
+          );
+        });
+      });
+
+      it('propagates context for built-in Discover', async () => {
+        await assertLogContains(
+          'execution context propagates to Elasticsearch via "x-opaque-id" header',
+          (record) =>
+            Boolean(
+              record.http?.request?.id?.includes(
+                'application:dashboard:7adfa750-4c81-11e8-b3d7-01146121b73d;search:discover:571aaf70-4c88-11e8-b3d7-01146121b73d'
+              )
+            )
+        );
+        await assertLogContains('execution context propagates to Kibana logs', (record) =>
+          isExecutionContextLog(record?.message, {
+            parent: {
+              type: 'application',
+              name: 'dashboard',
+              id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+              description: '[Flights] Global Flight Dashboard',
+              url: '/view/7adfa750-4c81-11e8-b3d7-01146121b73d',
+            },
+            type: 'search',
+            name: 'discover',
+            id: '571aaf70-4c88-11e8-b3d7-01146121b73d',
+            description: '[Flights] Flight Log',
+            url: '/app/discover#/view/571aaf70-4c88-11e8-b3d7-01146121b73d',
+          })
+        );
+      });
+
+      it('propagates context for TSVB visualizations', async () => {
+        await assertLogContains(
+          'execution context propagates to Elasticsearch via "x-opaque-id" header',
+          (record) =>
+            Boolean(
+              record.http?.request?.id?.includes(
+                'kibana:application:dashboard:7adfa750-4c81-11e8-b3d7-01146121b73d;visualization:TSVB:bcb63b50-4c89-11e8-b3d7-01146121b73d'
+              )
+            )
+        );
+
+        await assertLogContains('execution context propagates to Kibana logs', (record) =>
+          isExecutionContextLog(record?.message, {
+            parent: {
+              type: 'application',
+              name: 'dashboard',
+              id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+              description: '[Flights] Global Flight Dashboard',
+              url: '/view/7adfa750-4c81-11e8-b3d7-01146121b73d',
+            },
+            type: 'visualization',
+            name: 'TSVB',
+            id: 'bcb63b50-4c89-11e8-b3d7-01146121b73d',
+            description: '[Flights] Delays & Cancellations',
+            url: '/app/visualize#/edit/bcb63b50-4c89-11e8-b3d7-01146121b73d',
+          })
+        );
+      });
+
+      it('propagates context for Vega visualizations', async () => {
+        await assertLogContains(
+          'execution context propagates to Elasticsearch via "x-opaque-id" header',
+          (record) =>
+            Boolean(
+              record.http?.request?.id?.includes(
+                'kibana:application:dashboard:7adfa750-4c81-11e8-b3d7-01146121b73d;visualization:Vega:ed78a660-53a0-11e8-acbd-0be0ad9d822b'
+              )
+            )
+        );
+
+        await assertLogContains('execution context propagates to Kibana logs', (record) =>
+          isExecutionContextLog(record?.message, {
+            parent: {
+              type: 'application',
+              name: 'dashboard',
+              id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+              description: '[Flights] Global Flight Dashboard',
+              url: '/view/7adfa750-4c81-11e8-b3d7-01146121b73d',
+            },
+            type: 'visualization',
+            name: 'Vega',
+            id: 'ed78a660-53a0-11e8-acbd-0be0ad9d822b',
+            description: '[Flights] Airport Connections (Hover Over Airport)',
+            url: '/app/visualize#/edit/ed78a660-53a0-11e8-acbd-0be0ad9d822b',
+          })
+        );
+      });
+
+      it('propagates context for Tag Cloud visualization', async () => {
+        await assertLogContains(
+          'execution context propagates to Elasticsearch via "x-opaque-id" header',
+          (record) =>
+            Boolean(
+              record.http?.request?.id?.includes(
+                'kibana:application:dashboard:7adfa750-4c81-11e8-b3d7-01146121b73d;visualization:Tag cloud:293b5a30-4c8f-11e8-b3d7-01146121b73d'
+              )
+            )
+        );
+
+        await assertLogContains('execution context propagates to Kibana logs', (record) =>
+          isExecutionContextLog(record?.message, {
+            parent: {
+              type: 'application',
+              name: 'dashboard',
+              id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+              description: '[Flights] Global Flight Dashboard',
+              url: '/view/7adfa750-4c81-11e8-b3d7-01146121b73d',
+            },
+            type: 'visualization',
+            name: 'Tag cloud',
+            id: '293b5a30-4c8f-11e8-b3d7-01146121b73d',
+            description: '[Flights] Destination Weather',
+            url: '/app/visualize#/edit/293b5a30-4c8f-11e8-b3d7-01146121b73d',
+          })
+        );
+      });
+
+      it('propagates context for Vertical bar visualization', async () => {
+        await assertLogContains(
+          'execution context propagates to Elasticsearch via "x-opaque-id" header',
+          (record) =>
+            Boolean(
+              record.http?.request?.id?.includes(
+                'kibana:application:dashboard:7adfa750-4c81-11e8-b3d7-01146121b73d;visualization:Vertical bar:9886b410-4c8b-11e8-b3d7-01146121b73d'
+              )
+            )
+        );
+
+        await assertLogContains('execution context propagates to Kibana logs', (record) =>
+          isExecutionContextLog(record?.message, {
+            parent: {
+              type: 'application',
+              name: 'dashboard',
+              id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+              description: '[Flights] Global Flight Dashboard',
+              url: '/view/7adfa750-4c81-11e8-b3d7-01146121b73d',
+            },
+            type: 'visualization',
+            name: 'Vertical bar',
+            id: '9886b410-4c8b-11e8-b3d7-01146121b73d',
+            description: '[Flights] Delay Buckets',
+            url: '/app/visualize#/edit/9886b410-4c8b-11e8-b3d7-01146121b73d',
+          })
+        );
+      });
+    });
+  });
+}
diff --git a/test/functional_execution_context/tests/index.ts b/test/functional_execution_context/tests/index.ts
new file mode 100644
index 0000000000000..6dc92f6fb3c8b
--- /dev/null
+++ b/test/functional_execution_context/tests/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('Execution context', function () {
+    this.tags('ciGroup1');
+    loadTestFile(require.resolve('./execution_context'));
+  });
+}
diff --git a/test/package/templates/kibana.yml b/test/package/templates/kibana.yml
index a5e44b7acb018..ac2d03467051b 100644
--- a/test/package/templates/kibana.yml
+++ b/test/package/templates/kibana.yml
@@ -3,3 +3,6 @@ server.host: 0.0.0.0
 elasticsearch.hosts: http://192.168.50.1:9200
 elasticsearch.username: "{{ elasticsearch_username }}"
 elasticsearch.password: "{{ elasticsearch_password }}"
+
+pid.file: /run/kibana/kibana.pid
+logging.dest: /var/log/kibana/kibana.log
\ No newline at end of file
diff --git a/test/plugin_functional/test_suites/core_plugins/status.ts b/test/plugin_functional/test_suites/core_plugins/status.ts
index 2b0f15cb39273..10ca8c6722046 100644
--- a/test/plugin_functional/test_suites/core_plugins/status.ts
+++ b/test/plugin_functional/test_suites/core_plugins/status.ts
@@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
 
   const delay = (ms: number) => new Promise((r) => setTimeout(r, ms));
   const getStatus = async (pluginName?: string) => {
-    const resp = await supertest.get('/api/status?v8format=true');
+    const resp = await supertest.get('/api/status');
 
     if (pluginName) {
       return resp.body.status.plugins[pluginName];
diff --git a/test/server_integration/http/platform/status.ts b/test/server_integration/http/platform/status.ts
index 0dcf82c9bea9e..e443ce3f31cbf 100644
--- a/test/server_integration/http/platform/status.ts
+++ b/test/server_integration/http/platform/status.ts
@@ -18,7 +18,7 @@ export default function ({ getService }: FtrProviderContext) {
   const retry = getService('retry');
 
   const getStatus = async (pluginName: string): Promise<ServiceStatusSerialized> => {
-    const resp = await supertest.get('/api/status?v8format=true');
+    const resp = await supertest.get('/api/status');
 
     return resp.body.status.plugins[pluginName];
   };
diff --git a/x-pack/plugins/actions/common/index.ts b/x-pack/plugins/actions/common/index.ts
index 7825cbfb45f37..d3abfca83c8e8 100644
--- a/x-pack/plugins/actions/common/index.ts
+++ b/x-pack/plugins/actions/common/index.ts
@@ -13,3 +13,4 @@ export * from './alert_history_schema';
 export * from './rewrite_request_case';
 
 export const BASE_ACTION_API_PATH = '/api/actions';
+export const INTERNAL_BASE_ACTION_API_PATH = '/internal/actions';
diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
index 8e9ea1c5e4aa9..450bf1744150d 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
@@ -52,7 +52,7 @@ describe('actionTypeRegistry.get() works', () => {
 });
 
 describe('config validation', () => {
-  test('config validation succeeds when config is valid', () => {
+  test('config validation succeeds when config is valid for nodemailer well known service', () => {
     const config: Record<string, unknown> = {
       service: 'gmail',
       from: 'bob@example.com',
@@ -64,14 +64,46 @@ describe('config validation', () => {
       port: null,
       secure: null,
     });
+  });
+
+  test(`config validation succeeds when config is valid and defaults to 'other' when service is undefined`, () => {
+    const config: Record<string, unknown> = {
+      from: 'bob@example.com',
+      host: 'elastic.co',
+      port: 8080,
+      hasAuth: true,
+    };
+    expect(validateConfig(actionType, config)).toEqual({
+      ...config,
+      service: 'other',
+      secure: null,
+    });
+  });
+
+  test(`config validation succeeds when config is valid and service requires custom host/port value`, () => {
+    const config: Record<string, unknown> = {
+      service: 'exchange_server',
+      from: 'bob@example.com',
+      host: 'elastic.co',
+      port: 8080,
+      hasAuth: true,
+    };
+    expect(validateConfig(actionType, config)).toEqual({
+      ...config,
+      secure: null,
+    });
+  });
 
-    delete config.service;
-    config.host = 'elastic.co';
-    config.port = 8080;
-    config.hasAuth = true;
+  test(`config validation succeeds when config is valid and service is elastic_cloud`, () => {
+    const config: Record<string, unknown> = {
+      service: 'elastic_cloud',
+      from: 'bob@example.com',
+      hasAuth: true,
+    };
     expect(validateConfig(actionType, config)).toEqual({
       ...config,
-      service: null,
+      host: null,
+      port: null,
       secure: null,
     });
   });
@@ -325,7 +357,7 @@ describe('execute()', () => {
       ...executorOptions,
       config: {
         ...config,
-        service: null,
+        service: 'other',
         hasAuth: false,
       },
       secrets: {
@@ -381,12 +413,73 @@ describe('execute()', () => {
     `);
   });
 
+  test('parameters are as expected when using elastic_cloud service', async () => {
+    const customExecutorOptions: EmailActionTypeExecutorOptions = {
+      ...executorOptions,
+      config: {
+        ...config,
+        service: 'elastic_cloud',
+        hasAuth: false,
+      },
+      secrets: {
+        ...secrets,
+        user: null,
+        password: null,
+      },
+    };
+
+    sendEmailMock.mockReset();
+    await actionType.executor(customExecutorOptions);
+    expect(sendEmailMock.mock.calls[0][1]).toMatchInlineSnapshot(`
+      Object {
+        "configurationUtilities": Object {
+          "ensureActionTypeEnabled": [MockFunction],
+          "ensureHostnameAllowed": [MockFunction],
+          "ensureUriAllowed": [MockFunction],
+          "getCustomHostSettings": [MockFunction],
+          "getProxySettings": [MockFunction],
+          "getResponseSettings": [MockFunction],
+          "getSSLSettings": [MockFunction],
+          "isActionTypeEnabled": [MockFunction],
+          "isHostnameAllowed": [MockFunction],
+          "isUriAllowed": [MockFunction],
+        },
+        "content": Object {
+          "message": "a message to you
+
+      --
+
+      This message was sent by Kibana.",
+          "subject": "the subject",
+        },
+        "hasAuth": false,
+        "routing": Object {
+          "bcc": Array [
+            "jimmy@example.com",
+          ],
+          "cc": Array [
+            "james@example.com",
+          ],
+          "from": "bob@example.com",
+          "to": Array [
+            "jim@example.com",
+          ],
+        },
+        "transport": Object {
+          "host": "dockerhost",
+          "port": 10025,
+          "secure": false,
+        },
+      }
+    `);
+  });
+
   test('returns expected result when an error is thrown', async () => {
     const customExecutorOptions: EmailActionTypeExecutorOptions = {
       ...executorOptions,
       config: {
         ...config,
-        service: null,
+        service: 'other',
         hasAuth: false,
       },
       secrets: {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.ts b/x-pack/plugins/actions/server/builtin_action_types/email.ts
index 47748f0f13722..9b11aec6251f6 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.ts
@@ -9,6 +9,7 @@ import { curry } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 import nodemailerGetService from 'nodemailer/lib/well-known';
+import SMTPConnection from 'nodemailer/lib/smtp-connection';
 
 import { sendEmail, JSON_TRANSPORT_SERVICE, SendEmailOptions, Transport } from './lib/send_email';
 import { portSchema } from './lib/schemas';
@@ -32,10 +33,29 @@ export type EmailActionTypeExecutorOptions = ActionTypeExecutorOptions<
 // config definition
 export type ActionTypeConfigType = TypeOf<typeof ConfigSchema>;
 
+// supported values for `service` in addition to nodemailer's list of well-known services
+export enum AdditionalEmailServices {
+  ELASTIC_CLOUD = 'elastic_cloud',
+  EXCHANGE = 'exchange_server',
+  OTHER = 'other',
+}
+
+// these values for `service` require users to fill in host/port/secure
+export const CUSTOM_CONFIG_SERVICES: string[] = [
+  AdditionalEmailServices.EXCHANGE,
+  AdditionalEmailServices.OTHER,
+];
+
+export const ELASTIC_CLOUD_SERVICE: SMTPConnection.Options = {
+  host: 'dockerhost',
+  port: 10025,
+  secure: false,
+};
+
 const EMAIL_FOOTER_DIVIDER = '\n\n--\n\n';
 
 const ConfigSchemaProps = {
-  service: schema.nullable(schema.string()),
+  service: schema.string({ defaultValue: 'other' }),
   host: schema.nullable(schema.string()),
   port: schema.nullable(portSchema()),
   secure: schema.nullable(schema.boolean()),
@@ -58,7 +78,8 @@ function validateConfig(
   // translate messages.
   if (config.service === JSON_TRANSPORT_SERVICE) {
     return;
-  } else if (config.service == null) {
+  } else if (CUSTOM_CONFIG_SERVICES.indexOf(config.service) >= 0) {
+    // If configured `service` requires custom host/port/secure settings, validate that they are set
     if (config.host == null && config.port == null) {
       return 'either [service] or [host]/[port] is required';
     }
@@ -75,6 +96,7 @@ function validateConfig(
       return `[host] value '${config.host}' is not in the allowedHosts configuration`;
     }
   } else {
+    // Check configured `service` against nodemailer list of well known services + any custom ones allowed by Kibana
     const host = getServiceNameHost(config.service);
     if (host == null) {
       return `[service] value '${config.service}' is not valid`;
@@ -201,13 +223,20 @@ async function executor(
     transport.password = secrets.password;
   }
 
-  if (config.service !== null) {
-    transport.service = config.service;
-  } else {
+  if (CUSTOM_CONFIG_SERVICES.indexOf(config.service) >= 0) {
+    // use configured host/port/secure values
     // already validated service or host/port is not null ...
     transport.host = config.host!;
     transport.port = config.port!;
     transport.secure = getSecureValue(config.secure, config.port);
+  } else if (config.service === AdditionalEmailServices.ELASTIC_CLOUD) {
+    // use custom elastic cloud settings
+    transport.host = ELASTIC_CLOUD_SERVICE.host!;
+    transport.port = ELASTIC_CLOUD_SERVICE.port!;
+    transport.secure = ELASTIC_CLOUD_SERVICE.secure!;
+  } else {
+    // use nodemailer's well known service config
+    transport.service = config.service;
   }
 
   const footerMessage = getFooterMessage({
@@ -253,6 +282,10 @@ async function executor(
 // utilities
 
 function getServiceNameHost(service: string): string | null {
+  if (service === AdditionalEmailServices.ELASTIC_CLOUD) {
+    return ELASTIC_CLOUD_SERVICE.host!;
+  }
+
   const serviceEntry = nodemailerGetService(service);
   if (serviceEntry === false) return null;
 
diff --git a/x-pack/plugins/actions/server/routes/get_well_known_email_service.test.ts b/x-pack/plugins/actions/server/routes/get_well_known_email_service.test.ts
new file mode 100644
index 0000000000000..bbcedf18142ef
--- /dev/null
+++ b/x-pack/plugins/actions/server/routes/get_well_known_email_service.test.ts
@@ -0,0 +1,175 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { getWellKnownEmailServiceRoute } from './get_well_known_email_service';
+import { httpServiceMock } from 'src/core/server/mocks';
+import { licenseStateMock } from '../lib/license_state.mock';
+import { mockHandlerArguments } from './legacy/_mock_handler_arguments';
+import { verifyAccessAndContext } from './verify_access_and_context';
+
+jest.mock('./verify_access_and_context.ts', () => ({
+  verifyAccessAndContext: jest.fn(),
+}));
+
+beforeEach(() => {
+  jest.resetAllMocks();
+  (verifyAccessAndContext as jest.Mock).mockImplementation((license, handler) => handler);
+});
+
+describe('getWellKnownEmailServiceRoute', () => {
+  it('returns config for well known email service', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+
+    getWellKnownEmailServiceRoute(router, licenseState);
+
+    const [config, handler] = router.get.mock.calls[0];
+    expect(config.path).toMatchInlineSnapshot(
+      `"/internal/actions/connector/_email_config/{service}"`
+    );
+
+    const [context, req, res] = mockHandlerArguments(
+      {},
+      {
+        params: { service: 'gmail' },
+      },
+      ['ok']
+    );
+
+    expect(await handler(context, req, res)).toMatchInlineSnapshot(`
+      Object {
+        "body": Object {
+          "host": "smtp.gmail.com",
+          "port": 465,
+          "secure": true,
+        },
+      }
+    `);
+
+    expect(res.ok).toHaveBeenCalledWith({
+      body: {
+        host: 'smtp.gmail.com',
+        port: 465,
+        secure: true,
+      },
+    });
+  });
+
+  it('returns config for elastic cloud email service', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+
+    getWellKnownEmailServiceRoute(router, licenseState);
+
+    const [config, handler] = router.get.mock.calls[0];
+    expect(config.path).toMatchInlineSnapshot(
+      `"/internal/actions/connector/_email_config/{service}"`
+    );
+
+    const [context, req, res] = mockHandlerArguments(
+      {},
+      {
+        params: { service: 'elastic_cloud' },
+      },
+      ['ok']
+    );
+
+    expect(await handler(context, req, res)).toMatchInlineSnapshot(`
+      Object {
+        "body": Object {
+          "host": "dockerhost",
+          "port": 10025,
+          "secure": false,
+        },
+      }
+    `);
+
+    expect(res.ok).toHaveBeenCalledWith({
+      body: {
+        host: 'dockerhost',
+        port: 10025,
+        secure: false,
+      },
+    });
+  });
+
+  it('returns empty for unknown service', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+
+    getWellKnownEmailServiceRoute(router, licenseState);
+
+    const [config, handler] = router.get.mock.calls[0];
+    expect(config.path).toMatchInlineSnapshot(
+      `"/internal/actions/connector/_email_config/{service}"`
+    );
+
+    const [context, req, res] = mockHandlerArguments(
+      {},
+      {
+        params: { service: 'foo' },
+      },
+      ['ok']
+    );
+
+    expect(await handler(context, req, res)).toMatchInlineSnapshot(`
+      Object {
+        "body": Object {},
+      }
+    `);
+
+    expect(res.ok).toHaveBeenCalledWith({
+      body: {},
+    });
+  });
+
+  it('ensures the license allows getting well known email service config', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+
+    getWellKnownEmailServiceRoute(router, licenseState);
+
+    const [, handler] = router.get.mock.calls[0];
+
+    const [context, req, res] = mockHandlerArguments(
+      {},
+      {
+        params: { service: 'gmail' },
+      },
+      ['ok']
+    );
+
+    await handler(context, req, res);
+
+    expect(verifyAccessAndContext).toHaveBeenCalledWith(licenseState, expect.any(Function));
+  });
+
+  it('ensures the license check prevents getting well known email service config', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+
+    (verifyAccessAndContext as jest.Mock).mockImplementation(() => async () => {
+      throw new Error('OMG');
+    });
+
+    getWellKnownEmailServiceRoute(router, licenseState);
+
+    const [, handler] = router.get.mock.calls[0];
+
+    const [context, req, res] = mockHandlerArguments(
+      {},
+      {
+        params: { service: 'gmail' },
+      },
+      ['ok']
+    );
+
+    expect(handler(context, req, res)).rejects.toMatchInlineSnapshot(`[Error: OMG]`);
+
+    expect(verifyAccessAndContext).toHaveBeenCalledWith(licenseState, expect.any(Function));
+  });
+});
diff --git a/x-pack/plugins/actions/server/routes/get_well_known_email_service.ts b/x-pack/plugins/actions/server/routes/get_well_known_email_service.ts
new file mode 100644
index 0000000000000..837084f43b864
--- /dev/null
+++ b/x-pack/plugins/actions/server/routes/get_well_known_email_service.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { IRouter } from 'kibana/server';
+import nodemailerGetService from 'nodemailer/lib/well-known';
+import SMTPConnection from 'nodemailer/lib/smtp-connection';
+import { ILicenseState } from '../lib';
+import { INTERNAL_BASE_ACTION_API_PATH } from '../../common';
+import { ActionsRequestHandlerContext } from '../types';
+import { verifyAccessAndContext } from './verify_access_and_context';
+import { AdditionalEmailServices, ELASTIC_CLOUD_SERVICE } from '../builtin_action_types/email';
+
+const paramSchema = schema.object({
+  service: schema.string(),
+});
+
+export const getWellKnownEmailServiceRoute = (
+  router: IRouter<ActionsRequestHandlerContext>,
+  licenseState: ILicenseState
+) => {
+  router.get(
+    {
+      path: `${INTERNAL_BASE_ACTION_API_PATH}/connector/_email_config/{service}`,
+      validate: {
+        params: paramSchema,
+      },
+    },
+    router.handleLegacyErrors(
+      verifyAccessAndContext(licenseState, async function (context, req, res) {
+        const { service } = req.params;
+
+        let response: SMTPConnection.Options = {};
+        if (service === AdditionalEmailServices.ELASTIC_CLOUD) {
+          response = ELASTIC_CLOUD_SERVICE;
+        } else {
+          const serviceEntry = nodemailerGetService(service);
+          if (serviceEntry) {
+            response = {
+              host: serviceEntry.host,
+              port: serviceEntry.port,
+              secure: serviceEntry.secure,
+            };
+          }
+        }
+
+        return res.ok({
+          body: response,
+        });
+      })
+    )
+  );
+};
diff --git a/x-pack/plugins/actions/server/routes/index.ts b/x-pack/plugins/actions/server/routes/index.ts
index a236e514ef78d..0d39d87635d5e 100644
--- a/x-pack/plugins/actions/server/routes/index.ts
+++ b/x-pack/plugins/actions/server/routes/index.ts
@@ -15,6 +15,7 @@ import { getActionRoute } from './get';
 import { getAllActionRoute } from './get_all';
 import { connectorTypesRoute } from './connector_types';
 import { updateActionRoute } from './update';
+import { getWellKnownEmailServiceRoute } from './get_well_known_email_service';
 import { defineLegacyRoutes } from './legacy';
 
 export function defineRoutes(
@@ -30,4 +31,6 @@ export function defineRoutes(
   updateActionRoute(router, licenseState);
   connectorTypesRoute(router, licenseState);
   executeActionRoute(router, licenseState);
+
+  getWellKnownEmailServiceRoute(router, licenseState);
 }
diff --git a/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts b/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts
index 7dc1426c13a4b..c094109a43d97 100644
--- a/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts
+++ b/x-pack/plugins/actions/server/saved_objects/actions_migrations.test.ts
@@ -119,6 +119,54 @@ describe('successful migrations', () => {
     });
   });
 
+  describe('7.16.0', () => {
+    test('set service config property for .email connectors if service is undefined', () => {
+      const migration716 = getActionsMigrations(encryptedSavedObjectsSetup)['7.16.0'];
+      const action = getMockDataForEmail({ config: { service: undefined } });
+      const migratedAction = migration716(action, context);
+      expect(migratedAction.attributes.config).toEqual({
+        service: 'other',
+      });
+      expect(migratedAction).toEqual({
+        ...action,
+        attributes: {
+          ...action.attributes,
+          config: {
+            service: 'other',
+          },
+        },
+      });
+    });
+
+    test('set service config property for .email connectors if service is null', () => {
+      const migration716 = getActionsMigrations(encryptedSavedObjectsSetup)['7.16.0'];
+      const action = getMockDataForEmail({ config: { service: null } });
+      const migratedAction = migration716(action, context);
+      expect(migratedAction.attributes.config).toEqual({
+        service: 'other',
+      });
+      expect(migratedAction).toEqual({
+        ...action,
+        attributes: {
+          ...action.attributes,
+          config: {
+            service: 'other',
+          },
+        },
+      });
+    });
+
+    test('skips migrating .email connectors if service is defined, even if value is nonsense', () => {
+      const migration716 = getActionsMigrations(encryptedSavedObjectsSetup)['7.16.0'];
+      const action = getMockDataForEmail({ config: { service: 'gobbledygook' } });
+      const migratedAction = migration716(action, context);
+      expect(migratedAction.attributes.config).toEqual({
+        service: 'gobbledygook',
+      });
+      expect(migratedAction).toEqual(action);
+    });
+  });
+
   describe('8.0.0', () => {
     test('no op migration for rules SO', () => {
       const migration800 = getActionsMigrations(encryptedSavedObjectsSetup)['8.0.0'];
diff --git a/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts b/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts
index 7857a9e1f833f..e75f3eb41f2df 100644
--- a/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts
+++ b/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts
@@ -62,6 +62,12 @@ export function getActionsMigrations(
     pipeMigrations(addisMissingSecretsField)
   );
 
+  const migrationEmailActionsSixteen = createEsoMigration(
+    encryptedSavedObjects,
+    (doc): doc is SavedObjectUnsanitizedDoc<RawAction> => doc.attributes.actionTypeId === '.email',
+    pipeMigrations(setServiceConfigIfNotSet)
+  );
+
   const migrationActions800 = createEsoMigration(
     encryptedSavedObjects,
     (doc: SavedObjectUnsanitizedDoc<RawAction>): doc is SavedObjectUnsanitizedDoc<RawAction> =>
@@ -73,6 +79,7 @@ export function getActionsMigrations(
     '7.10.0': executeMigrationWithErrorHandling(migrationActionsTen, '7.10.0'),
     '7.11.0': executeMigrationWithErrorHandling(migrationActionsEleven, '7.11.0'),
     '7.14.0': executeMigrationWithErrorHandling(migrationActionsFourteen, '7.14.0'),
+    '7.16.0': executeMigrationWithErrorHandling(migrationEmailActionsSixteen, '7.16.0'),
     '8.0.0': executeMigrationWithErrorHandling(migrationActions800, '8.0.0'),
   };
 }
@@ -157,6 +164,24 @@ const addHasAuthConfigurationObject = (
   };
 };
 
+const setServiceConfigIfNotSet = (
+  doc: SavedObjectUnsanitizedDoc<RawAction>
+): SavedObjectUnsanitizedDoc<RawAction> => {
+  if (doc.attributes.actionTypeId !== '.email' || null != doc.attributes.config.service) {
+    return doc;
+  }
+  return {
+    ...doc,
+    attributes: {
+      ...doc.attributes,
+      config: {
+        ...doc.attributes.config,
+        service: 'other',
+      },
+    },
+  };
+};
+
 const addisMissingSecretsField = (
   doc: SavedObjectUnsanitizedDoc<RawAction>
 ): SavedObjectUnsanitizedDoc<RawAction> => {
diff --git a/x-pack/plugins/alerting/server/rules_client/rules_client.ts b/x-pack/plugins/alerting/server/rules_client/rules_client.ts
index 5a2a124f55abc..c3e21e02cdb7d 100644
--- a/x-pack/plugins/alerting/server/rules_client/rules_client.ts
+++ b/x-pack/plugins/alerting/server/rules_client/rules_client.ts
@@ -35,6 +35,9 @@ import {
   AlertNotifyWhenType,
   AlertTypeParams,
   ResolvedSanitizedRule,
+  AlertWithLegacyId,
+  SanitizedAlertWithLegacyId,
+  PartialAlertWithLegacyId,
 } from '../types';
 import {
   validateAlertTypeParams,
@@ -383,9 +386,11 @@ export class RulesClient {
 
   public async get<Params extends AlertTypeParams = never>({
     id,
+    includeLegacyId = false,
   }: {
     id: string;
-  }): Promise<SanitizedAlert<Params>> {
+    includeLegacyId?: boolean;
+  }): Promise<SanitizedAlert<Params> | SanitizedAlertWithLegacyId<Params>> {
     const result = await this.unsecuredSavedObjectsClient.get<RawAlert>('alert', id);
     try {
       await this.authorization.ensureAuthorized({
@@ -414,7 +419,8 @@ export class RulesClient {
       result.id,
       result.attributes.alertTypeId,
       result.attributes,
-      result.references
+      result.references,
+      includeLegacyId
     );
   }
 
@@ -486,7 +492,8 @@ export class RulesClient {
     dateStart,
   }: GetAlertInstanceSummaryParams): Promise<AlertInstanceSummary> {
     this.logger.debug(`getAlertInstanceSummary(): getting alert ${id}`);
-    const alert = await this.get({ id });
+    const alert = (await this.get({ id, includeLegacyId: true })) as SanitizedAlertWithLegacyId;
+
     await this.authorization.ensureAuthorized({
       ruleTypeId: alert.alertTypeId,
       consumer: alert.consumer,
@@ -505,13 +512,18 @@ export class RulesClient {
     this.logger.debug(`getAlertInstanceSummary(): search the event log for alert ${id}`);
     let events: IEvent[];
     try {
-      const queryResults = await eventLogClient.findEventsBySavedObjectIds('alert', [id], {
-        page: 1,
-        per_page: 10000,
-        start: parsedDateStart.toISOString(),
-        end: dateNow.toISOString(),
-        sort_order: 'desc',
-      });
+      const queryResults = await eventLogClient.findEventsBySavedObjectIds(
+        'alert',
+        [id],
+        {
+          page: 1,
+          per_page: 10000,
+          start: parsedDateStart.toISOString(),
+          end: dateNow.toISOString(),
+          sort_order: 'desc',
+        },
+        alert.legacyId !== null ? [alert.legacyId] : undefined
+      );
       events = queryResults.data;
     } catch (err) {
       this.logger.debug(
@@ -1533,13 +1545,26 @@ export class RulesClient {
     id: string,
     ruleTypeId: string,
     rawAlert: RawAlert,
-    references: SavedObjectReference[] | undefined
-  ): Alert {
+    references: SavedObjectReference[] | undefined,
+    includeLegacyId: boolean = false
+  ): Alert | AlertWithLegacyId {
     const ruleType = this.ruleTypeRegistry.get(ruleTypeId);
     // In order to support the partial update API of Saved Objects we have to support
     // partial updates of an Alert, but when we receive an actual RawAlert, it is safe
     // to cast the result to an Alert
-    return this.getPartialAlertFromRaw<Params>(id, ruleType, rawAlert, references) as Alert;
+    const res = this.getPartialAlertFromRaw<Params>(
+      id,
+      ruleType,
+      rawAlert,
+      references,
+      includeLegacyId
+    );
+    // include to result because it is for internal rules client usage
+    if (includeLegacyId) {
+      return res as AlertWithLegacyId;
+    }
+    // exclude from result because it is an internal variable
+    return omit(res, ['legacyId']) as Alert;
   }
 
   private getPartialAlertFromRaw<Params extends AlertTypeParams>(
@@ -1550,17 +1575,18 @@ export class RulesClient {
       updatedAt,
       meta,
       notifyWhen,
+      legacyId,
       scheduledTaskId,
       params,
-      legacyId, // exclude from result because it is an internal variable
       executionStatus,
       schedule,
       actions,
       ...partialRawAlert
     }: Partial<RawAlert>,
-    references: SavedObjectReference[] | undefined
-  ): PartialAlert<Params> {
-    return {
+    references: SavedObjectReference[] | undefined,
+    includeLegacyId: boolean = false
+  ): PartialAlert<Params> | PartialAlertWithLegacyId<Params> {
+    const rule = {
       id,
       notifyWhen,
       ...partialRawAlert,
@@ -1576,6 +1602,9 @@ export class RulesClient {
         ? { executionStatus: alertExecutionStatusFromRaw(this.logger, id, executionStatus) }
         : {}),
     };
+    return includeLegacyId
+      ? ({ ...rule, legacyId } as PartialAlertWithLegacyId<Params>)
+      : (rule as PartialAlert<Params>);
   }
 
   private async validateActions(
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_instance_summary.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_instance_summary.test.ts
index f8414b08f191b..6b018fb342d99 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get_alert_instance_summary.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get_alert_instance_summary.test.ts
@@ -212,6 +212,7 @@ describe('getAlertInstanceSummary()', () => {
           "sort_order": "desc",
           "start": "2019-02-12T21:00:22.479Z",
         },
+        undefined,
       ]
     `);
     // calculate the expected start/end date for one test
@@ -225,6 +226,38 @@ describe('getAlertInstanceSummary()', () => {
     expect(endMillis - startMillis).toBeLessThan(expectedDuration + 2);
   });
 
+  test('calls event log client with legacy ids param', async () => {
+    unsecuredSavedObjectsClient.get.mockResolvedValueOnce(
+      getAlertInstanceSummarySavedObject({ legacyId: '99999' })
+    );
+    eventLogClient.findEventsBySavedObjectIds.mockResolvedValueOnce(
+      AlertInstanceSummaryFindEventsResult
+    );
+
+    await rulesClient.getAlertInstanceSummary({ id: '1' });
+
+    expect(unsecuredSavedObjectsClient.get).toHaveBeenCalledTimes(1);
+    expect(eventLogClient.findEventsBySavedObjectIds).toHaveBeenCalledTimes(1);
+    expect(eventLogClient.findEventsBySavedObjectIds.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "alert",
+        Array [
+          "1",
+        ],
+        Object {
+          "end": "2019-02-12T21:01:22.479Z",
+          "page": 1,
+          "per_page": 10000,
+          "sort_order": "desc",
+          "start": "2019-02-12T21:00:22.479Z",
+        },
+        Array [
+          "99999",
+        ],
+      ]
+    `);
+  });
+
   test('calls event log client with start date', async () => {
     unsecuredSavedObjectsClient.get.mockResolvedValueOnce(getAlertInstanceSummarySavedObject());
     eventLogClient.findEventsBySavedObjectIds.mockResolvedValueOnce(
diff --git a/x-pack/plugins/alerting/server/types.ts b/x-pack/plugins/alerting/server/types.ts
index 67565271fedc8..ba35890efd781 100644
--- a/x-pack/plugins/alerting/server/types.ts
+++ b/x-pack/plugins/alerting/server/types.ts
@@ -192,6 +192,21 @@ export interface RawAlertExecutionStatus extends SavedObjectAttributes {
 export type PartialAlert<Params extends AlertTypeParams = never> = Pick<Alert<Params>, 'id'> &
   Partial<Omit<Alert<Params>, 'id'>>;
 
+export interface AlertWithLegacyId<Params extends AlertTypeParams = never> extends Alert<Params> {
+  legacyId: string | null;
+}
+
+export type SanitizedAlertWithLegacyId<Params extends AlertTypeParams = never> = Omit<
+  AlertWithLegacyId<Params>,
+  'apiKey'
+>;
+
+export type PartialAlertWithLegacyId<Params extends AlertTypeParams = never> = Pick<
+  AlertWithLegacyId<Params>,
+  'id'
+> &
+  Partial<Omit<AlertWithLegacyId<Params>, 'id'>>;
+
 export interface RawAlert extends SavedObjectAttributes {
   enabled: boolean;
   name: string;
diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.tsx
index 72491a2bc1e31..9cbb13f7227a3 100644
--- a/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.tsx
@@ -203,7 +203,8 @@ export const AllCasesGeneric = React.memo<AllCasesGenericProps>(
       handleIsLoading,
       isLoadingCases: loading,
       refreshCases,
-      showActions,
+      // isSelectorView is boolean | undefined. We need to convert it to a boolean.
+      isSelectorView: !!isSelectorView,
       userCanCrud,
       connectors,
     });
diff --git a/x-pack/plugins/cases/public/components/all_cases/columns.tsx b/x-pack/plugins/cases/public/components/all_cases/columns.tsx
index 8b755b0c60968..c0bd6536f1b73 100644
--- a/x-pack/plugins/cases/public/components/all_cases/columns.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/columns.tsx
@@ -72,7 +72,7 @@ export interface GetCasesColumn {
   handleIsLoading: (a: boolean) => void;
   isLoadingCases: string[];
   refreshCases?: (a?: boolean) => void;
-  showActions: boolean;
+  isSelectorView: boolean;
   userCanCrud: boolean;
   connectors?: ActionConnector[];
 }
@@ -84,7 +84,7 @@ export const useCasesColumns = ({
   handleIsLoading,
   isLoadingCases,
   refreshCases,
-  showActions,
+  isSelectorView,
   userCanCrud,
   connectors = [],
 }: GetCasesColumn): CasesColumns[] => {
@@ -281,38 +281,42 @@ export const useCasesColumns = ({
         return getEmptyTagValue();
       },
     },
-    {
-      name: i18n.STATUS,
-      render: (theCase: Case) => {
-        if (theCase?.subCases == null || theCase.subCases.length === 0) {
-          if (theCase.status == null || theCase.type === CaseType.collection) {
-            return getEmptyTagValue();
-          }
-          return (
-            <StatusContextMenu
-              currentStatus={theCase.status}
-              disabled={!userCanCrud || isLoadingCases.length > 0}
-              onStatusChanged={(status) =>
-                handleDispatchUpdate({
-                  updateKey: 'status',
-                  updateValue: status,
-                  caseId: theCase.id,
-                  version: theCase.version,
-                })
+    ...(!isSelectorView
+      ? [
+          {
+            name: i18n.STATUS,
+            render: (theCase: Case) => {
+              if (theCase?.subCases == null || theCase.subCases.length === 0) {
+                if (theCase.status == null || theCase.type === CaseType.collection) {
+                  return getEmptyTagValue();
+                }
+                return (
+                  <StatusContextMenu
+                    currentStatus={theCase.status}
+                    disabled={!userCanCrud || isLoadingCases.length > 0}
+                    onStatusChanged={(status) =>
+                      handleDispatchUpdate({
+                        updateKey: 'status',
+                        updateValue: status,
+                        caseId: theCase.id,
+                        version: theCase.version,
+                      })
+                    }
+                  />
+                );
               }
-            />
-          );
-        }
 
-        const badges = getSubCasesStatusCountsBadges(theCase.subCases);
-        return badges.map(({ color, count }, index) => (
-          <EuiBadge key={index} color={color}>
-            {count}
-          </EuiBadge>
-        ));
-      },
-    },
-    ...(showActions
+              const badges = getSubCasesStatusCountsBadges(theCase.subCases);
+              return badges.map(({ color, count }, index) => (
+                <EuiBadge key={index} color={color}>
+                  {count}
+                </EuiBadge>
+              ));
+            },
+          },
+        ]
+      : []),
+    ...(userCanCrud && !isSelectorView
       ? [
           {
             name: (
diff --git a/x-pack/plugins/cases/public/components/all_cases/index.test.tsx b/x-pack/plugins/cases/public/components/all_cases/index.test.tsx
index 9e6928d43c862..3fff43108772d 100644
--- a/x-pack/plugins/cases/public/components/all_cases/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/index.test.tsx
@@ -144,7 +144,7 @@ describe('AllCasesGeneric', () => {
     filterStatus: CaseStatuses.open,
     handleIsLoading: jest.fn(),
     isLoadingCases: [],
-    showActions: true,
+    isSelectorView: false,
     userCanCrud: true,
   };
 
@@ -377,7 +377,7 @@ describe('AllCasesGeneric', () => {
         isLoadingCases: [],
         filterStatus: CaseStatuses.open,
         handleIsLoading: jest.fn(),
-        showActions: false,
+        isSelectorView: true,
         userCanCrud: true,
       })
     );
@@ -926,4 +926,27 @@ describe('AllCasesGeneric', () => {
       ).toBeFalsy();
     });
   });
+
+  it('should not render status when isSelectorView=true', async () => {
+    const wrapper = mount(
+      <TestProviders>
+        <AllCases {...defaultAllCasesProps} isSelectorView={true} />
+      </TestProviders>
+    );
+
+    const { result } = renderHook<GetCasesColumn, CasesColumns[]>(() =>
+      useCasesColumns({
+        ...defaultColumnArgs,
+        isSelectorView: true,
+      })
+    );
+
+    expect(result.current.find((i) => i.name === 'Status')).toBeFalsy();
+
+    await waitFor(() => {
+      expect(wrapper.find('[data-test-subj="cases-table"]').exists()).toBeTruthy();
+    });
+
+    expect(wrapper.find('[data-test-subj="case-view-status-dropdown"]').exists()).toBeFalsy();
+  });
 });
diff --git a/x-pack/plugins/discover_enhanced/common/index.ts b/x-pack/plugins/discover_enhanced/common/index.ts
index 4ac13918c7ed3..99afdb5f30c6b 100644
--- a/x-pack/plugins/discover_enhanced/common/index.ts
+++ b/x-pack/plugins/discover_enhanced/common/index.ts
@@ -5,7 +5,4 @@
  * 2.0.
  */
 
-// TODO: https://github.com/elastic/kibana/issues/110900
-/* eslint-disable @kbn/eslint/no_export_all */
-
-export * from './config';
+export type { Config } from './config';
diff --git a/x-pack/plugins/event_log/README.md b/x-pack/plugins/event_log/README.md
index 33c7fcabc9f46..f637187c1c180 100644
--- a/x-pack/plugins/event_log/README.md
+++ b/x-pack/plugins/event_log/README.md
@@ -271,6 +271,7 @@ Request Body:
 |Property|Description|Type|
 |---|---|---|
 |ids|The array ids of the saved object.|string array|
+|legacyIds|The array legacy ids of the saved object. This filter applies to the rules creted in Kibana versions before 8.0.0.|string array|
 
 Response body:
 
@@ -284,7 +285,8 @@ interface EventLogClient {
   findEventsBySavedObjectIds(
     type: string,
     ids: string[],
-    options?: Partial<FindOptionsType>
+    options?: Partial<FindOptionsType>,
+    legacyIds?: string[]
   ): Promise<QueryEventsBySavedObjectResult>;
 }
 
@@ -404,7 +406,8 @@ export interface IEventLogClient {
   findEventsBySavedObjectIds(
     type: string,
     ids: string[],
-    options?: Partial<FindOptionsType>
+    options?: Partial<FindOptionsType>,
+    legacyIds?: string[]
   ): Promise<QueryEventsBySavedObjectResult>;
 }
 ```
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
index cd87bc8e6e18b..ef43b9081f9ec 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
@@ -338,16 +338,106 @@ describe('queryEventsBySavedObject', () => {
         },
       })
     );
-    await clusterClientAdapter.queryEventsBySavedObjects(
-      'index-name',
-      'namespace',
-      'saved-object-type',
-      ['saved-object-id'],
-      DEFAULT_OPTIONS
-    );
+    await clusterClientAdapter.queryEventsBySavedObjects({
+      index: 'index-name',
+      namespace: 'namespace',
+      type: 'saved-object-type',
+      ids: ['saved-object-id'],
+      findOptions: DEFAULT_OPTIONS,
+    });
 
     const [query] = clusterClient.search.mock.calls[0];
-    expect(query).toMatchInlineSnapshot(`
+    expect(query).toMatchInlineSnapshot(
+      {
+        body: {
+          from: 0,
+          query: {
+            bool: {
+              filter: [],
+              must: [
+                {
+                  nested: {
+                    path: 'kibana.saved_objects',
+                    query: {
+                      bool: {
+                        must: [
+                          {
+                            term: {
+                              'kibana.saved_objects.rel': {
+                                value: 'primary',
+                              },
+                            },
+                          },
+                          {
+                            term: {
+                              'kibana.saved_objects.type': {
+                                value: 'saved-object-type',
+                              },
+                            },
+                          },
+                          {
+                            term: {
+                              'kibana.saved_objects.namespace': {
+                                value: 'namespace',
+                              },
+                            },
+                          },
+                        ],
+                      },
+                    },
+                  },
+                },
+                {
+                  bool: {
+                    should: [
+                      {
+                        bool: {
+                          must: [
+                            {
+                              nested: {
+                                path: 'kibana.saved_objects',
+                                query: {
+                                  bool: {
+                                    must: [
+                                      {
+                                        terms: {
+                                          'kibana.saved_objects.id': ['saved-object-id'],
+                                        },
+                                      },
+                                    ],
+                                  },
+                                },
+                              },
+                            },
+                            {
+                              range: {
+                                'kibana.version': {
+                                  gte: '8.0.0',
+                                },
+                              },
+                            },
+                          ],
+                        },
+                      },
+                    ],
+                  },
+                },
+              ],
+            },
+          },
+          size: 10,
+          sort: [
+            {
+              '@timestamp': {
+                order: 'asc',
+              },
+            },
+          ],
+        },
+        index: 'index-name',
+        track_total_hits: true,
+      },
+      `
       Object {
         "body": Object {
           "from": 0,
@@ -375,13 +465,6 @@ describe('queryEventsBySavedObject', () => {
                               },
                             },
                           },
-                          Object {
-                            "terms": Object {
-                              "kibana.saved_objects.id": Array [
-                                "saved-object-id",
-                              ],
-                            },
-                          },
                           Object {
                             "term": Object {
                               "kibana.saved_objects.namespace": Object {
@@ -394,6 +477,43 @@ describe('queryEventsBySavedObject', () => {
                     },
                   },
                 },
+                Object {
+                  "bool": Object {
+                    "should": Array [
+                      Object {
+                        "bool": Object {
+                          "must": Array [
+                            Object {
+                              "nested": Object {
+                                "path": "kibana.saved_objects",
+                                "query": Object {
+                                  "bool": Object {
+                                    "must": Array [
+                                      Object {
+                                        "terms": Object {
+                                          "kibana.saved_objects.id": Array [
+                                            "saved-object-id",
+                                          ],
+                                        },
+                                      },
+                                    ],
+                                  },
+                                },
+                              },
+                            },
+                            Object {
+                              "range": Object {
+                                "kibana.version": Object {
+                                  "gte": "8.0.0",
+                                },
+                              },
+                            },
+                          ],
+                        },
+                      },
+                    ],
+                  },
+                },
               ],
             },
           },
@@ -409,7 +529,8 @@ describe('queryEventsBySavedObject', () => {
         "index": "index-name",
         "track_total_hits": true,
       }
-    `);
+    `
+    );
   });
 
   test('should call cluster with proper arguments with default namespace', async () => {
@@ -429,80 +550,106 @@ describe('queryEventsBySavedObject', () => {
         },
       })
     );
-    await clusterClientAdapter.queryEventsBySavedObjects(
-      'index-name',
-      undefined,
-      'saved-object-type',
-      ['saved-object-id'],
-      DEFAULT_OPTIONS
-    );
+    await clusterClientAdapter.queryEventsBySavedObjects({
+      index: 'index-name',
+      namespace: undefined,
+      type: 'saved-object-type',
+      ids: ['saved-object-id'],
+      findOptions: DEFAULT_OPTIONS,
+    });
 
     const [query] = clusterClient.search.mock.calls[0];
-    expect(query).toMatchInlineSnapshot(`
-      Object {
-        "body": Object {
-          "from": 0,
-          "query": Object {
-            "bool": Object {
-              "filter": Array [],
-              "must": Array [
-                Object {
-                  "nested": Object {
-                    "path": "kibana.saved_objects",
-                    "query": Object {
-                      "bool": Object {
-                        "must": Array [
-                          Object {
-                            "term": Object {
-                              "kibana.saved_objects.rel": Object {
-                                "value": "primary",
-                              },
+    expect(query).toMatchObject({
+      body: {
+        from: 0,
+        query: {
+          bool: {
+            filter: [],
+            must: [
+              {
+                nested: {
+                  path: 'kibana.saved_objects',
+                  query: {
+                    bool: {
+                      must: [
+                        {
+                          term: {
+                            'kibana.saved_objects.rel': {
+                              value: 'primary',
                             },
                           },
-                          Object {
-                            "term": Object {
-                              "kibana.saved_objects.type": Object {
-                                "value": "saved-object-type",
-                              },
+                        },
+                        {
+                          term: {
+                            'kibana.saved_objects.type': {
+                              value: 'saved-object-type',
                             },
                           },
-                          Object {
-                            "terms": Object {
-                              "kibana.saved_objects.id": Array [
-                                "saved-object-id",
-                              ],
+                        },
+                        {
+                          bool: {
+                            must_not: {
+                              exists: {
+                                field: 'kibana.saved_objects.namespace',
+                              },
                             },
                           },
-                          Object {
-                            "bool": Object {
-                              "must_not": Object {
-                                "exists": Object {
-                                  "field": "kibana.saved_objects.namespace",
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+              {
+                bool: {
+                  should: [
+                    {
+                      bool: {
+                        must: [
+                          {
+                            nested: {
+                              path: 'kibana.saved_objects',
+                              query: {
+                                bool: {
+                                  must: [
+                                    {
+                                      terms: {
+                                        'kibana.saved_objects.id': ['saved-object-id'],
+                                      },
+                                    },
+                                  ],
                                 },
                               },
                             },
                           },
+                          {
+                            range: {
+                              'kibana.version': {
+                                gte: '8.0.0',
+                              },
+                            },
+                          },
                         ],
                       },
                     },
-                  },
+                  ],
                 },
-              ],
-            },
-          },
-          "size": 10,
-          "sort": Array [
-            Object {
-              "@timestamp": Object {
-                "order": "asc",
               },
-            },
-          ],
+            ],
+          },
         },
-        "index": "index-name",
-        "track_total_hits": true,
-      }
-    `);
+        size: 10,
+        sort: [
+          {
+            '@timestamp': {
+              order: 'asc',
+            },
+          },
+        ],
+      },
+      index: 'index-name',
+      track_total_hits: true,
+    });
   });
 
   test('should call cluster with sort', async () => {
@@ -522,13 +669,13 @@ describe('queryEventsBySavedObject', () => {
         },
       })
     );
-    await clusterClientAdapter.queryEventsBySavedObjects(
-      'index-name',
-      'namespace',
-      'saved-object-type',
-      ['saved-object-id'],
-      { ...DEFAULT_OPTIONS, sort_field: 'event.end', sort_order: 'desc' }
-    );
+    await clusterClientAdapter.queryEventsBySavedObjects({
+      index: 'index-name',
+      namespace: 'namespace',
+      type: 'saved-object-type',
+      ids: ['saved-object-id'],
+      findOptions: { ...DEFAULT_OPTIONS, sort_field: 'event.end', sort_order: 'desc' },
+    });
 
     const [query] = clusterClient.search.mock.calls[0];
     expect(query).toMatchObject({
@@ -559,85 +706,111 @@ describe('queryEventsBySavedObject', () => {
 
     const start = '2020-07-08T00:52:28.350Z';
 
-    await clusterClientAdapter.queryEventsBySavedObjects(
-      'index-name',
-      'namespace',
-      'saved-object-type',
-      ['saved-object-id'],
-      { ...DEFAULT_OPTIONS, start }
-    );
+    await clusterClientAdapter.queryEventsBySavedObjects({
+      index: 'index-name',
+      namespace: 'namespace',
+      type: 'saved-object-type',
+      ids: ['saved-object-id'],
+      findOptions: { ...DEFAULT_OPTIONS, start },
+    });
 
     const [query] = clusterClient.search.mock.calls[0];
-    expect(query).toMatchInlineSnapshot(`
-      Object {
-        "body": Object {
-          "from": 0,
-          "query": Object {
-            "bool": Object {
-              "filter": Array [],
-              "must": Array [
-                Object {
-                  "nested": Object {
-                    "path": "kibana.saved_objects",
-                    "query": Object {
-                      "bool": Object {
-                        "must": Array [
-                          Object {
-                            "term": Object {
-                              "kibana.saved_objects.rel": Object {
-                                "value": "primary",
-                              },
+    expect(query).toMatchObject({
+      body: {
+        from: 0,
+        query: {
+          bool: {
+            filter: [],
+            must: [
+              {
+                nested: {
+                  path: 'kibana.saved_objects',
+                  query: {
+                    bool: {
+                      must: [
+                        {
+                          term: {
+                            'kibana.saved_objects.rel': {
+                              value: 'primary',
                             },
                           },
-                          Object {
-                            "term": Object {
-                              "kibana.saved_objects.type": Object {
-                                "value": "saved-object-type",
-                              },
+                        },
+                        {
+                          term: {
+                            'kibana.saved_objects.type': {
+                              value: 'saved-object-type',
                             },
                           },
-                          Object {
-                            "terms": Object {
-                              "kibana.saved_objects.id": Array [
-                                "saved-object-id",
-                              ],
+                        },
+                        {
+                          term: {
+                            'kibana.saved_objects.namespace': {
+                              value: 'namespace',
                             },
                           },
-                          Object {
-                            "term": Object {
-                              "kibana.saved_objects.namespace": Object {
-                                "value": "namespace",
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+              {
+                bool: {
+                  should: [
+                    {
+                      bool: {
+                        must: [
+                          {
+                            nested: {
+                              path: 'kibana.saved_objects',
+                              query: {
+                                bool: {
+                                  must: [
+                                    {
+                                      terms: {
+                                        'kibana.saved_objects.id': ['saved-object-id'],
+                                      },
+                                    },
+                                  ],
+                                },
+                              },
+                            },
+                          },
+                          {
+                            range: {
+                              'kibana.version': {
+                                gte: '8.0.0',
                               },
                             },
                           },
                         ],
                       },
                     },
-                  },
+                  ],
                 },
-                Object {
-                  "range": Object {
-                    "@timestamp": Object {
-                      "gte": "2020-07-08T00:52:28.350Z",
-                    },
+              },
+              {
+                range: {
+                  '@timestamp': {
+                    gte: '2020-07-08T00:52:28.350Z',
                   },
                 },
-              ],
-            },
-          },
-          "size": 10,
-          "sort": Array [
-            Object {
-              "@timestamp": Object {
-                "order": "asc",
               },
-            },
-          ],
+            ],
+          },
         },
-        "index": "index-name",
-        "track_total_hits": true,
-      }
-    `);
+        size: 10,
+        sort: [
+          {
+            '@timestamp': {
+              order: 'asc',
+            },
+          },
+        ],
+      },
+      index: 'index-name',
+      track_total_hits: true,
+    });
   });
 
   test('supports optional date range', async () => {
@@ -661,92 +834,163 @@ describe('queryEventsBySavedObject', () => {
     const start = '2020-07-08T00:52:28.350Z';
     const end = '2020-07-08T00:00:00.000Z';
 
-    await clusterClientAdapter.queryEventsBySavedObjects(
-      'index-name',
-      'namespace',
-      'saved-object-type',
-      ['saved-object-id'],
-      { ...DEFAULT_OPTIONS, start, end }
-    );
+    await clusterClientAdapter.queryEventsBySavedObjects({
+      index: 'index-name',
+      namespace: 'namespace',
+      type: 'saved-object-type',
+      ids: ['saved-object-id'],
+      findOptions: { ...DEFAULT_OPTIONS, start, end },
+      legacyIds: ['legacy-id'],
+    });
 
     const [query] = clusterClient.search.mock.calls[0];
-    expect(query).toMatchInlineSnapshot(`
-      Object {
-        "body": Object {
-          "from": 0,
-          "query": Object {
-            "bool": Object {
-              "filter": Array [],
-              "must": Array [
-                Object {
-                  "nested": Object {
-                    "path": "kibana.saved_objects",
-                    "query": Object {
-                      "bool": Object {
-                        "must": Array [
-                          Object {
-                            "term": Object {
-                              "kibana.saved_objects.rel": Object {
-                                "value": "primary",
-                              },
+    expect(query).toMatchObject({
+      body: {
+        from: 0,
+        query: {
+          bool: {
+            filter: [],
+            must: [
+              {
+                nested: {
+                  path: 'kibana.saved_objects',
+                  query: {
+                    bool: {
+                      must: [
+                        {
+                          term: {
+                            'kibana.saved_objects.rel': {
+                              value: 'primary',
                             },
                           },
-                          Object {
-                            "term": Object {
-                              "kibana.saved_objects.type": Object {
-                                "value": "saved-object-type",
+                        },
+                        {
+                          term: {
+                            'kibana.saved_objects.type': {
+                              value: 'saved-object-type',
+                            },
+                          },
+                        },
+                        {
+                          term: {
+                            'kibana.saved_objects.namespace': {
+                              value: 'namespace',
+                            },
+                          },
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+              {
+                bool: {
+                  should: [
+                    {
+                      bool: {
+                        must: [
+                          {
+                            nested: {
+                              path: 'kibana.saved_objects',
+                              query: {
+                                bool: {
+                                  must: [
+                                    {
+                                      terms: {
+                                        'kibana.saved_objects.id': ['saved-object-id'],
+                                      },
+                                    },
+                                  ],
+                                },
                               },
                             },
                           },
-                          Object {
-                            "terms": Object {
-                              "kibana.saved_objects.id": Array [
-                                "saved-object-id",
-                              ],
+                          {
+                            range: {
+                              'kibana.version': {
+                                gte: '8.0.0',
+                              },
                             },
                           },
-                          Object {
-                            "term": Object {
-                              "kibana.saved_objects.namespace": Object {
-                                "value": "namespace",
+                        ],
+                      },
+                    },
+                    {
+                      bool: {
+                        must: [
+                          {
+                            nested: {
+                              path: 'kibana.saved_objects',
+                              query: {
+                                bool: {
+                                  must: [
+                                    {
+                                      terms: {
+                                        'kibana.saved_objects.id': ['legacy-id'],
+                                      },
+                                    },
+                                  ],
+                                },
                               },
                             },
                           },
+                          {
+                            bool: {
+                              should: [
+                                {
+                                  range: {
+                                    'kibana.version': {
+                                      lt: '8.0.0',
+                                    },
+                                  },
+                                },
+                                {
+                                  bool: {
+                                    must_not: {
+                                      exists: {
+                                        field: 'kibana.version',
+                                      },
+                                    },
+                                  },
+                                },
+                              ],
+                            },
+                          },
                         ],
                       },
                     },
-                  },
+                  ],
                 },
-                Object {
-                  "range": Object {
-                    "@timestamp": Object {
-                      "gte": "2020-07-08T00:52:28.350Z",
-                    },
+              },
+              {
+                range: {
+                  '@timestamp': {
+                    gte: '2020-07-08T00:52:28.350Z',
                   },
                 },
-                Object {
-                  "range": Object {
-                    "@timestamp": Object {
-                      "lte": "2020-07-08T00:00:00.000Z",
-                    },
+              },
+              {
+                range: {
+                  '@timestamp': {
+                    lte: '2020-07-08T00:00:00.000Z',
                   },
                 },
-              ],
-            },
-          },
-          "size": 10,
-          "sort": Array [
-            Object {
-              "@timestamp": Object {
-                "order": "asc",
               },
-            },
-          ],
+            ],
+          },
         },
-        "index": "index-name",
-        "track_total_hits": true,
-      }
-    `);
+        size: 10,
+        sort: [
+          {
+            '@timestamp': {
+              order: 'asc',
+            },
+          },
+        ],
+      },
+      index: 'index-name',
+      track_total_hits: true,
+    });
   });
 });
 
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
index a3a48c04370d8..47bd29cf4b08a 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -41,9 +41,20 @@ export interface QueryEventsBySavedObjectResult {
   data: IValidatedEvent[];
 }
 
+interface QueryOptionsEventsBySavedObjectFilter {
+  index: string;
+  namespace: string | undefined;
+  type: string;
+  ids: string[];
+  findOptions: FindOptionsType;
+  legacyIds?: string[];
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AliasAny = any;
 
+const LEGACY_ID_CUTOFF_VERSION = '8.0.0';
+
 export class ClusterClientAdapter<TDoc extends { body: AliasAny; index: string } = Doc> {
   private readonly logger: Logger;
   private readonly elasticsearchClientPromise: Promise<ElasticsearchClient>;
@@ -202,13 +213,12 @@ export class ClusterClientAdapter<TDoc extends { body: AliasAny; index: string }
   }
 
   public async queryEventsBySavedObjects(
-    index: string,
-    namespace: string | undefined,
-    type: string,
-    ids: string[],
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    { page, per_page: perPage, start, end, sort_field, sort_order, filter }: FindOptionsType
+    queryOptions: QueryOptionsEventsBySavedObjectFilter
   ): Promise<QueryEventsBySavedObjectResult> {
+    const { index, namespace, type, ids, findOptions, legacyIds } = queryOptions;
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    const { page, per_page: perPage, start, end, sort_field, sort_order, filter } = findOptions;
+
     const defaultNamespaceQuery = {
       bool: {
         must_not: {
@@ -238,41 +248,125 @@ export class ClusterClientAdapter<TDoc extends { body: AliasAny; index: string }
       });
       throw err;
     }
+    const savedObjectsQueryMust: estypes.QueryDslQueryContainer[] = [
+      {
+        term: {
+          'kibana.saved_objects.rel': {
+            value: SAVED_OBJECT_REL_PRIMARY,
+          },
+        },
+      },
+      {
+        term: {
+          'kibana.saved_objects.type': {
+            value: type,
+          },
+        },
+      },
+      // @ts-expect-error undefined is not assignable as QueryDslTermQuery value
+      namespaceQuery,
+    ];
+
     const musts: estypes.QueryDslQueryContainer[] = [
       {
         nested: {
           path: 'kibana.saved_objects',
           query: {
             bool: {
-              must: [
-                {
-                  term: {
-                    'kibana.saved_objects.rel': {
-                      value: SAVED_OBJECT_REL_PRIMARY,
+              must: reject(savedObjectsQueryMust, isUndefined),
+            },
+          },
+        },
+      },
+    ];
+
+    const shouldQuery = [];
+
+    shouldQuery.push({
+      bool: {
+        must: [
+          {
+            nested: {
+              path: 'kibana.saved_objects',
+              query: {
+                bool: {
+                  must: [
+                    {
+                      terms: {
+                        // default maximum of 65,536 terms, configurable by index.max_terms_count
+                        'kibana.saved_objects.id': ids,
+                      },
                     },
+                  ],
+                },
+              },
+            },
+          },
+          {
+            range: {
+              'kibana.version': {
+                gte: LEGACY_ID_CUTOFF_VERSION,
+              },
+            },
+          },
+        ],
+      },
+    });
+
+    if (legacyIds && legacyIds.length > 0) {
+      shouldQuery.push({
+        bool: {
+          must: [
+            {
+              nested: {
+                path: 'kibana.saved_objects',
+                query: {
+                  bool: {
+                    must: [
+                      {
+                        terms: {
+                          // default maximum of 65,536 terms, configurable by index.max_terms_count
+                          'kibana.saved_objects.id': legacyIds,
+                        },
+                      },
+                    ],
                   },
                 },
-                {
-                  term: {
-                    'kibana.saved_objects.type': {
-                      value: type,
+              },
+            },
+            {
+              bool: {
+                should: [
+                  {
+                    range: {
+                      'kibana.version': {
+                        lt: LEGACY_ID_CUTOFF_VERSION,
+                      },
                     },
                   },
-                },
-                {
-                  terms: {
-                    // default maximum of 65,536 terms, configurable by index.max_terms_count
-                    'kibana.saved_objects.id': ids,
+                  {
+                    bool: {
+                      must_not: {
+                        exists: {
+                          field: 'kibana.version',
+                        },
+                      },
+                    },
                   },
-                },
-                // @ts-expect-error undefined is not assignable as QueryDslTermQuery value
-                namespaceQuery,
-              ],
+                ],
+              },
             },
-          },
+          ],
         },
+      });
+    }
+
+    musts.push({
+      bool: {
+        should: shouldQuery,
       },
-    ];
+    });
+
     if (start) {
       musts.push({
         range: {
diff --git a/x-pack/plugins/event_log/server/event_log_client.test.ts b/x-pack/plugins/event_log/server/event_log_client.test.ts
index 1f58592ea44fa..6babfef9bd8a8 100644
--- a/x-pack/plugins/event_log/server/event_log_client.test.ts
+++ b/x-pack/plugins/event_log/server/event_log_client.test.ts
@@ -111,21 +111,27 @@ describe('EventLogStart', () => {
       esContext.esAdapter.queryEventsBySavedObjects.mockResolvedValue(result);
 
       expect(
-        await eventLogClient.findEventsBySavedObjectIds('saved-object-type', ['saved-object-id'])
+        await eventLogClient.findEventsBySavedObjectIds(
+          'saved-object-type',
+          ['saved-object-id'],
+          undefined,
+          ['legacy-id']
+        )
       ).toEqual(result);
 
-      expect(esContext.esAdapter.queryEventsBySavedObjects).toHaveBeenCalledWith(
-        esContext.esNames.indexPattern,
-        undefined,
-        'saved-object-type',
-        ['saved-object-id'],
-        {
+      expect(esContext.esAdapter.queryEventsBySavedObjects).toHaveBeenCalledWith({
+        index: esContext.esNames.indexPattern,
+        namespace: undefined,
+        type: 'saved-object-type',
+        ids: ['saved-object-id'],
+        findOptions: {
           page: 1,
           per_page: 10,
           sort_field: '@timestamp',
           sort_order: 'asc',
-        }
-      );
+        },
+        legacyIds: ['legacy-id'],
+      });
     });
 
     test('fetches all events in time frame that reference the saved object', async () => {
@@ -189,26 +195,32 @@ describe('EventLogStart', () => {
       const end = moment().add(1, 'days').toISOString();
 
       expect(
-        await eventLogClient.findEventsBySavedObjectIds('saved-object-type', ['saved-object-id'], {
-          start,
-          end,
-        })
+        await eventLogClient.findEventsBySavedObjectIds(
+          'saved-object-type',
+          ['saved-object-id'],
+          {
+            start,
+            end,
+          },
+          ['legacy-id']
+        )
       ).toEqual(result);
 
-      expect(esContext.esAdapter.queryEventsBySavedObjects).toHaveBeenCalledWith(
-        esContext.esNames.indexPattern,
-        undefined,
-        'saved-object-type',
-        ['saved-object-id'],
-        {
+      expect(esContext.esAdapter.queryEventsBySavedObjects).toHaveBeenCalledWith({
+        index: esContext.esNames.indexPattern,
+        namespace: undefined,
+        type: 'saved-object-type',
+        ids: ['saved-object-id'],
+        findOptions: {
           page: 1,
           per_page: 10,
           sort_field: '@timestamp',
           sort_order: 'asc',
           start,
           end,
-        }
-      );
+        },
+        legacyIds: ['legacy-id'],
+      });
     });
 
     test('validates that the start date is valid', async () => {
diff --git a/x-pack/plugins/event_log/server/event_log_client.ts b/x-pack/plugins/event_log/server/event_log_client.ts
index 5214db1169deb..39b78296e3875 100644
--- a/x-pack/plugins/event_log/server/event_log_client.ts
+++ b/x-pack/plugins/event_log/server/event_log_client.ts
@@ -83,7 +83,8 @@ export class EventLogClient implements IEventLogClient {
   async findEventsBySavedObjectIds(
     type: string,
     ids: string[],
-    options?: Partial<FindOptionsType>
+    options?: Partial<FindOptionsType>,
+    legacyIds?: string[]
   ): Promise<QueryEventsBySavedObjectResult> {
     const findOptions = findOptionsSchema.validate(options ?? {});
 
@@ -93,12 +94,13 @@ export class EventLogClient implements IEventLogClient {
     // verify the user has the required permissions to view this saved objects
     await this.savedObjectGetter(type, ids);
 
-    return await this.esContext.esAdapter.queryEventsBySavedObjects(
-      this.esContext.esNames.indexPattern,
+    return await this.esContext.esAdapter.queryEventsBySavedObjects({
+      index: this.esContext.esNames.indexPattern,
       namespace,
       type,
       ids,
-      findOptions
-    );
+      findOptions,
+      legacyIds,
+    });
   }
 }
diff --git a/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts b/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts
index 5259191a98f2b..4685306e869da 100644
--- a/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts
+++ b/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts
@@ -41,7 +41,7 @@ describe('find_by_ids', () => {
       eventLogClient,
       {
         params: { type: 'action' },
-        body: { ids: ['1'] },
+        body: { ids: ['1'], legacyIds: ['2'] },
       },
       ['ok']
     );
@@ -50,9 +50,10 @@ describe('find_by_ids', () => {
 
     expect(eventLogClient.findEventsBySavedObjectIds).toHaveBeenCalledTimes(1);
 
-    const [type, ids] = eventLogClient.findEventsBySavedObjectIds.mock.calls[0];
+    const [type, ids, , legacyIds] = eventLogClient.findEventsBySavedObjectIds.mock.calls[0];
     expect(type).toEqual(`action`);
     expect(ids).toEqual(['1']);
+    expect(legacyIds).toEqual(['2']);
 
     expect(res.ok).toHaveBeenCalledWith({
       body: result,
diff --git a/x-pack/plugins/event_log/server/routes/find_by_ids.ts b/x-pack/plugins/event_log/server/routes/find_by_ids.ts
index 130887e5d30a7..378b9516631ad 100644
--- a/x-pack/plugins/event_log/server/routes/find_by_ids.ts
+++ b/x-pack/plugins/event_log/server/routes/find_by_ids.ts
@@ -23,6 +23,7 @@ const paramSchema = schema.object({
 
 const bodySchema = schema.object({
   ids: schema.arrayOf(schema.string(), { defaultValue: [] }),
+  legacyIds: schema.arrayOf(schema.string(), { defaultValue: [] }),
 });
 
 export const findByIdsRoute = (router: EventLogRouter, systemLogger: Logger) => {
@@ -46,13 +47,13 @@ export const findByIdsRoute = (router: EventLogRouter, systemLogger: Logger) =>
       const eventLogClient = context.eventLog.getEventLogClient();
       const {
         params: { type },
-        body: { ids },
+        body: { ids, legacyIds },
         query,
       } = req;
 
       try {
         return res.ok({
-          body: await eventLogClient.findEventsBySavedObjectIds(type, ids, query),
+          body: await eventLogClient.findEventsBySavedObjectIds(type, ids, query, legacyIds),
         });
       } catch (err) {
         const call = `findEventsBySavedObjectIds(${type}, [${ids}], ${JSON.stringify(query)})`;
diff --git a/x-pack/plugins/event_log/server/types.ts b/x-pack/plugins/event_log/server/types.ts
index 0e5e62b591290..0750e89473b8e 100644
--- a/x-pack/plugins/event_log/server/types.ts
+++ b/x-pack/plugins/event_log/server/types.ts
@@ -45,7 +45,8 @@ export interface IEventLogClient {
   findEventsBySavedObjectIds(
     type: string,
     ids: string[],
-    options?: Partial<FindOptionsType>
+    options?: Partial<FindOptionsType>,
+    legacyIds?: string[]
   ): Promise<QueryEventsBySavedObjectResult>;
 }
 
diff --git a/x-pack/plugins/global_search/public/services/search_service.test.ts b/x-pack/plugins/global_search/public/services/search_service.test.ts
index 4b3c06f03dcc8..b0e6a72290438 100644
--- a/x-pack/plugins/global_search/public/services/search_service.test.ts
+++ b/x-pack/plugins/global_search/public/services/search_service.test.ts
@@ -272,6 +272,43 @@ describe('SearchService', () => {
         });
       });
 
+      it('catches errors from providers', async () => {
+        const { registerResultProvider } = service.setup({
+          config: createConfig(),
+        });
+
+        getTestScheduler().run(({ expectObservable, hot }) => {
+          registerResultProvider(
+            createProvider('A', {
+              source: hot('a---c-|', {
+                a: [providerResult('A1'), providerResult('A2')],
+                c: [providerResult('A3')],
+              }),
+            })
+          );
+          registerResultProvider(
+            createProvider('B', {
+              source: hot(
+                '-b-#  ',
+                {
+                  b: [providerResult('B1')],
+                },
+                new Error('something went bad')
+              ),
+            })
+          );
+
+          const { find } = service.start(startDeps());
+          const results = find({ term: 'foobar' }, {});
+
+          expectObservable(results).toBe('ab--c-|', {
+            a: expectedBatch('A1', 'A2'),
+            b: expectedBatch('B1'),
+            c: expectedBatch('A3'),
+          });
+        });
+      });
+
       it('return mixed server/client providers results', async () => {
         const { registerResultProvider } = service.setup({
           config: createConfig(),
@@ -304,6 +341,33 @@ describe('SearchService', () => {
         });
       });
 
+      it('catches errors from the server', async () => {
+        const { registerResultProvider } = service.setup({
+          config: createConfig(),
+        });
+
+        getTestScheduler().run(({ expectObservable, hot }) => {
+          fetchServerResultsMock.mockReturnValue(hot('#', {}, new Error('fetch error')));
+
+          registerResultProvider(
+            createProvider('A', {
+              source: hot('a-b-|', {
+                a: [providerResult('P1')],
+                b: [providerResult('P2')],
+              }),
+            })
+          );
+
+          const { find } = service.start(startDeps());
+          const results = find({ term: 'foobar' }, {});
+
+          expectObservable(results).toBe('a-b-|', {
+            a: expectedBatch('P1'),
+            b: expectedBatch('P2'),
+          });
+        });
+      });
+
       it('handles the `aborted$` option', async () => {
         const { registerResultProvider } = service.setup({
           config: createConfig(),
diff --git a/x-pack/plugins/global_search/public/services/search_service.ts b/x-pack/plugins/global_search/public/services/search_service.ts
index bf06aa04061ed..85f4d4143a609 100644
--- a/x-pack/plugins/global_search/public/services/search_service.ts
+++ b/x-pack/plugins/global_search/public/services/search_service.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { merge, Observable, timer, throwError } from 'rxjs';
-import { map, takeUntil } from 'rxjs/operators';
+import { merge, Observable, timer, throwError, EMPTY } from 'rxjs';
+import { map, takeUntil, catchError } from 'rxjs/operators';
 import { uniq } from 'lodash';
 import { duration } from 'moment';
 import { i18n } from '@kbn/i18n';
@@ -177,16 +177,16 @@ export class SearchService {
     const serverResults$ = fetchServerResults(this.http!, params, {
       preference,
       aborted$,
-    });
+    }).pipe(catchError(() => EMPTY));
 
     const providersResults$ = [...this.providers.values()].map((provider) =>
       provider.find(params, providerOptions).pipe(
+        catchError(() => EMPTY),
         takeInArray(this.maxProviderResults),
         takeUntil(aborted$),
         map((results) => results.map((r) => processResult(r)))
       )
     );
-
     return merge(...providersResults$, serverResults$).pipe(
       map((results) => ({
         results,
diff --git a/x-pack/plugins/global_search/server/services/search_service.test.ts b/x-pack/plugins/global_search/server/services/search_service.test.ts
index 246fbd675aba2..45824fde26afe 100644
--- a/x-pack/plugins/global_search/server/services/search_service.test.ts
+++ b/x-pack/plugins/global_search/server/services/search_service.test.ts
@@ -178,6 +178,44 @@ describe('SearchService', () => {
         });
       });
 
+      it('catches errors from providers', async () => {
+        const { registerResultProvider } = service.setup({
+          config: createConfig(),
+          basePath,
+        });
+
+        getTestScheduler().run(({ expectObservable, hot }) => {
+          registerResultProvider(
+            createProvider('A', {
+              source: hot('a---c-|', {
+                a: [result('A1'), result('A2')],
+                c: [result('A3')],
+              }),
+            })
+          );
+          registerResultProvider(
+            createProvider('B', {
+              source: hot(
+                '-b-#  ',
+                {
+                  b: [result('B1')],
+                },
+                new Error('something went bad')
+              ),
+            })
+          );
+
+          const { find } = service.start({ core: coreStart, licenseChecker });
+          const results = find({ term: 'foobar' }, {}, request);
+
+          expectObservable(results).toBe('ab--c-|', {
+            a: expectedBatch('A1', 'A2'),
+            b: expectedBatch('B1'),
+            c: expectedBatch('A3'),
+          });
+        });
+      });
+
       it('handles the `aborted$` option', async () => {
         const { registerResultProvider } = service.setup({
           config: createConfig(),
diff --git a/x-pack/plugins/global_search/server/services/search_service.ts b/x-pack/plugins/global_search/server/services/search_service.ts
index a6c2a7ee234d6..22bac036544ab 100644
--- a/x-pack/plugins/global_search/server/services/search_service.ts
+++ b/x-pack/plugins/global_search/server/services/search_service.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { Observable, timer, merge, throwError } from 'rxjs';
-import { map, takeUntil } from 'rxjs/operators';
+import { Observable, timer, merge, throwError, EMPTY } from 'rxjs';
+import { map, takeUntil, catchError } from 'rxjs/operators';
 import { uniq } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { KibanaRequest, CoreStart, IBasePath } from 'src/core/server';
@@ -174,6 +174,7 @@ export class SearchService {
 
     const providersResults$ = [...this.providers.values()].map((provider) =>
       provider.find(params, findOptions, context).pipe(
+        catchError(() => EMPTY),
         takeInArray(this.maxProviderResults),
         takeUntil(aborted$),
         map((results) => results.map((r) => processResult(r)))
diff --git a/x-pack/plugins/infra/common/http_api/metrics_api.ts b/x-pack/plugins/infra/common/http_api/metrics_api.ts
index 94d26abc701fe..c2449707647d7 100644
--- a/x-pack/plugins/infra/common/http_api/metrics_api.ts
+++ b/x-pack/plugins/infra/common/http_api/metrics_api.ts
@@ -78,7 +78,9 @@ export const MetricsAPISeriesRT = rt.intersection([
 ]);
 
 export const MetricsAPIResponseRT = rt.type({
-  series: rt.array(MetricsAPISeriesRT),
+  series: rt.array(
+    rt.intersection([MetricsAPISeriesRT, rt.partial({ metricsets: rt.array(rt.string) })])
+  ),
   info: MetricsAPIPageInfoRT,
 });
 
diff --git a/x-pack/plugins/infra/server/lib/metrics/index.ts b/x-pack/plugins/infra/server/lib/metrics/index.ts
index a2d9ad2b401d4..131f6944b0484 100644
--- a/x-pack/plugins/infra/server/lib/metrics/index.ts
+++ b/x-pack/plugins/infra/server/lib/metrics/index.ts
@@ -91,12 +91,14 @@ export const query = async (
     return {
       series: groupings.buckets.map((bucket) => {
         const keys = Object.values(bucket.key);
-        return convertHistogramBucketsToTimeseries(
+        const metricsetNames = bucket.metricsets.buckets.map((m) => m.key);
+        const timeseries = convertHistogramBucketsToTimeseries(
           keys,
           options,
           bucket.histogram.buckets,
           bucketSize * 1000
         );
+        return { ...timeseries, metricsets: metricsetNames };
       }),
       info: {
         afterKey: returnAfterKey ? afterKey : null,
diff --git a/x-pack/plugins/infra/server/lib/metrics/lib/__snapshots__/create_aggregations.test.ts.snap b/x-pack/plugins/infra/server/lib/metrics/lib/__snapshots__/create_aggregations.test.ts.snap
index c7acfb147aa7e..d35d7ce1a4b81 100644
--- a/x-pack/plugins/infra/server/lib/metrics/lib/__snapshots__/create_aggregations.test.ts.snap
+++ b/x-pack/plugins/infra/server/lib/metrics/lib/__snapshots__/create_aggregations.test.ts.snap
@@ -20,6 +20,11 @@ Object {
       "offset": "-60000ms",
     },
   },
+  "metricsets": Object {
+    "terms": Object {
+      "field": "metricset.name",
+    },
+  },
 }
 `;
 
@@ -45,6 +50,11 @@ Object {
           "offset": "0s",
         },
       },
+      "metricsets": Object {
+        "terms": Object {
+          "field": "metricset.name",
+        },
+      },
     },
     "composite": Object {
       "size": 20,
@@ -82,5 +92,10 @@ Object {
       "offset": "0s",
     },
   },
+  "metricsets": Object {
+    "terms": Object {
+      "field": "metricset.name",
+    },
+  },
 }
 `;
diff --git a/x-pack/plugins/infra/server/lib/metrics/lib/create_aggregations.ts b/x-pack/plugins/infra/server/lib/metrics/lib/create_aggregations.ts
index 1fb87499b8f44..65cd4ebe2d501 100644
--- a/x-pack/plugins/infra/server/lib/metrics/lib/create_aggregations.ts
+++ b/x-pack/plugins/infra/server/lib/metrics/lib/create_aggregations.ts
@@ -25,6 +25,11 @@ export const createAggregations = (options: MetricsAPIRequest) => {
       },
       aggregations: createMetricsAggregations(options),
     },
+    metricsets: {
+      terms: {
+        field: 'metricset.name',
+      },
+    },
   };
 
   if (Array.isArray(options.groupBy) && options.groupBy.length) {
diff --git a/x-pack/plugins/infra/server/lib/metrics/types.ts b/x-pack/plugins/infra/server/lib/metrics/types.ts
index e1f5ecd45e363..b18486f88cc4c 100644
--- a/x-pack/plugins/infra/server/lib/metrics/types.ts
+++ b/x-pack/plugins/infra/server/lib/metrics/types.ts
@@ -63,6 +63,14 @@ export const HistogramResponseRT = rt.type({
   histogram: rt.type({
     buckets: rt.array(HistogramBucketRT),
   }),
+  metricsets: rt.type({
+    buckets: rt.array(
+      rt.type({
+        key: rt.string,
+        doc_count: rt.number,
+      })
+    ),
+  }),
 });
 
 const GroupingBucketRT = rt.intersection([
diff --git a/x-pack/plugins/infra/server/routes/snapshot/lib/get_nodes.ts b/x-pack/plugins/infra/server/routes/snapshot/lib/get_nodes.ts
index 0fef75faed07e..f59756e0c5b25 100644
--- a/x-pack/plugins/infra/server/routes/snapshot/lib/get_nodes.ts
+++ b/x-pack/plugins/infra/server/routes/snapshot/lib/get_nodes.ts
@@ -10,7 +10,7 @@ import { ESSearchClient } from '../../../lib/metrics/types';
 import { InfraSource } from '../../../lib/sources';
 import { transformRequestToMetricsAPIRequest } from './transform_request_to_metrics_api_request';
 import { queryAllData } from './query_all_data';
-import { transformMetricsApiResponseToSnapshotResponse } from './trasform_metrics_ui_response';
+import { transformMetricsApiResponseToSnapshotResponse } from './transform_metrics_ui_response';
 import { copyMissingMetrics } from './copy_missing_metrics';
 import { LogQueryFields } from '../../../services/log_queries/get_log_query_fields';
 
diff --git a/x-pack/plugins/infra/server/routes/snapshot/lib/transform_metrics_ui_response.test.ts b/x-pack/plugins/infra/server/routes/snapshot/lib/transform_metrics_ui_response.test.ts
new file mode 100644
index 0000000000000..159f6d0b646ec
--- /dev/null
+++ b/x-pack/plugins/infra/server/routes/snapshot/lib/transform_metrics_ui_response.test.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { transformMetricsApiResponseToSnapshotResponse } from './transform_metrics_ui_response';
+
+jest.mock('./apply_metadata_to_last_path', () => ({
+  applyMetadataToLastPath: (series: any) => [{ label: series.id }],
+}));
+
+const now = 1630597319235;
+
+describe('transformMetricsApiResponseToSnapshotResponse', () => {
+  test('filters out nodes from APM which report no data', () => {
+    const result = transformMetricsApiResponseToSnapshotResponse(
+      {
+        // @ts-ignore
+        metrics: [{ id: 'cpu' }],
+      },
+      {
+        includeTimeseries: false,
+        nodeType: 'host',
+      },
+      {},
+      {
+        info: {
+          interval: 60,
+        },
+        series: [
+          {
+            metricsets: ['app'],
+            id: 'apm-node-with-no-data',
+            columns: [],
+            rows: [
+              {
+                timestamp: now,
+                cpu: null,
+              },
+            ],
+          },
+          {
+            metricsets: ['app'],
+            id: 'apm-node-with-data',
+            columns: [],
+            rows: [
+              {
+                timestamp: now,
+                cpu: 1.0,
+              },
+            ],
+          },
+          {
+            metricsets: ['cpu'],
+            id: 'metricbeat-node',
+            columns: [],
+            rows: [
+              {
+                timestamp: now,
+                cpu: 1.0,
+              },
+            ],
+          },
+        ],
+      }
+    );
+    const nodeNames = result.nodes.map((n) => n.name);
+    expect(nodeNames).toEqual(expect.arrayContaining(['metricbeat-node', 'apm-node-with-data']));
+    expect(nodeNames).not.toEqual(expect.arrayContaining(['apm-node']));
+  });
+});
diff --git a/x-pack/plugins/infra/server/routes/snapshot/lib/transform_metrics_ui_response.ts b/x-pack/plugins/infra/server/routes/snapshot/lib/transform_metrics_ui_response.ts
new file mode 100644
index 0000000000000..a76093f78e08c
--- /dev/null
+++ b/x-pack/plugins/infra/server/routes/snapshot/lib/transform_metrics_ui_response.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { get, max, sum, last, isNumber } from 'lodash';
+import { SnapshotMetricType } from '../../../../common/inventory_models/types';
+import {
+  MetricsAPIResponse,
+  SnapshotNodeResponse,
+  MetricsAPIRequest,
+  MetricsExplorerColumnType,
+  MetricsAPIRow,
+  SnapshotRequest,
+  SnapshotNodePath,
+  SnapshotNodeMetric,
+  SnapshotNode,
+} from '../../../../common/http_api';
+import { META_KEY } from './constants';
+import { InfraSource } from '../../../lib/sources';
+import { applyMetadataToLastPath } from './apply_metadata_to_last_path';
+
+const getMetricValue = (row: MetricsAPIRow) => {
+  if (!isNumber(row.metric_0)) return null;
+  const value = row.metric_0;
+  return isFinite(value) ? value : null;
+};
+
+const calculateMax = (rows: MetricsAPIRow[]) => {
+  return max(rows.map(getMetricValue)) || 0;
+};
+
+const calculateAvg = (rows: MetricsAPIRow[]): number => {
+  return sum(rows.map(getMetricValue)) / rows.length || 0;
+};
+
+const getLastValue = (rows: MetricsAPIRow[]) => {
+  const row = last(rows);
+  if (!row) return null;
+  return getMetricValue(row);
+};
+
+export const transformMetricsApiResponseToSnapshotResponse = (
+  options: MetricsAPIRequest,
+  snapshotRequest: SnapshotRequest,
+  source: InfraSource,
+  metricsApiResponse: MetricsAPIResponse
+): SnapshotNodeResponse => {
+  const nodes = metricsApiResponse.series
+    .map((series) => {
+      const node = {
+        metrics: options.metrics
+          .filter((m) => m.id !== META_KEY)
+          .map((metric) => {
+            const name = metric.id as SnapshotMetricType;
+            const timeseries = {
+              id: name,
+              columns: [
+                { name: 'timestamp', type: 'date' as MetricsExplorerColumnType },
+                { name: 'metric_0', type: 'number' as MetricsExplorerColumnType },
+              ],
+              rows: series.rows.map((row) => {
+                return { timestamp: row.timestamp, metric_0: get(row, metric.id, null) };
+              }),
+            };
+            const maxValue = calculateMax(timeseries.rows);
+            const avg = calculateAvg(timeseries.rows);
+            const value = getLastValue(timeseries.rows);
+            const nodeMetric: SnapshotNodeMetric = { name, max: maxValue, value, avg };
+            if (snapshotRequest.includeTimeseries) {
+              nodeMetric.timeseries = timeseries;
+            }
+            return nodeMetric;
+          }),
+        path:
+          series.keys?.map((key) => {
+            return { value: key, label: key } as SnapshotNodePath;
+          }) ?? [],
+        name: '',
+      };
+
+      const isNoData = node.metrics.every((m) => m.value === null);
+      const isAPMNode = series.metricsets?.includes('app');
+      if (isNoData && isAPMNode) return null;
+
+      const path = applyMetadataToLastPath(series, node, snapshotRequest, source);
+      const lastPath = last(path);
+      const name = lastPath?.label ?? 'N/A';
+
+      return { ...node, path, name };
+    })
+    .filter((n) => n !== null) as SnapshotNode[];
+  return { nodes, interval: `${metricsApiResponse.info.interval}s` };
+};
diff --git a/x-pack/plugins/infra/server/routes/snapshot/lib/trasform_metrics_ui_response.ts b/x-pack/plugins/infra/server/routes/snapshot/lib/trasform_metrics_ui_response.ts
deleted file mode 100644
index 21b3e07e83588..0000000000000
--- a/x-pack/plugins/infra/server/routes/snapshot/lib/trasform_metrics_ui_response.ts
+++ /dev/null
@@ -1,88 +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 { get, max, sum, last, isNumber } from 'lodash';
-import { SnapshotMetricType } from '../../../../common/inventory_models/types';
-import {
-  MetricsAPIResponse,
-  SnapshotNodeResponse,
-  MetricsAPIRequest,
-  MetricsExplorerColumnType,
-  MetricsAPIRow,
-  SnapshotRequest,
-  SnapshotNodePath,
-  SnapshotNodeMetric,
-} from '../../../../common/http_api';
-import { META_KEY } from './constants';
-import { InfraSource } from '../../../lib/sources';
-import { applyMetadataToLastPath } from './apply_metadata_to_last_path';
-
-const getMetricValue = (row: MetricsAPIRow) => {
-  if (!isNumber(row.metric_0)) return null;
-  const value = row.metric_0;
-  return isFinite(value) ? value : null;
-};
-
-const calculateMax = (rows: MetricsAPIRow[]) => {
-  return max(rows.map(getMetricValue)) || 0;
-};
-
-const calculateAvg = (rows: MetricsAPIRow[]): number => {
-  return sum(rows.map(getMetricValue)) / rows.length || 0;
-};
-
-const getLastValue = (rows: MetricsAPIRow[]) => {
-  const row = last(rows);
-  if (!row) return null;
-  return getMetricValue(row);
-};
-
-export const transformMetricsApiResponseToSnapshotResponse = (
-  options: MetricsAPIRequest,
-  snapshotRequest: SnapshotRequest,
-  source: InfraSource,
-  metricsApiResponse: MetricsAPIResponse
-): SnapshotNodeResponse => {
-  const nodes = metricsApiResponse.series.map((series) => {
-    const node = {
-      metrics: options.metrics
-        .filter((m) => m.id !== META_KEY)
-        .map((metric) => {
-          const name = metric.id as SnapshotMetricType;
-          const timeseries = {
-            id: name,
-            columns: [
-              { name: 'timestamp', type: 'date' as MetricsExplorerColumnType },
-              { name: 'metric_0', type: 'number' as MetricsExplorerColumnType },
-            ],
-            rows: series.rows.map((row) => {
-              return { timestamp: row.timestamp, metric_0: get(row, metric.id, null) };
-            }),
-          };
-          const maxValue = calculateMax(timeseries.rows);
-          const avg = calculateAvg(timeseries.rows);
-          const value = getLastValue(timeseries.rows);
-          const nodeMetric: SnapshotNodeMetric = { name, max: maxValue, value, avg };
-          if (snapshotRequest.includeTimeseries) {
-            nodeMetric.timeseries = timeseries;
-          }
-          return nodeMetric;
-        }),
-      path:
-        series.keys?.map((key) => {
-          return { value: key, label: key } as SnapshotNodePath;
-        }) ?? [],
-      name: '',
-    };
-
-    const path = applyMetadataToLastPath(series, node, snapshotRequest, source);
-    const lastPath = last(path);
-    const name = (lastPath && lastPath.label) || 'N/A';
-    return { ...node, path, name };
-  });
-  return { nodes, interval: `${metricsApiResponse.info.interval}s` };
-};
diff --git a/x-pack/plugins/ml/public/application/components/import_export_jobs/export_jobs_flyout/export_jobs_flyout.tsx b/x-pack/plugins/ml/public/application/components/import_export_jobs/export_jobs_flyout/export_jobs_flyout.tsx
index bd4b805baa186..509c74c359657 100644
--- a/x-pack/plugins/ml/public/application/components/import_export_jobs/export_jobs_flyout/export_jobs_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/components/import_export_jobs/export_jobs_flyout/export_jobs_flyout.tsx
@@ -63,6 +63,7 @@ export const ExportJobsFlyout: FC<Props> = ({ isDisabled, currentTab }) => {
   const [exporting, setExporting] = useState(false);
   const [selectedJobType, setSelectedJobType] = useState<JobType>(currentTab);
   const [switchTabConfirmVisible, setSwitchTabConfirmVisible] = useState(false);
+  const [switchTabNextTab, setSwitchTabNextTab] = useState<JobType>(currentTab);
   const { displayErrorToast, displaySuccessToast } = useMemo(
     () => toastNotificationServiceProvider(toasts),
     [toasts]
@@ -170,16 +171,23 @@ export const ExportJobsFlyout: FC<Props> = ({ isDisabled, currentTab }) => {
     }
   }
 
-  const attemptTabSwitch = useCallback(() => {
-    // if the user has already selected some jobs, open a confirm modal
-    // rather than changing tabs
-    if (selectedJobIds.length > 0) {
-      setSwitchTabConfirmVisible(true);
-      return;
-    }
+  const attemptTabSwitch = useCallback(
+    (jobType: JobType) => {
+      if (jobType === selectedJobType) {
+        return;
+      }
+      // if the user has already selected some jobs, open a confirm modal
+      // rather than changing tabs
+      if (selectedJobIds.length > 0) {
+        setSwitchTabNextTab(jobType);
+        setSwitchTabConfirmVisible(true);
+        return;
+      }
 
-    switchTab();
-  }, [selectedJobIds]);
+      switchTab(jobType);
+    },
+    [selectedJobIds]
+  );
 
   useEffect(() => {
     setSelectedJobDependencies(
@@ -187,10 +195,7 @@ export const ExportJobsFlyout: FC<Props> = ({ isDisabled, currentTab }) => {
     );
   }, [selectedJobIds]);
 
-  function switchTab() {
-    const jobType =
-      selectedJobType === 'anomaly-detector' ? 'data-frame-analytics' : 'anomaly-detector';
-
+  function switchTab(jobType: JobType) {
     setSwitchTabConfirmVisible(false);
     setSelectedJobIds([]);
     setSelectedJobType(jobType);
@@ -211,7 +216,12 @@ export const ExportJobsFlyout: FC<Props> = ({ isDisabled, currentTab }) => {
 
       {showFlyout === true && isDisabled === false && (
         <>
-          <EuiFlyout onClose={() => setShowFlyout(false)} hideCloseButton size="s">
+          <EuiFlyout
+            onClose={() => setShowFlyout(false)}
+            hideCloseButton
+            size="s"
+            data-test-subj="mlJobMgmtExportJobsFlyout"
+          >
             <EuiFlyoutHeader hasBorder>
               <EuiTitle size="m">
                 <h2>
@@ -227,8 +237,9 @@ export const ExportJobsFlyout: FC<Props> = ({ isDisabled, currentTab }) => {
               <EuiTabs size="s">
                 <EuiTab
                   isSelected={selectedJobType === 'anomaly-detector'}
-                  onClick={attemptTabSwitch}
+                  onClick={() => attemptTabSwitch('anomaly-detector')}
                   disabled={exporting}
+                  data-test-subj="mlJobMgmtExportJobsADTab"
                 >
                   <FormattedMessage
                     id="xpack.ml.importExport.exportFlyout.adTab"
@@ -237,8 +248,9 @@ export const ExportJobsFlyout: FC<Props> = ({ isDisabled, currentTab }) => {
                 </EuiTab>
                 <EuiTab
                   isSelected={selectedJobType === 'data-frame-analytics'}
-                  onClick={attemptTabSwitch}
+                  onClick={() => attemptTabSwitch('data-frame-analytics')}
                   disabled={exporting}
+                  data-test-subj="mlJobMgmtExportJobsDFATab"
                 >
                   <FormattedMessage
                     id="xpack.ml.importExport.exportFlyout.dfaTab"
@@ -254,26 +266,40 @@ export const ExportJobsFlyout: FC<Props> = ({ isDisabled, currentTab }) => {
                       <LoadingSpinner />
                     ) : (
                       <>
-                        <EuiButtonEmpty size="xs" onClick={onSelectAll} isDisabled={isDisabled}>
-                          <FormattedMessage
-                            id="xpack.ml.importExport.exportFlyout.adSelectAllButton"
-                            defaultMessage="Select all"
-                          />
+                        <EuiButtonEmpty
+                          size="xs"
+                          onClick={onSelectAll}
+                          isDisabled={isDisabled}
+                          data-test-subj="mlJobMgmtExportJobsSelectAllButton"
+                        >
+                          {selectedJobIds.length === adJobIds.length ? (
+                            <FormattedMessage
+                              id="xpack.ml.importExport.exportFlyout.adDeselectAllButton"
+                              defaultMessage="Deselect all"
+                            />
+                          ) : (
+                            <FormattedMessage
+                              id="xpack.ml.importExport.exportFlyout.adSelectAllButton"
+                              defaultMessage="Select all"
+                            />
+                          )}
                         </EuiButtonEmpty>
 
                         <EuiSpacer size="xs" />
 
-                        {adJobIds.map((id) => (
-                          <div key={id}>
-                            <EuiCheckbox
-                              id={id}
-                              label={id}
-                              checked={selectedJobIds.includes(id)}
-                              onChange={(e) => toggleSelectedJob(e.target.checked, id)}
-                            />
-                            <EuiSpacer size="s" />
-                          </div>
-                        ))}
+                        <div data-test-subj="mlJobMgmtExportJobsADJobList">
+                          {adJobIds.map((id) => (
+                            <div key={id}>
+                              <EuiCheckbox
+                                id={id}
+                                label={id}
+                                checked={selectedJobIds.includes(id)}
+                                onChange={(e) => toggleSelectedJob(e.target.checked, id)}
+                              />
+                              <EuiSpacer size="s" />
+                            </div>
+                          ))}
+                        </div>
                       </>
                     )}
                   </>
@@ -284,26 +310,39 @@ export const ExportJobsFlyout: FC<Props> = ({ isDisabled, currentTab }) => {
                       <LoadingSpinner />
                     ) : (
                       <>
-                        <EuiButtonEmpty size="xs" onClick={onSelectAll} isDisabled={isDisabled}>
-                          <FormattedMessage
-                            id="xpack.ml.importExport.exportFlyout.dfaSelectAllButton"
-                            defaultMessage="Select all"
-                          />
+                        <EuiButtonEmpty
+                          size="xs"
+                          onClick={onSelectAll}
+                          isDisabled={isDisabled}
+                          data-test-subj="mlJobMgmtExportJobsSelectAllButton"
+                        >
+                          {selectedJobIds.length === dfaJobIds.length ? (
+                            <FormattedMessage
+                              id="xpack.ml.importExport.exportFlyout.dfaDeselectAllButton"
+                              defaultMessage="Deselect all"
+                            />
+                          ) : (
+                            <FormattedMessage
+                              id="xpack.ml.importExport.exportFlyout.dfaSelectAllButton"
+                              defaultMessage="Select all"
+                            />
+                          )}
                         </EuiButtonEmpty>
 
                         <EuiSpacer size="xs" />
-
-                        {dfaJobIds.map((id) => (
-                          <div key={id}>
-                            <EuiCheckbox
-                              id={id}
-                              label={id}
-                              checked={selectedJobIds.includes(id)}
-                              onChange={(e) => toggleSelectedJob(e.target.checked, id)}
-                            />
-                            <EuiSpacer size="s" />
-                          </div>
-                        ))}
+                        <div data-test-subj="mlJobMgmtExportJobsDFAJobList">
+                          {dfaJobIds.map((id) => (
+                            <div key={id}>
+                              <EuiCheckbox
+                                id={id}
+                                label={id}
+                                checked={selectedJobIds.includes(id)}
+                                onChange={(e) => toggleSelectedJob(e.target.checked, id)}
+                              />
+                              <EuiSpacer size="s" />
+                            </div>
+                          ))}
+                        </div>
                       </>
                     )}
                   </>
@@ -329,6 +368,7 @@ export const ExportJobsFlyout: FC<Props> = ({ isDisabled, currentTab }) => {
                     disabled={selectedJobIds.length === 0 || exporting === true}
                     onClick={onExport}
                     fill
+                    data-test-subj="mlJobMgmtExportExportButton"
                   >
                     <FormattedMessage
                       id="xpack.ml.importExport.exportFlyout.exportButton"
@@ -343,7 +383,7 @@ export const ExportJobsFlyout: FC<Props> = ({ isDisabled, currentTab }) => {
           {switchTabConfirmVisible === true ? (
             <SwitchTabsConfirm
               onCancel={setSwitchTabConfirmVisible.bind(null, false)}
-              onConfirm={switchTab}
+              onConfirm={() => switchTab(switchTabNextTab)}
             />
           ) : null}
         </>
diff --git a/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/cannot_import_jobs_callout.tsx b/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/cannot_import_jobs_callout.tsx
index 732be345a1ee4..565ded9c6f6c3 100644
--- a/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/cannot_import_jobs_callout.tsx
+++ b/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/cannot_import_jobs_callout.tsx
@@ -30,6 +30,7 @@ export const CannotImportJobsCallout: FC<Props> = ({ jobs, autoExpand = false })
           values: { num: jobs.length },
         })}
         color="warning"
+        data-test-subj="mlJobMgmtImportJobsCannotBeImportedCallout"
       >
         {autoExpand ? (
           <SkippedJobList jobs={jobs} />
diff --git a/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/cannot_read_file_callout.tsx b/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/cannot_read_file_callout.tsx
index 4c7a2471db9d6..70f94d1e03155 100644
--- a/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/cannot_read_file_callout.tsx
+++ b/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/cannot_read_file_callout.tsx
@@ -21,10 +21,12 @@ export const CannotReadFileCallout: FC = () => {
         })}
         color="warning"
       >
-        <FormattedMessage
-          id="xpack.ml.importExport.importFlyout.cannotReadFileCallout.body"
-          defaultMessage="Please select a file contained Machine Learning jobs which have been exported from Kibana using the Export Jobs option"
-        />
+        <div data-test-subj="mlJobMgmtImportJobsFileReadErrorCallout">
+          <FormattedMessage
+            id="xpack.ml.importExport.importFlyout.cannotReadFileCallout.body"
+            defaultMessage="Please select a file contained Machine Learning jobs which have been exported from Kibana using the Export Jobs option"
+          />
+        </div>
       </EuiCallOut>
     </>
   );
diff --git a/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/import_jobs_flyout.tsx b/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/import_jobs_flyout.tsx
index 68db42cdbf0eb..dfe07b1984e11 100644
--- a/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/import_jobs_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/components/import_export_jobs/import_jobs_flyout/import_jobs_flyout.tsx
@@ -341,7 +341,12 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled }) => {
       <FlyoutButton onClick={toggleFlyout} isDisabled={isDisabled} />
 
       {showFlyout === true && isDisabled === false && (
-        <EuiFlyout onClose={setShowFlyout.bind(null, false)} hideCloseButton size="m">
+        <EuiFlyout
+          onClose={setShowFlyout.bind(null, false)}
+          hideCloseButton
+          size="m"
+          data-test-subj="mlJobMgmtImportJobsFlyout"
+        >
           <EuiFlyoutHeader hasBorder>
             <EuiTitle size="m">
               <h2>
@@ -373,22 +378,26 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled }) => {
               {showFileReadError ? <CannotReadFileCallout /> : null}
 
               {totalJobsRead > 0 && jobType !== null && (
-                <>
+                <div data-test-subj="mlJobMgmtImportJobsFileRead">
                   <EuiSpacer size="l" />
                   {jobType === 'anomaly-detector' && (
-                    <FormattedMessage
-                      id="xpack.ml.importExport.importFlyout.selectedFiles.ad"
-                      defaultMessage="{num} anomaly detection {num, plural, one {job} other {jobs}} read from file"
-                      values={{ num: totalJobsRead }}
-                    />
+                    <div data-test-subj="mlJobMgmtImportJobsADTitle">
+                      <FormattedMessage
+                        id="xpack.ml.importExport.importFlyout.selectedFiles.ad"
+                        defaultMessage="{num} anomaly detection {num, plural, one {job} other {jobs}} read from file"
+                        values={{ num: totalJobsRead }}
+                      />
+                    </div>
                   )}
 
                   {jobType === 'data-frame-analytics' && (
-                    <FormattedMessage
-                      id="xpack.ml.importExport.importFlyout.selectedFiles.dfa"
-                      defaultMessage="{num} data frame analytics {num, plural, one {job} other {jobs}} read from file"
-                      values={{ num: totalJobsRead }}
-                    />
+                    <div data-test-subj="mlJobMgmtImportJobsDFATitle">
+                      <FormattedMessage
+                        id="xpack.ml.importExport.importFlyout.selectedFiles.dfa"
+                        defaultMessage="{num} data frame analytics {num, plural, one {job} other {jobs}} read from file"
+                        values={{ num: totalJobsRead }}
+                      />
+                    </div>
                   )}
 
                   <EuiSpacer size="m" />
@@ -426,6 +435,7 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled }) => {
                                 value={jobId.jobId}
                                 onChange={(e) => renameJob(e.target.value, i)}
                                 isInvalid={jobId.jobIdValid === false}
+                                data-test-subj="mlJobMgmtImportJobIdInput"
                               />
                             </EuiFormRow>
 
@@ -465,7 +475,7 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled }) => {
                       <EuiSpacer size="m" />
                     </div>
                   ))}
-                </>
+                </div>
               )}
             </>
           </EuiFlyoutBody>
@@ -484,7 +494,12 @@ export const ImportJobsFlyout: FC<Props> = ({ isDisabled }) => {
                 </EuiButtonEmpty>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiButton disabled={importDisabled} onClick={onImport} fill>
+                <EuiButton
+                  disabled={importDisabled}
+                  onClick={onImport}
+                  fill
+                  data-test-subj="mlJobMgmtImportImportButton"
+                >
                   <FormattedMessage
                     id="xpack.ml.importExport.importFlyout.closeButton.importButton"
                     defaultMessage="Import"
diff --git a/x-pack/plugins/monitoring/public/application/global_state_context.tsx b/x-pack/plugins/monitoring/public/application/global_state_context.tsx
index dc33316dbd9d9..57bb638651d05 100644
--- a/x-pack/plugins/monitoring/public/application/global_state_context.tsx
+++ b/x-pack/plugins/monitoring/public/application/global_state_context.tsx
@@ -13,9 +13,11 @@ interface GlobalStateProviderProps {
   toasts: MonitoringStartPluginDependencies['core']['notifications']['toasts'];
 }
 
-interface State {
+export interface State {
   cluster_uuid?: string;
   ccs?: any;
+  inSetupMode?: boolean;
+  save?: () => void;
 }
 
 export const GlobalStateContext = createContext({} as State);
diff --git a/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx b/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
index ddc097caea575..f329323bafda8 100644
--- a/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
@@ -15,8 +15,15 @@ import { TabMenuItem } from '../page_template';
 import { PageLoading } from '../../../components';
 import { Overview } from '../../../components/cluster/overview';
 import { ExternalConfigContext } from '../../external_config_context';
+import { SetupModeRenderer } from '../../setup_mode/setup_mode_renderer';
+import { SetupModeContext } from '../../../components/setup_mode/setup_mode_context';
 
 const CODE_PATHS = [CODE_PATH_ALL];
+interface SetupModeProps {
+  setupMode: any;
+  flyoutComponent: any;
+  bottomBarComponent: any;
+}
 
 export const ClusterOverview: React.FC<{}> = () => {
   // TODO: check how many requests with useClusters
@@ -49,11 +56,20 @@ export const ClusterOverview: React.FC<{}> = () => {
   return (
     <PageTemplate title={title} pageTitle={pageTitle} tabs={tabs}>
       {loaded ? (
-        <Overview
-          cluster={clusters[0]}
-          alerts={[]}
-          setupMode={{}}
-          showLicenseExpiration={externalConfig.showLicenseExpiration}
+        <SetupModeRenderer
+          render={({ setupMode, flyoutComponent, bottomBarComponent }: SetupModeProps) => (
+            <SetupModeContext.Provider value={{ setupModeSupported: true }}>
+              {flyoutComponent}
+              <Overview
+                cluster={clusters[0]}
+                alerts={[]}
+                setupMode={setupMode}
+                showLicenseExpiration={externalConfig.showLicenseExpiration}
+              />
+              {/* <EnableAlertsModal alerts={this.alerts} /> */}
+              {bottomBarComponent}
+            </SetupModeContext.Provider>
+          )}
         />
       ) : (
         <PageLoading />
diff --git a/x-pack/plugins/monitoring/public/application/pages/page_template.tsx b/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
index f40c2d3ec5e50..29aafa09814fb 100644
--- a/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/page_template.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiFlexGroup, EuiFlexItem, EuiTab, EuiTabs, EuiTitle } from '@elastic/eui';
+import { EuiTab, EuiTabs } from '@elastic/eui';
 import React from 'react';
 import { useTitle } from '../hooks/use_title';
 import { MonitoringToolbar } from '../../components/shared/toolbar';
@@ -29,34 +29,7 @@ export const PageTemplate: React.FC<PageTemplateProps> = ({ title, pageTitle, ta
 
   return (
     <div className="app-container">
-      <EuiFlexGroup gutterSize="l" justifyContent="spaceBetween" responsive>
-        <EuiFlexItem>
-          <EuiFlexGroup
-            gutterSize="none"
-            justifyContent="spaceEvenly"
-            direction="column"
-            responsive
-          >
-            <EuiFlexItem>
-              <div id="setupModeNav">{/* HERE GOES THE SETUP BUTTON */}</div>
-            </EuiFlexItem>
-            <EuiFlexItem className="monTopNavSecondItem">
-              {pageTitle && (
-                <div data-test-subj="monitoringPageTitle">
-                  <EuiTitle size="xs">
-                    <h1>{pageTitle}</h1>
-                  </EuiTitle>
-                </div>
-              )}
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-
-        <EuiFlexItem>
-          <MonitoringToolbar />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-
+      <MonitoringToolbar pageTitle={pageTitle} />
       {tabs && (
         <EuiTabs>
           {tabs.map((item, idx) => {
diff --git a/x-pack/plugins/monitoring/public/application/setup_mode/setup_mode.tsx b/x-pack/plugins/monitoring/public/application/setup_mode/setup_mode.tsx
new file mode 100644
index 0000000000000..70932e5177337
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/application/setup_mode/setup_mode.tsx
@@ -0,0 +1,200 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render } from 'react-dom';
+import { get, includes } from 'lodash';
+import { i18n } from '@kbn/i18n';
+import { HttpStart } from 'kibana/public';
+import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { Legacy } from '../../legacy_shims';
+import { SetupModeEnterButton } from '../../components/setup_mode/enter_button';
+import { SetupModeFeature } from '../../../common/enums';
+import { ISetupModeContext } from '../../components/setup_mode/setup_mode_context';
+import { State as GlobalState } from '../../application/global_state_context';
+
+function isOnPage(hash: string) {
+  return includes(window.location.hash, hash);
+}
+
+let globalState: GlobalState;
+let httpService: HttpStart;
+
+interface ISetupModeState {
+  enabled: boolean;
+  data: any;
+  callback?: (() => void) | null;
+  hideBottomBar: boolean;
+}
+const setupModeState: ISetupModeState = {
+  enabled: false,
+  data: null,
+  callback: null,
+  hideBottomBar: false,
+};
+
+export const getSetupModeState = () => setupModeState;
+
+export const setNewlyDiscoveredClusterUuid = (clusterUuid: string) => {
+  globalState.cluster_uuid = clusterUuid;
+  globalState.save?.();
+};
+
+export const fetchCollectionData = async (uuid?: string, fetchWithoutClusterUuid = false) => {
+  const clusterUuid = globalState.cluster_uuid;
+  const ccs = globalState.ccs;
+
+  let url = '../api/monitoring/v1/setup/collection';
+  if (uuid) {
+    url += `/node/${uuid}`;
+  } else if (!fetchWithoutClusterUuid && clusterUuid) {
+    url += `/cluster/${clusterUuid}`;
+  } else {
+    url += '/cluster';
+  }
+
+  try {
+    const response = await httpService.post(url, {
+      body: JSON.stringify({
+        ccs,
+      }),
+    });
+    return response;
+  } catch (err) {
+    // TODO: handle errors
+    throw new Error(err);
+  }
+};
+
+const notifySetupModeDataChange = () => setupModeState.callback && setupModeState.callback();
+
+export const updateSetupModeData = async (uuid?: string, fetchWithoutClusterUuid = false) => {
+  const data = await fetchCollectionData(uuid, fetchWithoutClusterUuid);
+  setupModeState.data = data;
+  const hasPermissions = get(data, '_meta.hasPermissions', false);
+  if (!hasPermissions) {
+    let text: string = '';
+    if (!hasPermissions) {
+      text = i18n.translate('xpack.monitoring.setupMode.notAvailablePermissions', {
+        defaultMessage: 'You do not have the necessary permissions to do this.',
+      });
+    }
+
+    Legacy.shims.toastNotifications.addDanger({
+      title: i18n.translate('xpack.monitoring.setupMode.notAvailableTitle', {
+        defaultMessage: 'Setup mode is not available',
+      }),
+      text,
+    });
+    return toggleSetupMode(false);
+  }
+  notifySetupModeDataChange();
+
+  const clusterUuid = globalState.cluster_uuid;
+  if (!clusterUuid) {
+    const liveClusterUuid: string = get(data, '_meta.liveClusterUuid');
+    const migratedEsNodes = Object.values(get(data, 'elasticsearch.byUuid', {})).filter(
+      (node: any) => node.isPartiallyMigrated || node.isFullyMigrated
+    );
+    if (liveClusterUuid && migratedEsNodes.length > 0) {
+      setNewlyDiscoveredClusterUuid(liveClusterUuid);
+    }
+  }
+};
+
+export const hideBottomBar = () => {
+  setupModeState.hideBottomBar = true;
+  notifySetupModeDataChange();
+};
+export const showBottomBar = () => {
+  setupModeState.hideBottomBar = false;
+  notifySetupModeDataChange();
+};
+
+export const disableElasticsearchInternalCollection = async () => {
+  const clusterUuid = globalState.cluster_uuid;
+  const url = `../api/monitoring/v1/setup/collection/${clusterUuid}/disable_internal_collection`;
+  try {
+    const response = await httpService.post(url);
+    return response;
+  } catch (err) {
+    // TODO: handle errors
+    throw new Error(err);
+  }
+};
+
+export const toggleSetupMode = (inSetupMode: boolean) => {
+  setupModeState.enabled = inSetupMode;
+  globalState.inSetupMode = inSetupMode;
+  globalState.save?.();
+  setSetupModeMenuItem();
+  notifySetupModeDataChange();
+
+  if (inSetupMode) {
+    // Intentionally do not await this so we don't block UI operations
+    updateSetupModeData();
+  }
+};
+
+export const setSetupModeMenuItem = () => {
+  if (isOnPage('no-data')) {
+    return;
+  }
+
+  const enabled = !globalState.inSetupMode;
+  const I18nContext = Legacy.shims.I18nContext;
+
+  render(
+    <KibanaContextProvider services={Legacy.shims.kibanaServices}>
+      <I18nContext>
+        <SetupModeEnterButton enabled={enabled} toggleSetupMode={toggleSetupMode} />
+      </I18nContext>
+    </KibanaContextProvider>,
+    document.getElementById('setupModeNav')
+  );
+};
+
+export const initSetupModeState = async (
+  state: GlobalState,
+  http: HttpStart,
+  callback?: () => void
+) => {
+  globalState = state;
+  httpService = http;
+  if (callback) {
+    setupModeState.callback = callback;
+  }
+
+  if (globalState.inSetupMode) {
+    toggleSetupMode(true);
+  }
+};
+
+export const isInSetupMode = (context?: ISetupModeContext) => {
+  if (context?.setupModeSupported === false) {
+    return false;
+  }
+  if (setupModeState.enabled) {
+    return true;
+  }
+
+  return globalState.inSetupMode;
+};
+
+export const isSetupModeFeatureEnabled = (feature: SetupModeFeature) => {
+  if (!setupModeState.enabled) {
+    return false;
+  }
+
+  if (feature === SetupModeFeature.MetricbeatMigration) {
+    if (Legacy.shims.isCloud) {
+      return false;
+    }
+  }
+
+  return true;
+};
diff --git a/x-pack/plugins/monitoring/public/application/setup_mode/setup_mode_renderer.d.ts b/x-pack/plugins/monitoring/public/application/setup_mode/setup_mode_renderer.d.ts
new file mode 100644
index 0000000000000..27462f07c07be
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/application/setup_mode/setup_mode_renderer.d.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const SetupModeRenderer: FunctionComponent<Props>;
diff --git a/x-pack/plugins/monitoring/public/application/setup_mode/setup_mode_renderer.js b/x-pack/plugins/monitoring/public/application/setup_mode/setup_mode_renderer.js
new file mode 100644
index 0000000000000..337dacd4ecae9
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/application/setup_mode/setup_mode_renderer.js
@@ -0,0 +1,217 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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, { Fragment } from 'react';
+import {
+  getSetupModeState,
+  initSetupModeState,
+  updateSetupModeData,
+  disableElasticsearchInternalCollection,
+  toggleSetupMode,
+  setSetupModeMenuItem,
+} from './setup_mode';
+import { Flyout } from '../../components/metricbeat_migration/flyout';
+import {
+  EuiBottomBar,
+  EuiButton,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiTextColor,
+  EuiIcon,
+  EuiSpacer,
+} from '@elastic/eui';
+import { findNewUuid } from '../../components/renderers/lib/find_new_uuid';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { GlobalStateContext } from '../../application/global_state_context';
+import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
+
+class WrappedSetupModeRenderer extends React.Component {
+  globalState;
+  state = {
+    renderState: false,
+    isFlyoutOpen: false,
+    instance: null,
+    newProduct: null,
+    isSettingUpNew: false,
+  };
+
+  UNSAFE_componentWillMount() {
+    this.globalState = this.context;
+    const { kibana } = this.props;
+    initSetupModeState(this.globalState, kibana.services.http, (_oldData) => {
+      const newState = { renderState: true };
+
+      const { productName } = this.props;
+      if (!productName) {
+        this.setState(newState);
+        return;
+      }
+
+      const setupModeState = getSetupModeState();
+      if (!setupModeState.enabled || !setupModeState.data) {
+        this.setState(newState);
+        return;
+      }
+
+      const data = setupModeState.data[productName];
+      const oldData = _oldData ? _oldData[productName] : null;
+      if (data && oldData) {
+        const newUuid = findNewUuid(Object.keys(oldData.byUuid), Object.keys(data.byUuid));
+        if (newUuid) {
+          newState.newProduct = data.byUuid[newUuid];
+        }
+      }
+
+      this.setState(newState);
+    });
+    setSetupModeMenuItem();
+  }
+
+  reset() {
+    this.setState({
+      renderState: false,
+      isFlyoutOpen: false,
+      instance: null,
+      newProduct: null,
+      isSettingUpNew: false,
+    });
+  }
+
+  getFlyout(data, meta) {
+    const { productName } = this.props;
+    const { isFlyoutOpen, instance, isSettingUpNew, newProduct } = this.state;
+    if (!data || !isFlyoutOpen) {
+      return null;
+    }
+
+    let product = null;
+    if (newProduct) {
+      product = newProduct;
+    }
+    // For new instance discovery flow, we pass in empty instance object
+    else if (instance && Object.keys(instance).length) {
+      product = data.byUuid[instance.uuid];
+    }
+
+    if (!product) {
+      const uuids = Object.values(data.byUuid);
+      if (uuids.length && !isSettingUpNew) {
+        product = uuids[0];
+      } else {
+        product = {
+          isNetNewUser: true,
+        };
+      }
+    }
+
+    return (
+      <Flyout
+        onClose={() => this.reset()}
+        productName={productName}
+        product={product}
+        meta={meta}
+        instance={instance}
+        updateProduct={updateSetupModeData}
+        isSettingUpNew={isSettingUpNew}
+      />
+    );
+  }
+
+  getBottomBar(setupModeState) {
+    if (!setupModeState.enabled || setupModeState.hideBottomBar) {
+      return null;
+    }
+
+    return (
+      <Fragment>
+        <EuiSpacer size="xxl" />
+        <EuiBottomBar>
+          <EuiFlexGroup
+            justifyContent="spaceBetween"
+            alignItems="center"
+            data-test-subj="monitoringSetupModeBottomBar"
+          >
+            <EuiFlexItem grow={false}>
+              <EuiFlexGroup gutterSize="s">
+                <EuiFlexItem grow={false}>
+                  <EuiTextColor color="ghost">
+                    <FormattedMessage
+                      id="xpack.monitoring.setupMode.description"
+                      defaultMessage="You are in setup mode. The ({flagIcon}) icon indicates configuration options."
+                      values={{
+                        flagIcon: <EuiIcon type="flag" />,
+                      }}
+                    />
+                  </EuiTextColor>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiFlexGroup gutterSize="s">
+                <EuiFlexItem grow={false}>
+                  <EuiButton
+                    color="danger"
+                    fill
+                    iconType="flag"
+                    iconSide="right"
+                    size="s"
+                    onClick={() => toggleSetupMode(false)}
+                  >
+                    {i18n.translate('xpack.monitoring.setupMode.exit', {
+                      defaultMessage: `Exit setup mode`,
+                    })}
+                  </EuiButton>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiBottomBar>
+      </Fragment>
+    );
+  }
+
+  async shortcutToFinishMigration() {
+    await disableElasticsearchInternalCollection();
+    await updateSetupModeData();
+  }
+
+  render() {
+    const { render, productName } = this.props;
+    const setupModeState = getSetupModeState();
+
+    let data = { byUuid: {} };
+    if (setupModeState.data) {
+      if (productName && setupModeState.data[productName]) {
+        data = setupModeState.data[productName];
+      } else if (setupModeState.data) {
+        data = setupModeState.data;
+      }
+    }
+
+    const meta = setupModeState.data ? setupModeState.data._meta : null;
+
+    return render({
+      setupMode: {
+        data,
+        meta,
+        enabled: setupModeState.enabled,
+        productName,
+        updateSetupModeData,
+        shortcutToFinishMigration: () => this.shortcutToFinishMigration(),
+        openFlyout: (instance, isSettingUpNew) =>
+          this.setState({ isFlyoutOpen: true, instance, isSettingUpNew }),
+        closeFlyout: () => this.setState({ isFlyoutOpen: false }),
+      },
+      flyoutComponent: this.getFlyout(data, meta),
+      bottomBarComponent: this.getBottomBar(setupModeState),
+    });
+  }
+}
+
+WrappedSetupModeRenderer.contextType = GlobalStateContext;
+export const SetupModeRenderer = withKibana(WrappedSetupModeRenderer);
diff --git a/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx b/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
index 6e45d4d831ec9..e5962b7f80876 100644
--- a/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
+++ b/x-pack/plugins/monitoring/public/components/shared/toolbar.tsx
@@ -5,11 +5,21 @@
  * 2.0.
  */
 
-import { EuiFlexGroup, EuiFlexItem, EuiSuperDatePicker, OnRefreshChangeProps } from '@elastic/eui';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSuperDatePicker,
+  EuiTitle,
+  OnRefreshChangeProps,
+} from '@elastic/eui';
 import React, { useContext, useCallback } from 'react';
 import { MonitoringTimeContainer } from '../../application/pages/use_monitoring_time';
 
-export const MonitoringToolbar = () => {
+interface MonitoringToolbarProps {
+  pageTitle?: string;
+}
+
+export const MonitoringToolbar: React.FC<MonitoringToolbarProps> = ({ pageTitle }) => {
   const {
     currentTimerange,
     handleTimeChange,
@@ -38,18 +48,36 @@ export const MonitoringToolbar = () => {
   );
 
   return (
-    <EuiFlexGroup gutterSize={'xl'} justifyContent={'spaceBetween'}>
-      <EuiFlexItem>Setup Button</EuiFlexItem>
+    <EuiFlexGroup gutterSize="l" justifyContent="spaceBetween" responsive>
+      <EuiFlexItem>
+        <EuiFlexGroup gutterSize="none" justifyContent="spaceEvenly" direction="column" responsive>
+          <EuiFlexItem>
+            <div id="setupModeNav">{/* HERE GOES THE SETUP BUTTON */}</div>
+          </EuiFlexItem>
+          <EuiFlexItem className="monTopNavSecondItem">
+            {pageTitle && (
+              <div data-test-subj="monitoringPageTitle">
+                <EuiTitle size="xs">
+                  <h1>{pageTitle}</h1>
+                </EuiTitle>
+              </div>
+            )}
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+
       <EuiFlexItem grow={false}>
-        <EuiSuperDatePicker
-          start={currentTimerange.from}
-          end={currentTimerange.to}
-          onTimeChange={onTimeChange}
-          onRefresh={() => {}}
-          isPaused={isPaused}
-          refreshInterval={refreshInterval}
-          onRefreshChange={onRefreshChange}
-        />
+        <div style={{ padding: 8 }}>
+          <EuiSuperDatePicker
+            start={currentTimerange.from}
+            end={currentTimerange.to}
+            onTimeChange={onTimeChange}
+            onRefresh={() => {}}
+            isPaused={isPaused}
+            refreshInterval={refreshInterval}
+            onRefreshChange={onRefreshChange}
+          />
+        </div>
       </EuiFlexItem>
     </EuiFlexGroup>
   );
diff --git a/x-pack/plugins/monitoring/public/external_config.ts b/x-pack/plugins/monitoring/public/external_config.ts
new file mode 100644
index 0000000000000..29ce410a5a9dc
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/external_config.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+let config: { [key: string]: unknown } = {};
+
+export const setConfig = (externalConfig: { [key: string]: unknown }) => {
+  config = externalConfig;
+};
+
+export const isReactMigrationEnabled = () => {
+  return config.renderReactApp;
+};
diff --git a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
index 28fd7494b1d10..f622f2944a31a 100644
--- a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
+++ b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
@@ -15,6 +15,8 @@ import { ajaxErrorHandlersProvider } from './ajax_error_handler';
 import { SetupModeEnterButton } from '../components/setup_mode/enter_button';
 import { SetupModeFeature } from '../../common/enums';
 import { ISetupModeContext } from '../components/setup_mode/setup_mode_context';
+import * as setupModeReact from '../application/setup_mode/setup_mode';
+import { isReactMigrationEnabled } from '../external_config';
 
 function isOnPage(hash: string) {
   return includes(window.location.hash, hash);
@@ -209,6 +211,7 @@ export const initSetupModeState = async ($scope: any, $injector: any, callback?:
 };
 
 export const isInSetupMode = (context?: ISetupModeContext) => {
+  if (isReactMigrationEnabled()) return setupModeReact.isInSetupMode(context);
   if (context?.setupModeSupported === false) {
     return false;
   }
@@ -222,6 +225,7 @@ export const isInSetupMode = (context?: ISetupModeContext) => {
 };
 
 export const isSetupModeFeatureEnabled = (feature: SetupModeFeature) => {
+  if (isReactMigrationEnabled()) return setupModeReact.isSetupModeFeatureEnabled(feature);
   if (!setupModeState.enabled) {
     return false;
   }
diff --git a/x-pack/plugins/monitoring/public/plugin.ts b/x-pack/plugins/monitoring/public/plugin.ts
index 6884dba760fcd..6f625194287ba 100644
--- a/x-pack/plugins/monitoring/public/plugin.ts
+++ b/x-pack/plugins/monitoring/public/plugin.ts
@@ -36,6 +36,7 @@ import { createThreadPoolRejectionsAlertType } from './alerts/thread_pool_reject
 import { createMemoryUsageAlertType } from './alerts/memory_usage_alert';
 import { createCCRReadExceptionsAlertType } from './alerts/ccr_read_exceptions_alert';
 import { createLargeShardSizeAlertType } from './alerts/large_shard_size_alert';
+import { setConfig } from './external_config';
 
 interface MonitoringSetupPluginDependencies {
   home?: HomePublicPluginSetup;
@@ -125,6 +126,7 @@ export class MonitoringPlugin
         });
 
         const config = Object.fromEntries(externalConfig);
+        setConfig(config);
         if (config.renderReactApp) {
           const { renderApp } = await import('./application');
           return renderApp(coreStart, pluginsStart, params, config);
diff --git a/x-pack/plugins/reporting/server/routes/deprecations.ts b/x-pack/plugins/reporting/server/routes/deprecations.ts
index 874885e2258ae..d1d8302e394c3 100644
--- a/x-pack/plugins/reporting/server/routes/deprecations.ts
+++ b/x-pack/plugins/reporting/server/routes/deprecations.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import { errors } from '@elastic/elasticsearch';
+import { SecurityHasPrivilegesIndexPrivilegesCheck } from '@elastic/elasticsearch/api/types';
 import { RequestHandler } from 'src/core/server';
 import {
   API_MIGRATE_ILM_POLICY_URL,
@@ -36,10 +37,11 @@ export const registerDeprecationsRoutes = (reporting: ReportingCore, logger: Log
         const { body } = await elasticsearch.client.asCurrentUser.security.hasPrivileges({
           body: {
             index: [
-              {
+              ({
                 privileges: ['manage'], // required to do anything with the reporting indices
                 names: [store.getReportingIndexPattern()],
-              },
+                allow_restricted_indices: true,
+              } as unknown) as SecurityHasPrivilegesIndexPrivilegesCheck, // TODO: Needed until `allow_restricted_indices` is added to the types.
             ],
           },
         });
diff --git a/x-pack/plugins/reporting/server/usage/__snapshots__/reporting_usage_collector.test.ts.snap b/x-pack/plugins/reporting/server/usage/__snapshots__/reporting_usage_collector.test.ts.snap
index 12e89f19e6248..4fab4ca72abab 100644
--- a/x-pack/plugins/reporting/server/usage/__snapshots__/reporting_usage_collector.test.ts.snap
+++ b/x-pack/plugins/reporting/server/usage/__snapshots__/reporting_usage_collector.test.ts.snap
@@ -16,6 +16,17 @@ Object {
         "type": "long",
       },
     },
+    "PNGV2": Object {
+      "available": Object {
+        "type": "boolean",
+      },
+      "deprecated": Object {
+        "type": "long",
+      },
+      "total": Object {
+        "type": "long",
+      },
+    },
     "_all": Object {
       "type": "long",
     },
@@ -62,6 +73,17 @@ Object {
           "type": "long",
         },
       },
+      "PNGV2": Object {
+        "available": Object {
+          "type": "boolean",
+        },
+        "deprecated": Object {
+          "type": "long",
+        },
+        "total": Object {
+          "type": "long",
+        },
+      },
       "_all": Object {
         "type": "long",
       },
@@ -117,6 +139,36 @@ Object {
           "type": "long",
         },
       },
+      "printable_pdf_v2": Object {
+        "app": Object {
+          "canvas workpad": Object {
+            "type": "long",
+          },
+          "dashboard": Object {
+            "type": "long",
+          },
+          "visualization": Object {
+            "type": "long",
+          },
+        },
+        "available": Object {
+          "type": "boolean",
+        },
+        "deprecated": Object {
+          "type": "long",
+        },
+        "layout": Object {
+          "preserve_layout": Object {
+            "type": "long",
+          },
+          "print": Object {
+            "type": "long",
+          },
+        },
+        "total": Object {
+          "type": "long",
+        },
+      },
       "status": Object {
         "completed": Object {
           "type": "long",
@@ -147,6 +199,17 @@ Object {
               "type": "long",
             },
           },
+          "PNGV2": Object {
+            "canvas workpad": Object {
+              "type": "long",
+            },
+            "dashboard": Object {
+              "type": "long",
+            },
+            "visualization": Object {
+              "type": "long",
+            },
+          },
           "csv": Object {
             "canvas workpad": Object {
               "type": "long",
@@ -180,6 +243,17 @@ Object {
               "type": "long",
             },
           },
+          "printable_pdf_v2": Object {
+            "canvas workpad": Object {
+              "type": "long",
+            },
+            "dashboard": Object {
+              "type": "long",
+            },
+            "visualization": Object {
+              "type": "long",
+            },
+          },
         },
         "completed_with_warnings": Object {
           "PNG": Object {
@@ -193,6 +267,17 @@ Object {
               "type": "long",
             },
           },
+          "PNGV2": Object {
+            "canvas workpad": Object {
+              "type": "long",
+            },
+            "dashboard": Object {
+              "type": "long",
+            },
+            "visualization": Object {
+              "type": "long",
+            },
+          },
           "csv": Object {
             "canvas workpad": Object {
               "type": "long",
@@ -226,6 +311,17 @@ Object {
               "type": "long",
             },
           },
+          "printable_pdf_v2": Object {
+            "canvas workpad": Object {
+              "type": "long",
+            },
+            "dashboard": Object {
+              "type": "long",
+            },
+            "visualization": Object {
+              "type": "long",
+            },
+          },
         },
         "failed": Object {
           "PNG": Object {
@@ -239,6 +335,17 @@ Object {
               "type": "long",
             },
           },
+          "PNGV2": Object {
+            "canvas workpad": Object {
+              "type": "long",
+            },
+            "dashboard": Object {
+              "type": "long",
+            },
+            "visualization": Object {
+              "type": "long",
+            },
+          },
           "csv": Object {
             "canvas workpad": Object {
               "type": "long",
@@ -272,6 +379,17 @@ Object {
               "type": "long",
             },
           },
+          "printable_pdf_v2": Object {
+            "canvas workpad": Object {
+              "type": "long",
+            },
+            "dashboard": Object {
+              "type": "long",
+            },
+            "visualization": Object {
+              "type": "long",
+            },
+          },
         },
         "pending": Object {
           "PNG": Object {
@@ -285,6 +403,17 @@ Object {
               "type": "long",
             },
           },
+          "PNGV2": Object {
+            "canvas workpad": Object {
+              "type": "long",
+            },
+            "dashboard": Object {
+              "type": "long",
+            },
+            "visualization": Object {
+              "type": "long",
+            },
+          },
           "csv": Object {
             "canvas workpad": Object {
               "type": "long",
@@ -318,6 +447,17 @@ Object {
               "type": "long",
             },
           },
+          "printable_pdf_v2": Object {
+            "canvas workpad": Object {
+              "type": "long",
+            },
+            "dashboard": Object {
+              "type": "long",
+            },
+            "visualization": Object {
+              "type": "long",
+            },
+          },
         },
         "processing": Object {
           "PNG": Object {
@@ -331,6 +471,17 @@ Object {
               "type": "long",
             },
           },
+          "PNGV2": Object {
+            "canvas workpad": Object {
+              "type": "long",
+            },
+            "dashboard": Object {
+              "type": "long",
+            },
+            "visualization": Object {
+              "type": "long",
+            },
+          },
           "csv": Object {
             "canvas workpad": Object {
               "type": "long",
@@ -364,6 +515,17 @@ Object {
               "type": "long",
             },
           },
+          "printable_pdf_v2": Object {
+            "canvas workpad": Object {
+              "type": "long",
+            },
+            "dashboard": Object {
+              "type": "long",
+            },
+            "visualization": Object {
+              "type": "long",
+            },
+          },
         },
       },
     },
@@ -397,6 +559,36 @@ Object {
         "type": "long",
       },
     },
+    "printable_pdf_v2": Object {
+      "app": Object {
+        "canvas workpad": Object {
+          "type": "long",
+        },
+        "dashboard": Object {
+          "type": "long",
+        },
+        "visualization": Object {
+          "type": "long",
+        },
+      },
+      "available": Object {
+        "type": "boolean",
+      },
+      "deprecated": Object {
+        "type": "long",
+      },
+      "layout": Object {
+        "preserve_layout": Object {
+          "type": "long",
+        },
+        "print": Object {
+          "type": "long",
+        },
+      },
+      "total": Object {
+        "type": "long",
+      },
+    },
     "status": Object {
       "completed": Object {
         "type": "long",
@@ -427,6 +619,17 @@ Object {
             "type": "long",
           },
         },
+        "PNGV2": Object {
+          "canvas workpad": Object {
+            "type": "long",
+          },
+          "dashboard": Object {
+            "type": "long",
+          },
+          "visualization": Object {
+            "type": "long",
+          },
+        },
         "csv": Object {
           "canvas workpad": Object {
             "type": "long",
@@ -460,6 +663,17 @@ Object {
             "type": "long",
           },
         },
+        "printable_pdf_v2": Object {
+          "canvas workpad": Object {
+            "type": "long",
+          },
+          "dashboard": Object {
+            "type": "long",
+          },
+          "visualization": Object {
+            "type": "long",
+          },
+        },
       },
       "completed_with_warnings": Object {
         "PNG": Object {
@@ -473,6 +687,17 @@ Object {
             "type": "long",
           },
         },
+        "PNGV2": Object {
+          "canvas workpad": Object {
+            "type": "long",
+          },
+          "dashboard": Object {
+            "type": "long",
+          },
+          "visualization": Object {
+            "type": "long",
+          },
+        },
         "csv": Object {
           "canvas workpad": Object {
             "type": "long",
@@ -506,6 +731,17 @@ Object {
             "type": "long",
           },
         },
+        "printable_pdf_v2": Object {
+          "canvas workpad": Object {
+            "type": "long",
+          },
+          "dashboard": Object {
+            "type": "long",
+          },
+          "visualization": Object {
+            "type": "long",
+          },
+        },
       },
       "failed": Object {
         "PNG": Object {
@@ -519,6 +755,17 @@ Object {
             "type": "long",
           },
         },
+        "PNGV2": Object {
+          "canvas workpad": Object {
+            "type": "long",
+          },
+          "dashboard": Object {
+            "type": "long",
+          },
+          "visualization": Object {
+            "type": "long",
+          },
+        },
         "csv": Object {
           "canvas workpad": Object {
             "type": "long",
@@ -552,6 +799,17 @@ Object {
             "type": "long",
           },
         },
+        "printable_pdf_v2": Object {
+          "canvas workpad": Object {
+            "type": "long",
+          },
+          "dashboard": Object {
+            "type": "long",
+          },
+          "visualization": Object {
+            "type": "long",
+          },
+        },
       },
       "pending": Object {
         "PNG": Object {
@@ -565,6 +823,17 @@ Object {
             "type": "long",
           },
         },
+        "PNGV2": Object {
+          "canvas workpad": Object {
+            "type": "long",
+          },
+          "dashboard": Object {
+            "type": "long",
+          },
+          "visualization": Object {
+            "type": "long",
+          },
+        },
         "csv": Object {
           "canvas workpad": Object {
             "type": "long",
@@ -598,6 +867,17 @@ Object {
             "type": "long",
           },
         },
+        "printable_pdf_v2": Object {
+          "canvas workpad": Object {
+            "type": "long",
+          },
+          "dashboard": Object {
+            "type": "long",
+          },
+          "visualization": Object {
+            "type": "long",
+          },
+        },
       },
       "processing": Object {
         "PNG": Object {
@@ -611,6 +891,17 @@ Object {
             "type": "long",
           },
         },
+        "PNGV2": Object {
+          "canvas workpad": Object {
+            "type": "long",
+          },
+          "dashboard": Object {
+            "type": "long",
+          },
+          "visualization": Object {
+            "type": "long",
+          },
+        },
         "csv": Object {
           "canvas workpad": Object {
             "type": "long",
@@ -644,6 +935,17 @@ Object {
             "type": "long",
           },
         },
+        "printable_pdf_v2": Object {
+          "canvas workpad": Object {
+            "type": "long",
+          },
+          "dashboard": Object {
+            "type": "long",
+          },
+          "visualization": Object {
+            "type": "long",
+          },
+        },
       },
     },
   },
diff --git a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts
index 72824f6aeeb38..31ce6581d7de6 100644
--- a/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts
+++ b/x-pack/plugins/reporting/server/usage/reporting_usage_collector.test.ts
@@ -487,6 +487,7 @@ describe('data modeling', () => {
     // just check that the example objects can be cast to ReportingUsageType
     check({
       PNG: { available: true, total: 7 },
+      PNGV2: { available: true, total: 7 },
       _all: 21,
       available: true,
       browser_type: 'chromium',
@@ -495,6 +496,7 @@ describe('data modeling', () => {
       enabled: true,
       last7Days: {
         PNG: { available: true, total: 0 },
+        PNGV2: { available: true, total: 0 },
         _all: 0,
         csv: { available: true, total: 0 },
         csv_searchsource: { available: true, total: 0 },
@@ -504,6 +506,12 @@ describe('data modeling', () => {
           layout: { preserve_layout: 0, print: 0 },
           total: 0,
         },
+        printable_pdf_v2: {
+          app: { dashboard: 0, visualization: 0 },
+          available: true,
+          layout: { preserve_layout: 0, print: 0 },
+          total: 0,
+        },
         status: { completed: 0, failed: 0 },
         statuses: {},
       },
@@ -513,17 +521,26 @@ describe('data modeling', () => {
         layout: { preserve_layout: 7, print: 3 },
         total: 10,
       },
+      printable_pdf_v2: {
+        app: { 'canvas workpad': 3, dashboard: 3, visualization: 4 },
+        available: true,
+        layout: { preserve_layout: 7, print: 3 },
+        total: 10,
+      },
       status: { completed: 21, failed: 0 },
       statuses: {
         completed: {
           PNG: { dashboard: 3, visualization: 4 },
+          PNGV2: { dashboard: 3, visualization: 4 },
           csv: {},
           printable_pdf: { 'canvas workpad': 3, dashboard: 3, visualization: 4 },
+          printable_pdf_v2: { 'canvas workpad': 3, dashboard: 3, visualization: 4 },
         },
       },
     });
     check({
       PNG: { available: true, total: 3 },
+      PNGV2: { available: true, total: 3 },
       _all: 4,
       available: true,
       browser_type: 'chromium',
@@ -532,6 +549,7 @@ describe('data modeling', () => {
       enabled: true,
       last7Days: {
         PNG: { available: true, total: 3 },
+        PNGV2: { available: true, total: 3 },
         _all: 4,
         csv: { available: true, total: 0 },
         csv_searchsource: { available: true, total: 0 },
@@ -541,6 +559,12 @@ describe('data modeling', () => {
           layout: { preserve_layout: 1, print: 0 },
           total: 1,
         },
+        printable_pdf_v2: {
+          app: { 'canvas workpad': 1, dashboard: 0, visualization: 0 },
+          available: true,
+          layout: { preserve_layout: 1, print: 0 },
+          total: 1,
+        },
         status: { completed: 4, failed: 0 },
         statuses: {
           completed: { PNG: { visualization: 3 }, printable_pdf: { 'canvas workpad': 1 } },
@@ -552,6 +576,12 @@ describe('data modeling', () => {
         layout: { preserve_layout: 1, print: 0 },
         total: 1,
       },
+      printable_pdf_v2: {
+        app: { 'canvas workpad': 1, dashboard: 0, visualization: 0 },
+        available: true,
+        layout: { preserve_layout: 1, print: 0 },
+        total: 1,
+      },
       status: { completed: 4, failed: 0 },
       statuses: {
         completed: { PNG: { visualization: 3 }, printable_pdf: { 'canvas workpad': 1 } },
@@ -571,9 +601,16 @@ describe('data modeling', () => {
           app: { dashboard: 0, visualization: 0 },
           layout: { preserve_layout: 0, print: 0 },
         },
+        printable_pdf_v2: {
+          available: true,
+          total: 0,
+          app: { dashboard: 0, visualization: 0 },
+          layout: { preserve_layout: 0, print: 0 },
+        },
         csv: { available: true, total: 0 },
         csv_searchsource: { available: true, total: 0 },
         PNG: { available: true, total: 0 },
+        PNGV2: { available: true, total: 0 },
       },
       _all: 0,
       status: { completed: 0, failed: 0 },
@@ -584,9 +621,16 @@ describe('data modeling', () => {
         app: { dashboard: 0, visualization: 0 },
         layout: { preserve_layout: 0, print: 0 },
       },
+      printable_pdf_v2: {
+        available: true,
+        total: 0,
+        app: { dashboard: 0, visualization: 0 },
+        layout: { preserve_layout: 0, print: 0 },
+      },
       csv: { available: true, total: 0 },
       csv_searchsource: { available: true, total: 0 },
       PNG: { available: true, total: 0 },
+      PNGV2: { available: true, total: 0 },
     });
   });
 });
diff --git a/x-pack/plugins/reporting/server/usage/schema.ts b/x-pack/plugins/reporting/server/usage/schema.ts
index 2060fdcb1f01e..54545dd23509b 100644
--- a/x-pack/plugins/reporting/server/usage/schema.ts
+++ b/x-pack/plugins/reporting/server/usage/schema.ts
@@ -25,7 +25,9 @@ const byAppCountsSchema: MakeSchemaFrom<ByAppCounts> = {
   csv: appCountsSchema,
   csv_searchsource: appCountsSchema,
   PNG: appCountsSchema,
+  PNGV2: appCountsSchema,
   printable_pdf: appCountsSchema,
+  printable_pdf_v2: appCountsSchema,
 };
 
 const availableTotalSchema: MakeSchemaFrom<AvailableTotal> = {
@@ -38,6 +40,7 @@ const jobTypesSchema: MakeSchemaFrom<JobTypes> = {
   csv: availableTotalSchema,
   csv_searchsource: availableTotalSchema,
   PNG: availableTotalSchema,
+  PNGV2: availableTotalSchema,
   printable_pdf: {
     ...availableTotalSchema,
     app: appCountsSchema,
@@ -46,6 +49,14 @@ const jobTypesSchema: MakeSchemaFrom<JobTypes> = {
       preserve_layout: { type: 'long' },
     },
   },
+  printable_pdf_v2: {
+    ...availableTotalSchema,
+    app: appCountsSchema,
+    layout: {
+      print: { type: 'long' },
+      preserve_layout: { type: 'long' },
+    },
+  },
 };
 
 const rangeStatsSchema: MakeSchemaFrom<RangeStats> = {
diff --git a/x-pack/plugins/reporting/server/usage/types.ts b/x-pack/plugins/reporting/server/usage/types.ts
index aae8c0ff42710..389dc27c46c66 100644
--- a/x-pack/plugins/reporting/server/usage/types.ts
+++ b/x-pack/plugins/reporting/server/usage/types.ts
@@ -63,7 +63,13 @@ export interface AvailableTotal {
   deprecated?: number;
 }
 
-type BaseJobTypes = 'csv' | 'csv_searchsource' | 'PNG' | 'printable_pdf';
+type BaseJobTypes =
+  | 'csv'
+  | 'csv_searchsource'
+  | 'PNG'
+  | 'PNGV2'
+  | 'printable_pdf'
+  | 'printable_pdf_v2';
 
 export interface LayoutCounts {
   print: number;
@@ -80,6 +86,11 @@ export type JobTypes = { [K in BaseJobTypes]: AvailableTotal } & {
     app: AppCounts;
     layout: LayoutCounts;
   };
+} & {
+  printable_pdf_v2: AvailableTotal & {
+    app: AppCounts;
+    layout: LayoutCounts;
+  };
 };
 
 export type ByAppCounts = { [J in BaseJobTypes]?: AppCounts };
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
index 259a9e9e8de38..48f3a81a00af2 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
@@ -162,7 +162,6 @@ export const createLifecycleExecutor = (
   > = {
     alertWithLifecycle: ({ id, fields }) => {
       currentAlerts[id] = fields;
-
       return alertInstanceFactory(id);
     },
   };
@@ -179,7 +178,6 @@ export const createLifecycleExecutor = (
   const currentAlertIds = Object.keys(currentAlerts);
   const trackedAlertIds = Object.keys(state.trackedAlerts);
   const newAlertIds = currentAlertIds.filter((alertId) => !trackedAlertIds.includes(alertId));
-
   const allAlertIds = [...new Set(currentAlertIds.concat(trackedAlertIds))];
 
   const trackedAlertStates = Object.values(state.trackedAlerts);
@@ -188,9 +186,10 @@ export const createLifecycleExecutor = (
     `Tracking ${allAlertIds.length} alerts (${newAlertIds.length} new, ${trackedAlertStates.length} previous)`
   );
 
-  const alertsDataMap: Record<string, Partial<ParsedTechnicalFields>> = {
-    ...currentAlerts,
-  };
+  const trackedAlertsDataMap: Record<
+    string,
+    { indexName: string; fields: Partial<ParsedTechnicalFields> }
+  > = {};
 
   if (trackedAlertStates.length) {
     const { hits } = await ruleDataClient.getReader().search({
@@ -228,59 +227,77 @@ export const createLifecycleExecutor = (
 
     hits.hits.forEach((hit) => {
       const fields = parseTechnicalFields(hit.fields);
+      const indexName = hit._index;
       const alertId = fields[ALERT_INSTANCE_ID];
-      alertsDataMap[alertId] = {
-        ...commonRuleFields,
-        ...fields,
+      trackedAlertsDataMap[alertId] = {
+        indexName,
+        fields,
       };
     });
   }
 
-  const eventsToIndex = allAlertIds.map((alertId) => {
-    const alertData = alertsDataMap[alertId];
-
-    if (!alertData) {
-      logger.warn(`Could not find alert data for ${alertId}`);
-    }
-
-    const isNew = !state.trackedAlerts[alertId];
-    const isRecovered = !currentAlerts[alertId];
-    const isActive = !isRecovered;
-
-    const { alertUuid, started } = state.trackedAlerts[alertId] ?? {
-      alertUuid: v4(),
-      started: commonRuleFields[TIMESTAMP],
-    };
-    const event: ParsedTechnicalFields = {
-      ...alertData,
-      ...commonRuleFields,
-      [ALERT_DURATION]: (options.startedAt.getTime() - new Date(started).getTime()) * 1000,
-      [ALERT_INSTANCE_ID]: alertId,
-      [ALERT_START]: started,
-      [ALERT_STATUS]: isActive ? ALERT_STATUS_ACTIVE : ALERT_STATUS_RECOVERED,
-      [ALERT_WORKFLOW_STATUS]: alertData[ALERT_WORKFLOW_STATUS] ?? 'open',
-      [ALERT_UUID]: alertUuid,
-      [EVENT_KIND]: 'signal',
-      [EVENT_ACTION]: isNew ? 'open' : isActive ? 'active' : 'close',
-      [VERSION]: ruleDataClient.kibanaVersion,
-      ...(isRecovered ? { [ALERT_END]: commonRuleFields[TIMESTAMP] } : {}),
-    };
-
-    return event;
-  });
+  const makeEventsDataMapFor = (alertIds: string[]) =>
+    alertIds.map((alertId) => {
+      const alertData = trackedAlertsDataMap[alertId];
+      const currentAlertData = currentAlerts[alertId];
+
+      if (!alertData) {
+        logger.warn(`Could not find alert data for ${alertId}`);
+      }
+
+      const isNew = !state.trackedAlerts[alertId];
+      const isRecovered = !currentAlerts[alertId];
+      const isActive = !isRecovered;
+
+      const { alertUuid, started } = state.trackedAlerts[alertId] ?? {
+        alertUuid: v4(),
+        started: commonRuleFields[TIMESTAMP],
+      };
+
+      const event: ParsedTechnicalFields = {
+        ...alertData?.fields,
+        ...commonRuleFields,
+        ...currentAlertData,
+        [ALERT_DURATION]: (options.startedAt.getTime() - new Date(started).getTime()) * 1000,
+
+        [ALERT_INSTANCE_ID]: alertId,
+        [ALERT_START]: started,
+        [ALERT_UUID]: alertUuid,
+        [ALERT_STATUS]: isRecovered ? ALERT_STATUS_RECOVERED : ALERT_STATUS_ACTIVE,
+        [ALERT_WORKFLOW_STATUS]: alertData?.fields[ALERT_WORKFLOW_STATUS] ?? 'open',
+        [EVENT_KIND]: 'signal',
+        [EVENT_ACTION]: isNew ? 'open' : isActive ? 'active' : 'close',
+        [VERSION]: ruleDataClient.kibanaVersion,
+        ...(isRecovered ? { [ALERT_END]: commonRuleFields[TIMESTAMP] } : {}),
+      };
+
+      return {
+        indexName: alertData?.indexName,
+        event,
+      };
+    });
+
+  const trackedEventsToIndex = makeEventsDataMapFor(trackedAlertIds);
+  const newEventsToIndex = makeEventsDataMapFor(newAlertIds);
+  const allEventsToIndex = [...trackedEventsToIndex, ...newEventsToIndex];
 
-  if (eventsToIndex.length > 0 && ruleDataClient.isWriteEnabled()) {
-    logger.debug(`Preparing to index ${eventsToIndex.length} alerts.`);
+  if (allEventsToIndex.length > 0 && ruleDataClient.isWriteEnabled()) {
+    logger.debug(`Preparing to index ${allEventsToIndex.length} alerts.`);
 
     await ruleDataClient.getWriter().bulk({
-      body: eventsToIndex.flatMap((event) => [{ index: { _id: event[ALERT_UUID]! } }, event]),
+      body: allEventsToIndex.flatMap(({ event, indexName }) => [
+        indexName
+          ? { index: { _id: event[ALERT_UUID]!, _index: indexName, require_alias: false } }
+          : { index: { _id: event[ALERT_UUID]! } },
+        event,
+      ]),
     });
   }
 
   const nextTrackedAlerts = Object.fromEntries(
-    eventsToIndex
-      .filter((event) => event[ALERT_STATUS] !== 'closed')
-      .map((event) => {
+    allEventsToIndex
+      .filter(({ event }) => event[ALERT_STATUS] !== 'closed')
+      .map(({ event }) => {
         const alertId = event[ALERT_INSTANCE_ID]!;
         const alertUuid = event[ALERT_UUID]!;
         const started = new Date(event[ALERT_START]!).toISOString();
diff --git a/x-pack/plugins/security/server/authentication/authentication_service.test.ts b/x-pack/plugins/security/server/authentication/authentication_service.test.ts
index d38f963a60c33..a7ef6b34616c3 100644
--- a/x-pack/plugins/security/server/authentication/authentication_service.test.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_service.test.ts
@@ -318,6 +318,52 @@ describe('AuthenticationService', () => {
       });
     });
 
+    describe('getServerBaseURL()', () => {
+      let getServerBaseURL: () => string;
+      beforeEach(() => {
+        mockStartAuthenticationParams.http.getServerInfo.mockReturnValue({
+          name: 'some-name',
+          protocol: 'socket',
+          hostname: 'test-hostname',
+          port: 1234,
+        });
+
+        service.setup(mockSetupAuthenticationParams);
+        service.start(mockStartAuthenticationParams);
+
+        getServerBaseURL = jest.requireMock('./authenticator').Authenticator.mock.calls[0][0]
+          .getServerBaseURL;
+      });
+
+      it('falls back to legacy server config if `public` config is not specified', async () => {
+        expect(getServerBaseURL()).toBe('socket://test-hostname:1234');
+      });
+
+      it('respects `public` config if it is specified', async () => {
+        mockStartAuthenticationParams.config.public = {
+          protocol: 'https',
+        } as ConfigType['public'];
+        expect(getServerBaseURL()).toBe('https://test-hostname:1234');
+
+        mockStartAuthenticationParams.config.public = {
+          hostname: 'elastic.co',
+        } as ConfigType['public'];
+        expect(getServerBaseURL()).toBe('socket://elastic.co:1234');
+
+        mockStartAuthenticationParams.config.public = {
+          port: 4321,
+        } as ConfigType['public'];
+        expect(getServerBaseURL()).toBe('socket://test-hostname:4321');
+
+        mockStartAuthenticationParams.config.public = {
+          protocol: 'https',
+          hostname: 'elastic.co',
+          port: 4321,
+        } as ConfigType['public'];
+        expect(getServerBaseURL()).toBe('https://elastic.co:4321');
+      });
+    });
+
     describe('getCurrentUser()', () => {
       let getCurrentUser: (r: KibanaRequest) => AuthenticatedUser | null;
       beforeEach(async () => {
diff --git a/x-pack/plugins/security/server/authentication/authentication_service.ts b/x-pack/plugins/security/server/authentication/authentication_service.ts
index 79dcfb8d804b2..538bc26e6ffe3 100644
--- a/x-pack/plugins/security/server/authentication/authentication_service.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_service.ts
@@ -41,7 +41,7 @@ interface AuthenticationServiceSetupParams {
 }
 
 interface AuthenticationServiceStartParams {
-  http: Pick<HttpServiceStart, 'auth' | 'basePath'>;
+  http: Pick<HttpServiceStart, 'auth' | 'basePath' | 'getServerInfo'>;
   config: ConfigType;
   clusterClient: IClusterClient;
   legacyAuditLogger: SecurityAuditLogger;
@@ -234,6 +234,17 @@ export class AuthenticationService {
       license: this.license,
     });
 
+    /**
+     * Retrieves server protocol name/host name/port and merges it with `xpack.security.public` config
+     * to construct a server base URL (deprecated, used by the SAML provider only).
+     */
+    const getServerBaseURL = () => {
+      const { protocol, hostname, port } = http.getServerInfo();
+      const serverConfig = { protocol, hostname, port, ...config.public };
+
+      return `${serverConfig.protocol}://${serverConfig.hostname}:${serverConfig.port}`;
+    };
+
     const getCurrentUser = (request: KibanaRequest) =>
       http.auth.get<AuthenticatedUser>(request).state ?? null;
 
@@ -247,6 +258,7 @@ export class AuthenticationService {
       config: { authc: config.authc },
       getCurrentUser,
       featureUsageService,
+      getServerBaseURL,
       license: this.license,
       session,
     });
diff --git a/x-pack/plugins/security/server/authentication/authenticator.test.ts b/x-pack/plugins/security/server/authentication/authenticator.test.ts
index ca33be92e9e99..27dfd89a31756 100644
--- a/x-pack/plugins/security/server/authentication/authenticator.test.ts
+++ b/x-pack/plugins/security/server/authentication/authenticator.test.ts
@@ -55,6 +55,7 @@ function getMockOptions({
     basePath: httpServiceMock.createSetupContract().basePath,
     license: licenseMock.create(),
     loggers: loggingSystemMock.create(),
+    getServerBaseURL: jest.fn(),
     config: createConfig(
       ConfigSchema.validate({ authc: { selector, providers, http } }),
       loggingSystemMock.create().get(),
diff --git a/x-pack/plugins/security/server/authentication/authenticator.ts b/x-pack/plugins/security/server/authentication/authenticator.ts
index 4eeadf23c50b2..5252f5c618f97 100644
--- a/x-pack/plugins/security/server/authentication/authenticator.ts
+++ b/x-pack/plugins/security/server/authentication/authenticator.ts
@@ -87,6 +87,7 @@ export interface AuthenticatorOptions {
   loggers: LoggerFactory;
   clusterClient: IClusterClient;
   session: PublicMethodsOf<Session>;
+  getServerBaseURL: () => string;
 }
 
 // Mapping between provider key defined in the config and authentication
@@ -216,6 +217,7 @@ export class Authenticator {
         client: this.options.clusterClient.asInternalUser,
         logger: this.options.loggers.get('tokens'),
       }),
+      getServerBaseURL: this.options.getServerBaseURL,
     };
 
     this.providers = new Map(
diff --git a/x-pack/plugins/security/server/authentication/providers/base.mock.ts b/x-pack/plugins/security/server/authentication/providers/base.mock.ts
index 5d3417ae9db11..6554b525fc9e0 100644
--- a/x-pack/plugins/security/server/authentication/providers/base.mock.ts
+++ b/x-pack/plugins/security/server/authentication/providers/base.mock.ts
@@ -17,6 +17,7 @@ export type MockAuthenticationProviderOptions = ReturnType<
 
 export function mockAuthenticationProviderOptions(options?: { name: string }) {
   return {
+    getServerBaseURL: () => 'test-protocol://test-hostname:1234',
     client: elasticsearchServiceMock.createClusterClient(),
     logger: loggingSystemMock.create().get(),
     basePath: httpServiceMock.createBasePath(),
diff --git a/x-pack/plugins/security/server/authentication/providers/base.ts b/x-pack/plugins/security/server/authentication/providers/base.ts
index f6d9af24ee1ad..d5b173fcfad8c 100644
--- a/x-pack/plugins/security/server/authentication/providers/base.ts
+++ b/x-pack/plugins/security/server/authentication/providers/base.ts
@@ -26,6 +26,7 @@ import type { Tokens } from '../tokens';
  */
 export interface AuthenticationProviderOptions {
   name: string;
+  getServerBaseURL: () => string;
   basePath: HttpServiceSetup['basePath'];
   getRequestOriginalURL: (
     request: KibanaRequest,
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.test.ts b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
index 4a32383d18dec..251a59228fb03 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.test.ts
@@ -39,23 +39,7 @@ describe('SAMLAuthenticationProvider', () => {
     );
     mockOptions.client.asScoped.mockReturnValue(mockScopedClusterClient);
 
-    provider = new SAMLAuthenticationProvider(mockOptions, {
-      realm: 'test-realm',
-    });
-  });
-
-  it('throws if `realm` option is not specified', () => {
-    const providerOptions = mockAuthenticationProviderOptions();
-
-    expect(() => new SAMLAuthenticationProvider(providerOptions)).toThrowError(
-      'Realm name must be specified'
-    );
-    expect(() => new SAMLAuthenticationProvider(providerOptions, {})).toThrowError(
-      'Realm name must be specified'
-    );
-    expect(() => new SAMLAuthenticationProvider(providerOptions, { realm: '' })).toThrowError(
-      'Realm name must be specified'
-    );
+    provider = new SAMLAuthenticationProvider(mockOptions);
   });
 
   describe('`login` method', () => {
@@ -67,6 +51,7 @@ describe('SAMLAuthenticationProvider', () => {
           body: {
             access_token: 'some-token',
             refresh_token: 'some-refresh-token',
+            realm: 'test-realm',
             authentication: mockUser,
           },
         })
@@ -108,13 +93,13 @@ describe('SAMLAuthenticationProvider', () => {
           body: {
             access_token: 'some-token',
             refresh_token: 'some-refresh-token',
+            realm: 'test-realm',
             authentication: mockUser,
           },
         })
       );
 
       provider = new SAMLAuthenticationProvider(mockOptions, {
-        realm: 'test-realm',
         useRelayStateDeepLink: true,
       });
       await expect(
@@ -169,6 +154,10 @@ describe('SAMLAuthenticationProvider', () => {
 
     it('fails if realm from state is different from the realm provider is configured with.', async () => {
       const request = httpServerMock.createKibanaRequest();
+      const customMockOptions = mockAuthenticationProviderOptions({ name: 'saml' });
+      provider = new SAMLAuthenticationProvider(customMockOptions, {
+        realm: 'test-realm',
+      });
 
       await expect(
         provider.login(
@@ -184,7 +173,7 @@ describe('SAMLAuthenticationProvider', () => {
         )
       );
 
-      expect(mockOptions.client.asInternalUser.transport.request).not.toHaveBeenCalled();
+      expect(customMockOptions.client.asInternalUser.transport.request).not.toHaveBeenCalled();
     });
 
     it('redirects to the default location if state contains empty redirect URL.', async () => {
@@ -195,6 +184,7 @@ describe('SAMLAuthenticationProvider', () => {
           body: {
             access_token: 'user-initiated-login-token',
             refresh_token: 'user-initiated-login-refresh-token',
+            realm: 'test-realm',
             authentication: mockUser,
           },
         })
@@ -232,13 +222,13 @@ describe('SAMLAuthenticationProvider', () => {
           body: {
             access_token: 'user-initiated-login-token',
             refresh_token: 'user-initiated-login-refresh-token',
+            realm: 'test-realm',
             authentication: mockUser,
           },
         })
       );
 
       provider = new SAMLAuthenticationProvider(mockOptions, {
-        realm: 'test-realm',
         useRelayStateDeepLink: true,
       });
       await expect(
@@ -275,6 +265,7 @@ describe('SAMLAuthenticationProvider', () => {
       mockOptions.client.asInternalUser.transport.request.mockResolvedValue(
         securityMock.createApiResponse({
           body: {
+            realm: 'test-realm',
             access_token: 'idp-initiated-login-token',
             refresh_token: 'idp-initiated-login-refresh-token',
             authentication: mockUser,
@@ -301,7 +292,7 @@ describe('SAMLAuthenticationProvider', () => {
       expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
         method: 'POST',
         path: '/_security/saml/authenticate',
-        body: { ids: [], content: 'saml-response-xml', realm: 'test-realm' },
+        body: { ids: [], content: 'saml-response-xml' },
       });
     });
 
@@ -342,20 +333,19 @@ describe('SAMLAuthenticationProvider', () => {
               username: 'user',
               access_token: 'valid-token',
               refresh_token: 'valid-refresh-token',
+              realm: 'test-realm',
               authentication: mockUser,
             },
           })
         );
 
         provider = new SAMLAuthenticationProvider(mockOptions, {
-          realm: 'test-realm',
           useRelayStateDeepLink: true,
         });
       });
 
       it('redirects to the home page if `useRelayStateDeepLink` is set to `false`.', async () => {
         provider = new SAMLAuthenticationProvider(mockOptions, {
-          realm: 'test-realm',
           useRelayStateDeepLink: false,
         });
 
@@ -454,10 +444,39 @@ describe('SAMLAuthenticationProvider', () => {
           )
         );
       });
+
+      it('uses `realm` name instead of `acs` if it is specified for SAML authenticate request.', async () => {
+        // Create new provider instance with additional `realm` option.
+        provider = new SAMLAuthenticationProvider(mockOptions, {
+          realm: 'test-realm',
+        });
+
+        await expect(
+          provider.login(httpServerMock.createKibanaRequest({ headers: {} }), {
+            type: SAMLLogin.LoginWithSAMLResponse,
+            samlResponse: 'saml-response-xml',
+          })
+        ).resolves.toEqual(
+          AuthenticationResult.redirectTo(`${mockOptions.basePath.serverBasePath}/`, {
+            state: {
+              accessToken: 'valid-token',
+              refreshToken: 'valid-refresh-token',
+              realm: 'test-realm',
+            },
+            user: mockUser,
+          })
+        );
+
+        expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
+          method: 'POST',
+          path: '/_security/saml/authenticate',
+          body: { ids: [], content: 'saml-response-xml', realm: 'test-realm' },
+        });
+      });
     });
 
     describe('IdP initiated login with existing session', () => {
-      it('returns `notHandled` if new SAML Response is rejected.', async () => {
+      it('fails if new SAML Response is rejected and provider is not configured with specific realm.', async () => {
         const request = httpServerMock.createKibanaRequest({ headers: {} });
         const authorization = 'Bearer some-valid-token';
 
@@ -466,6 +485,39 @@ describe('SAMLAuthenticationProvider', () => {
         );
         mockOptions.client.asInternalUser.transport.request.mockRejectedValue(failureReason);
 
+        await expect(
+          provider.login(
+            request,
+            { type: SAMLLogin.LoginWithSAMLResponse, samlResponse: 'saml-response-xml' },
+            {
+              accessToken: 'some-valid-token',
+              refreshToken: 'some-valid-refresh-token',
+              realm: 'test-realm',
+            }
+          )
+        ).resolves.toEqual(AuthenticationResult.failed(failureReason));
+
+        expect(mockOptions.client.asScoped).toHaveBeenCalledWith({ headers: { authorization } });
+        expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
+          method: 'POST',
+          path: '/_security/saml/authenticate',
+          body: { ids: [], content: 'saml-response-xml' },
+        });
+      });
+
+      it('returns `notHandled` if new SAML Response is rejected and provider is configured with specific realm.', async () => {
+        const request = httpServerMock.createKibanaRequest({ headers: {} });
+        const authorization = 'Bearer some-valid-token';
+
+        provider = new SAMLAuthenticationProvider(mockOptions, {
+          realm: 'test-realm',
+        });
+
+        const failureReason = new errors.ResponseError(
+          securityMock.createApiResponse({ statusCode: 503, body: {} })
+        );
+        mockOptions.client.asInternalUser.transport.request.mockRejectedValue(failureReason);
+
         await expect(
           provider.login(
             request,
@@ -521,7 +573,7 @@ describe('SAMLAuthenticationProvider', () => {
         expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
           method: 'POST',
           path: '/_security/saml/authenticate',
-          body: { ids: [], content: 'saml-response-xml', realm: 'test-realm' },
+          body: { ids: [], content: 'saml-response-xml' },
         });
 
         expect(mockOptions.tokens.invalidate).toHaveBeenCalledTimes(1);
@@ -543,7 +595,7 @@ describe('SAMLAuthenticationProvider', () => {
           ),
         ],
         [
-          'current session is is expired',
+          'current session is expired',
           Promise.reject(
             new errors.ResponseError(securityMock.createApiResponse({ statusCode: 401, body: {} }))
           ),
@@ -568,6 +620,7 @@ describe('SAMLAuthenticationProvider', () => {
                 username: 'user',
                 access_token: 'new-valid-token',
                 refresh_token: 'new-valid-refresh-token',
+                realm: 'test-realm',
                 authentication: mockUser,
               },
             })
@@ -595,7 +648,7 @@ describe('SAMLAuthenticationProvider', () => {
           expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
             method: 'POST',
             path: '/_security/saml/authenticate',
-            body: { ids: [], content: 'saml-response-xml', realm: 'test-realm' },
+            body: { ids: [], content: 'saml-response-xml' },
           });
 
           expect(mockOptions.tokens.invalidate).toHaveBeenCalledTimes(1);
@@ -624,6 +677,7 @@ describe('SAMLAuthenticationProvider', () => {
                 username: 'user',
                 access_token: 'new-valid-token',
                 refresh_token: 'new-valid-refresh-token',
+                realm: 'test-realm',
                 authentication: mockUser,
               },
             })
@@ -632,7 +686,6 @@ describe('SAMLAuthenticationProvider', () => {
           mockOptions.tokens.invalidate.mockResolvedValue(undefined);
 
           provider = new SAMLAuthenticationProvider(mockOptions, {
-            realm: 'test-realm',
             useRelayStateDeepLink: true,
           });
 
@@ -661,7 +714,7 @@ describe('SAMLAuthenticationProvider', () => {
           expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
             method: 'POST',
             path: '/_security/saml/authenticate',
-            body: { ids: [], content: 'saml-response-xml', realm: 'test-realm' },
+            body: { ids: [], content: 'saml-response-xml' },
           });
 
           expect(mockOptions.tokens.invalidate).toHaveBeenCalledTimes(1);
@@ -699,19 +752,16 @@ describe('SAMLAuthenticationProvider', () => {
             body: {
               id: 'some-request-id',
               redirect: 'https://idp-host/path/login?SAMLRequest=some%20request%20',
+              realm: 'test-realm',
             },
           })
         );
 
         await expect(
-          provider.login(
-            request,
-            {
-              type: SAMLLogin.LoginInitiatedByUser,
-              redirectURL: '/test-base-path/some-path#some-fragment',
-            },
-            { realm: 'test-realm' }
-          )
+          provider.login(request, {
+            type: SAMLLogin.LoginInitiatedByUser,
+            redirectURL: '/test-base-path/some-path#some-fragment',
+          })
         ).resolves.toEqual(
           AuthenticationResult.redirectTo(
             'https://idp-host/path/login?SAMLRequest=some%20request%20',
@@ -728,7 +778,9 @@ describe('SAMLAuthenticationProvider', () => {
         expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
           method: 'POST',
           path: '/_security/saml/prepare',
-          body: { realm: 'test-realm' },
+          body: {
+            acs: 'test-protocol://test-hostname:1234/mock-server-basepath/api/security/v1/saml',
+          },
         });
 
         expect(mockOptions.logger.warn).not.toHaveBeenCalled();
@@ -742,6 +794,7 @@ describe('SAMLAuthenticationProvider', () => {
             body: {
               id: 'some-request-id',
               redirect: 'https://idp-host/path/login?SAMLRequest=some%20request%20',
+              realm: 'test-realm',
             },
           })
         );
@@ -771,19 +824,32 @@ describe('SAMLAuthenticationProvider', () => {
         expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
           method: 'POST',
           path: '/_security/saml/prepare',
-          body: { realm: 'test-realm' },
+          body: {
+            acs: 'test-protocol://test-hostname:1234/mock-server-basepath/api/security/v1/saml',
+          },
         });
 
         expect(mockOptions.logger.warn).not.toHaveBeenCalled();
       });
 
-      it('fails if SAML request preparation fails.', async () => {
-        const request = httpServerMock.createKibanaRequest();
+      it('uses `realm` name instead of `acs` if it is specified for SAML prepare request.', async () => {
+        const request = httpServerMock.createKibanaRequest({ path: '/s/foo/some-path' });
 
-        const failureReason = new errors.ResponseError(
-          securityMock.createApiResponse({ statusCode: 401, body: {} })
+        // Create new provider instance with additional `realm` option.
+        const customMockOptions = mockAuthenticationProviderOptions();
+        provider = new SAMLAuthenticationProvider(customMockOptions, {
+          realm: 'test-realm',
+        });
+
+        customMockOptions.client.asInternalUser.transport.request.mockResolvedValue(
+          securityMock.createApiResponse({
+            body: {
+              id: 'some-request-id',
+              redirect: 'https://idp-host/path/login?SAMLRequest=some%20request%20',
+              realm: 'test-realm',
+            },
+          })
         );
-        mockOptions.client.asInternalUser.transport.request.mockRejectedValue(failureReason);
 
         await expect(
           provider.login(
@@ -794,12 +860,47 @@ describe('SAMLAuthenticationProvider', () => {
             },
             { realm: 'test-realm' }
           )
+        ).resolves.toEqual(
+          AuthenticationResult.redirectTo(
+            'https://idp-host/path/login?SAMLRequest=some%20request%20',
+            {
+              state: {
+                requestId: 'some-request-id',
+                redirectURL: '/test-base-path/some-path#some-fragment',
+                realm: 'test-realm',
+              },
+            }
+          )
+        );
+
+        expect(customMockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
+          method: 'POST',
+          path: '/_security/saml/prepare',
+          body: { realm: 'test-realm' },
+        });
+      });
+
+      it('fails if SAML request preparation fails.', async () => {
+        const request = httpServerMock.createKibanaRequest();
+
+        const failureReason = new errors.ResponseError(
+          securityMock.createApiResponse({ statusCode: 401, body: {} })
+        );
+        mockOptions.client.asInternalUser.transport.request.mockRejectedValue(failureReason);
+
+        await expect(
+          provider.login(request, {
+            type: SAMLLogin.LoginInitiatedByUser,
+            redirectURL: '/test-base-path/some-path#some-fragment',
+          })
         ).resolves.toEqual(AuthenticationResult.failed(failureReason));
 
         expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
           method: 'POST',
           path: '/_security/saml/prepare',
-          body: { realm: 'test-realm' },
+          body: {
+            acs: 'test-protocol://test-hostname:1234/mock-server-basepath/api/security/v1/saml',
+          },
         });
       });
     });
@@ -893,7 +994,6 @@ describe('SAMLAuthenticationProvider', () => {
             state: {
               requestId: 'some-request-id',
               redirectURL: '/mock-server-basepath/s/foo/some-path#some-fragment',
-              realm: 'test-realm',
             },
           }
         )
@@ -905,7 +1005,9 @@ describe('SAMLAuthenticationProvider', () => {
       expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
         method: 'POST',
         path: '/_security/saml/prepare',
-        body: { realm: 'test-realm' },
+        body: {
+          acs: 'test-protocol://test-hostname:1234/mock-server-basepath/api/security/v1/saml',
+        },
       });
     });
 
@@ -1112,6 +1214,13 @@ describe('SAMLAuthenticationProvider', () => {
 
     it('fails if realm from state is different from the realm provider is configured with.', async () => {
       const request = httpServerMock.createKibanaRequest();
+
+      // Create new provider instance with additional `realm` option.
+      const customMockOptions = mockAuthenticationProviderOptions({ name: 'saml' });
+      provider = new SAMLAuthenticationProvider(customMockOptions, {
+        realm: 'test-realm',
+      });
+
       await expect(provider.authenticate(request, { realm: 'other-realm' })).resolves.toEqual(
         AuthenticationResult.failed(
           Boom.unauthorized(
@@ -1186,7 +1295,10 @@ describe('SAMLAuthenticationProvider', () => {
       expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
         method: 'POST',
         path: '/_security/saml/invalidate',
-        body: { query_string: 'SAMLRequest=xxx%20yyy', realm: 'test-realm' },
+        body: {
+          query_string: 'SAMLRequest=xxx%20yyy',
+          acs: 'test-protocol://test-hostname:1234/mock-server-basepath/api/security/v1/saml',
+        },
       });
     });
 
@@ -1305,7 +1417,10 @@ describe('SAMLAuthenticationProvider', () => {
       expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
         method: 'POST',
         path: '/_security/saml/invalidate',
-        body: { query_string: 'SAMLRequest=xxx%20yyy', realm: 'test-realm' },
+        body: {
+          query_string: 'SAMLRequest=xxx%20yyy',
+          acs: 'test-protocol://test-hostname:1234/mock-server-basepath/api/security/v1/saml',
+        },
       });
     });
 
@@ -1324,7 +1439,10 @@ describe('SAMLAuthenticationProvider', () => {
       expect(mockOptions.client.asInternalUser.transport.request).toHaveBeenCalledWith({
         method: 'POST',
         path: '/_security/saml/invalidate',
-        body: { query_string: 'SAMLRequest=xxx%20yyy', realm: 'test-realm' },
+        body: {
+          query_string: 'SAMLRequest=xxx%20yyy',
+          acs: 'test-protocol://test-hostname:1234/mock-server-basepath/api/security/v1/saml',
+        },
       });
     });
 
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.ts b/x-pack/plugins/security/server/authentication/providers/saml.ts
index 37e7e868e4d3d..6eab0c5dc4875 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.ts
@@ -42,9 +42,10 @@ interface ProviderState extends Partial<TokenPair> {
   redirectURL?: string;
 
   /**
-   * The name of the SAML realm that was used to establish session.
+   * The name of the SAML realm that was used to establish session (may not be known during URL
+   * fragment capturing stage).
    */
-  realm: string;
+  realm?: string;
 }
 
 /**
@@ -105,9 +106,10 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
   static readonly type = 'saml';
 
   /**
-   * Specifies Elasticsearch SAML realm name that Kibana should use.
+   * Optionally specifies Elasticsearch SAML realm name that Kibana should use. If not specified
+   * Kibana ACS URL is used for realm matching instead.
    */
-  private readonly realm: string;
+  private readonly realm?: string;
 
   /**
    * Indicates if we should treat non-empty `RelayState` as a deep link in Kibana we should redirect
@@ -121,12 +123,8 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
   ) {
     super(options);
 
-    if (!samlOptions || !samlOptions.realm) {
-      throw new Error('Realm name must be specified');
-    }
-
-    this.realm = samlOptions.realm;
-    this.useRelayStateDeepLink = samlOptions.useRelayStateDeepLink ?? false;
+    this.realm = samlOptions?.realm;
+    this.useRelayStateDeepLink = samlOptions?.useRelayStateDeepLink ?? false;
   }
 
   /**
@@ -144,7 +142,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
 
     // It may happen that Kibana is re-configured to use different realm for the same provider name,
     // we should clear such session an log user out.
-    if (state?.realm && state.realm !== this.realm) {
+    if (state && this.realm && state.realm !== this.realm) {
       const message = `State based on realm "${state.realm}", but provider with the name "${this.options.name}" is configured to use realm "${this.realm}".`;
       this.logger.debug(message);
       return AuthenticationResult.failed(Boom.unauthorized(message));
@@ -215,7 +213,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
 
     // It may happen that Kibana is re-configured to use different realm for the same provider name,
     // we should clear such session an log user out.
-    if (state?.realm && state.realm !== this.realm) {
+    if (state && this.realm && state.realm !== this.realm) {
       const message = `State based on realm "${state.realm}", but provider with the name "${this.options.name}" is configured to use realm "${this.realm}".`;
       this.logger.debug(message);
       return AuthenticationResult.failed(Boom.unauthorized(message));
@@ -274,7 +272,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
         // and state !== undefined). In this case case it'd be safer to trigger SP initiated logout
         // for the new session as well.
         const redirect = isIdPInitiatedSLORequest
-          ? await this.performIdPInitiatedSingleLogout(request)
+          ? await this.performIdPInitiatedSingleLogout(request, this.realm || state?.realm)
           : state
           ? await this.performUserInitiatedSingleLogout(state.accessToken!, state.refreshToken!)
           : // Once Elasticsearch can consume logout response we'll be sending it here. See https://github.com/elastic/elasticsearch/issues/40901
@@ -331,9 +329,14 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
 
     // If we have a `SAMLResponse` and state, but state doesn't contain all the necessary information,
     // then something unexpected happened and we should fail.
-    const { requestId: stateRequestId, redirectURL: stateRedirectURL } = state || {
+    const {
+      requestId: stateRequestId,
+      redirectURL: stateRedirectURL,
+      realm: stateRealm,
+    } = state || {
       requestId: '',
       redirectURL: '',
+      realm: '',
     };
     if (state && !stateRequestId) {
       const message = 'SAML response state does not have corresponding request id.';
@@ -349,7 +352,14 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
         : 'Login has been initiated by Identity Provider.'
     );
 
-    let result: { access_token: string; refresh_token: string; authentication: AuthenticationInfo };
+    const providerRealm = this.realm || stateRealm;
+
+    let result: {
+      access_token: string;
+      refresh_token: string;
+      realm: string;
+      authentication: AuthenticationInfo;
+    };
     try {
       // This operation should be performed on behalf of the user with a privilege that normal
       // user usually doesn't have `cluster:admin/xpack/security/saml/authenticate`.
@@ -362,7 +372,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
           body: {
             ids: !isIdPInitiatedLogin ? [stateRequestId] : [],
             content: samlResponse,
-            realm: this.realm,
+            ...(providerRealm ? { realm: providerRealm } : {}),
           },
         })
       ).body as any;
@@ -372,7 +382,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
       // Since we don't know upfront what realm is targeted by the Identity Provider initiated login
       // there is a chance that it failed because of realm mismatch and hence we should return
       // `notHandled` and give other SAML providers a chance to properly handle it instead.
-      return isIdPInitiatedLogin
+      return isIdPInitiatedLogin && providerRealm
         ? AuthenticationResult.notHandled()
         : AuthenticationResult.failed(err);
     }
@@ -404,7 +414,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
         state: {
           accessToken: result.access_token,
           refreshToken: result.refresh_token,
-          realm: this.realm,
+          realm: result.realm,
         },
         user: this.authenticationInfoToAuthenticatedUser(result.authentication),
       }
@@ -545,7 +555,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
         authHeaders: {
           authorization: new HTTPAuthorizationHeader('Bearer', accessToken).toString(),
         },
-        state: { accessToken, refreshToken, realm: this.realm },
+        state: { accessToken, refreshToken, realm: this.realm || state.realm },
       }
     );
   }
@@ -559,15 +569,18 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
     this.logger.debug('Trying to initiate SAML handshake.');
 
     try {
+      // Prefer realm name if it's specified, otherwise fallback to ACS.
+      const preparePayload = this.realm ? { realm: this.realm } : { acs: this.getACS() };
+
       // This operation should be performed on behalf of the user with a privilege that normal
       // user usually doesn't have `cluster:admin/xpack/security/saml/prepare`.
       // We can replace generic `transport.request` with a dedicated API method call once
       // https://github.com/elastic/elasticsearch/issues/67189 is resolved.
-      const { id: requestId, redirect } = (
+      const { id: requestId, redirect, realm } = (
         await this.options.client.asInternalUser.transport.request({
           method: 'POST',
           path: '/_security/saml/prepare',
-          body: { realm: this.realm },
+          body: preparePayload,
         })
       ).body as any;
 
@@ -575,7 +588,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
 
       // Store request id in the state so that we can reuse it once we receive `SAMLResponse`.
       return AuthenticationResult.redirectTo(redirect, {
-        state: { requestId, redirectURL, realm: this.realm },
+        state: { requestId, redirectURL, realm },
       });
     } catch (err) {
       this.logger.debug(`Failed to initiate SAML handshake: ${getDetailedErrorMessage(err)}`);
@@ -612,10 +625,14 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
    * Calls `saml/invalidate` with the `SAMLRequest` query string parameter received from the Identity
    * Provider and redirects user back to the Identity Provider if needed.
    * @param request Request instance.
+   * @param realm Configured SAML realm name.
    */
-  private async performIdPInitiatedSingleLogout(request: KibanaRequest) {
+  private async performIdPInitiatedSingleLogout(request: KibanaRequest, realm?: string) {
     this.logger.debug('Single logout has been initiated by the Identity Provider.');
 
+    // Prefer realm name if it's specified, otherwise fallback to ACS.
+    const invalidatePayload = realm ? { realm } : { acs: this.getACS() };
+
     // This operation should be performed on behalf of the user with a privilege that normal
     // user usually doesn't have `cluster:admin/xpack/security/saml/invalidate`.
     // We can replace generic `transport.request` with a dedicated API method call once
@@ -627,7 +644,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
         // Elasticsearch expects `query_string` without leading `?`, so we should strip it with `slice`.
         body: {
           query_string: request.url.search ? request.url.search.slice(1) : '',
-          realm: this.realm,
+          ...invalidatePayload,
         },
       })
     ).body as any;
@@ -637,6 +654,15 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
     return redirect;
   }
 
+  /**
+   * Constructs and returns Kibana's Assertion consumer service URL.
+   */
+  private getACS() {
+    return `${this.options.getServerBaseURL()}${
+      this.options.basePath.serverBasePath
+    }/api/security/v1/saml`;
+  }
+
   /**
    * Tries to initiate SAML authentication handshake. If the request already includes user URL hash fragment, we will
    * initiate handshake right away, otherwise we'll redirect user to a dedicated page where we capture URL hash fragment
diff --git a/x-pack/plugins/security/server/config.test.ts b/x-pack/plugins/security/server/config.test.ts
index 75dfcb6151ea7..3be565d59a11f 100644
--- a/x-pack/plugins/security/server/config.test.ts
+++ b/x-pack/plugins/security/server/config.test.ts
@@ -58,6 +58,7 @@ describe('config schema', () => {
         "enabled": true,
         "encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
         "loginAssistanceMessage": "",
+        "public": Object {},
         "secureCookies": false,
         "session": Object {
           "cleanupInterval": "PT1H",
@@ -109,6 +110,7 @@ describe('config schema', () => {
         "enabled": true,
         "encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
         "loginAssistanceMessage": "",
+        "public": Object {},
         "secureCookies": false,
         "session": Object {
           "cleanupInterval": "PT1H",
@@ -159,6 +161,7 @@ describe('config schema', () => {
         "cookieName": "sid",
         "enabled": true,
         "loginAssistanceMessage": "",
+        "public": Object {},
         "secureCookies": false,
         "session": Object {
           "cleanupInterval": "PT1H",
@@ -179,6 +182,109 @@ describe('config schema', () => {
     );
   });
 
+  describe('public', () => {
+    it('properly validates `protocol`', async () => {
+      expect(ConfigSchema.validate({ public: { protocol: 'http' } }).public).toMatchInlineSnapshot(`
+        Object {
+          "protocol": "http",
+        }
+      `);
+
+      expect(ConfigSchema.validate({ public: { protocol: 'https' } }).public)
+        .toMatchInlineSnapshot(`
+        Object {
+          "protocol": "https",
+        }
+      `);
+
+      expect(() => ConfigSchema.validate({ public: { protocol: 'ftp' } }))
+        .toThrowErrorMatchingInlineSnapshot(`
+        "[public.protocol]: types that failed validation:
+        - [public.protocol.0]: expected value to equal [http]
+        - [public.protocol.1]: expected value to equal [https]"
+      `);
+
+      expect(() => ConfigSchema.validate({ public: { protocol: 'some-protocol' } }))
+        .toThrowErrorMatchingInlineSnapshot(`
+        "[public.protocol]: types that failed validation:
+        - [public.protocol.0]: expected value to equal [http]
+        - [public.protocol.1]: expected value to equal [https]"
+      `);
+    });
+
+    it('properly validates `hostname`', async () => {
+      expect(ConfigSchema.validate({ public: { hostname: 'elastic.co' } }).public)
+        .toMatchInlineSnapshot(`
+        Object {
+          "hostname": "elastic.co",
+        }
+      `);
+
+      expect(ConfigSchema.validate({ public: { hostname: '192.168.1.1' } }).public)
+        .toMatchInlineSnapshot(`
+        Object {
+          "hostname": "192.168.1.1",
+        }
+      `);
+
+      expect(ConfigSchema.validate({ public: { hostname: '::1' } }).public).toMatchInlineSnapshot(`
+        Object {
+          "hostname": "::1",
+        }
+      `);
+
+      expect(() =>
+        ConfigSchema.validate({ public: { hostname: 'http://elastic.co' } })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[public.hostname]: value must be a valid hostname (see RFC 1123)."`
+      );
+
+      expect(() =>
+        ConfigSchema.validate({ public: { hostname: 'localhost:5601' } })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[public.hostname]: value must be a valid hostname (see RFC 1123)."`
+      );
+    });
+
+    it('properly validates `port`', async () => {
+      expect(ConfigSchema.validate({ public: { port: 1234 } }).public).toMatchInlineSnapshot(`
+        Object {
+          "port": 1234,
+        }
+      `);
+
+      expect(ConfigSchema.validate({ public: { port: 0 } }).public).toMatchInlineSnapshot(`
+        Object {
+          "port": 0,
+        }
+      `);
+
+      expect(ConfigSchema.validate({ public: { port: 65535 } }).public).toMatchInlineSnapshot(`
+        Object {
+          "port": 65535,
+        }
+      `);
+
+      expect(() =>
+        ConfigSchema.validate({ public: { port: -1 } })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[public.port]: Value must be equal to or greater than [0]."`
+      );
+
+      expect(() =>
+        ConfigSchema.validate({ public: { port: 65536 } })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[public.port]: Value must be equal to or lower than [65535]."`
+      );
+
+      expect(() =>
+        ConfigSchema.validate({ public: { port: '56x1' } })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"[public.port]: expected value of type [number] but got [string]"`
+      );
+    });
+  });
+
   describe('authc.oidc', () => {
     it(`returns a validation error when authc.providers is "['oidc']" and realm is unspecified`, async () => {
       expect(() => ConfigSchema.validate({ authc: { providers: ['oidc'] } })).toThrow(
@@ -255,14 +361,42 @@ describe('config schema', () => {
   });
 
   describe('authc.saml', () => {
-    it('fails if authc.providers includes `saml`, but `saml.realm` is not specified', async () => {
-      expect(() => ConfigSchema.validate({ authc: { providers: ['saml'] } })).toThrow(
-        '[authc.saml.realm]: expected value of type [string] but got [undefined]'
-      );
+    it('does not fail if authc.providers includes `saml`, but `saml.realm` is not specified', async () => {
+      expect(ConfigSchema.validate({ authc: { providers: ['saml'] } }).authc)
+        .toMatchInlineSnapshot(`
+        Object {
+          "http": Object {
+            "autoSchemesEnabled": true,
+            "enabled": true,
+            "schemes": Array [
+              "apikey",
+            ],
+          },
+          "providers": Array [
+            "saml",
+          ],
+          "saml": Object {},
+          "selector": Object {},
+        }
+      `);
 
-      expect(() => ConfigSchema.validate({ authc: { providers: ['saml'], saml: {} } })).toThrow(
-        '[authc.saml.realm]: expected value of type [string] but got [undefined]'
-      );
+      expect(ConfigSchema.validate({ authc: { providers: ['saml'], saml: {} } }).authc)
+        .toMatchInlineSnapshot(`
+        Object {
+          "http": Object {
+            "autoSchemesEnabled": true,
+            "enabled": true,
+            "schemes": Array [
+              "apikey",
+            ],
+          },
+          "providers": Array [
+            "saml",
+          ],
+          "saml": Object {},
+          "selector": Object {},
+        }
+      `);
 
       expect(
         ConfigSchema.validate({
diff --git a/x-pack/plugins/security/server/config.ts b/x-pack/plugins/security/server/config.ts
index 9daf0aff4c6cb..90fccf4bc6c26 100644
--- a/x-pack/plugins/security/server/config.ts
+++ b/x-pack/plugins/security/server/config.ts
@@ -228,6 +228,11 @@ export const ConfigSchema = schema.object({
   sameSiteCookies: schema.maybe(
     schema.oneOf([schema.literal('Strict'), schema.literal('Lax'), schema.literal('None')])
   ),
+  public: schema.object({
+    protocol: schema.maybe(schema.oneOf([schema.literal('http'), schema.literal('https')])),
+    hostname: schema.maybe(schema.string({ hostname: true })),
+    port: schema.maybe(schema.number({ min: 0, max: 65535 })),
+  }),
   authc: schema.object({
     selector: schema.object({ enabled: schema.maybe(schema.boolean()) }),
     providers: schema.oneOf([schema.arrayOf(schema.string()), providersConfigSchema], {
@@ -256,7 +261,7 @@ export const ConfigSchema = schema.object({
     saml: providerOptionsSchema(
       'saml',
       schema.object({
-        realm: schema.string(),
+        realm: schema.maybe(schema.string()),
         maxRedirectURLSize: schema.maybe(schema.byteSize()),
       })
     ),
diff --git a/x-pack/plugins/security/server/config_deprecations.test.ts b/x-pack/plugins/security/server/config_deprecations.test.ts
index ad6f81eaeefff..4518679755156 100644
--- a/x-pack/plugins/security/server/config_deprecations.test.ts
+++ b/x-pack/plugins/security/server/config_deprecations.test.ts
@@ -286,7 +286,7 @@ describe('Config Deprecations', () => {
     const { messages } = applyConfigDeprecations(cloneDeep(config));
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "\\"xpack.security.authc.providers.saml.<provider-name>.maxRedirectURLSize\\" is is no longer used.",
+        "\\"xpack.security.authc.providers.saml.<provider-name>.maxRedirectURLSize\\" is no longer used.",
       ]
     `);
   });
diff --git a/x-pack/plugins/security/server/config_deprecations.ts b/x-pack/plugins/security/server/config_deprecations.ts
index f68112760632e..169211184a325 100644
--- a/x-pack/plugins/security/server/config_deprecations.ts
+++ b/x-pack/plugins/security/server/config_deprecations.ts
@@ -13,6 +13,7 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
   unused,
 }) => [
   rename('sessionTimeout', 'session.idleTimeout'),
+  rename('authProviders', 'authc.providers'),
 
   rename('audit.appender.kind', 'audit.appender.type'),
   rename('audit.appender.layout.kind', 'audit.appender.layout.type'),
@@ -121,7 +122,7 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
         }),
         message: i18n.translate('xpack.security.deprecations.maxRedirectURLSizeMessage', {
           defaultMessage:
-            '"xpack.security.authc.providers.saml.<provider-name>.maxRedirectURLSize" is is no longer used.',
+            '"xpack.security.authc.providers.saml.<provider-name>.maxRedirectURLSize" is no longer used.',
         }),
         correctiveActions: {
           manualSteps: [
diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts b/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts
index 98cb7729c9440..69fce914cb1d5 100644
--- a/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts
@@ -23,8 +23,8 @@ export const EndpointActionLogRequestSchema = {
   query: schema.object({
     page: schema.number({ defaultValue: 1, min: 1 }),
     page_size: schema.number({ defaultValue: 10, min: 1, max: 100 }),
-    start_date: schema.maybe(schema.string()),
-    end_date: schema.maybe(schema.string()),
+    start_date: schema.string(),
+    end_date: schema.string(),
   }),
   params: schema.object({
     agent_id: schema.string(),
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
index d49868aae9227..c6d30825c21c9 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
@@ -65,8 +65,8 @@ export type ActivityLogEntry = ActivityLogAction | ActivityLogActionResponse;
 export interface ActivityLog {
   page: number;
   pageSize: number;
-  startDate?: string;
-  endDate?: string;
+  startDate: string;
+  endDate: string;
   data: ActivityLogEntry[];
 }
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
index e179c02987462..3c277d1d4019b 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { EuiLoadingContent, EuiPanel } from '@elastic/eui';
 import { isEmpty } from 'lodash/fp';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { connect, ConnectedProps, useDispatch } from 'react-redux';
@@ -369,11 +368,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
   }, [dispatch, defaultTimelineModel, filterManager, tGridEnabled, timelineId]);
 
   if (loading || indexPatternsLoading || isEmpty(selectedPatterns)) {
-    return (
-      <EuiPanel hasBorder={false} hasShadow={false} paddingSize="none">
-        <EuiLoadingContent data-test-subj="loading-alerts-panel" />
-      </EuiPanel>
-    );
+    return null;
   }
 
   return (
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
index 4c3db2ae62be3..4d4ac102ea645 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
@@ -695,7 +695,7 @@ const RuleDetailsPageComponent: React.FC<DetectionEngineComponentProps> = ({
                           enabled={isExistingRule && (rule?.enabled ?? false)}
                           onChange={handleOnChangeEnabledRule}
                         />
-                        <EuiFlexItem>{i18n.ACTIVATED_RULE}</EuiFlexItem>
+                        <EuiFlexItem>{i18n.ACTIVATE_RULE}</EuiFlexItem>
                       </EuiFlexGroup>
                     </EuiToolTip>
                   </EuiFlexItem>
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/translations.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/translations.ts
index ca3e5a4587a09..a83647f8a9781 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/translations.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/translations.ts
@@ -28,10 +28,10 @@ export const EXPERIMENTAL = i18n.translate(
   }
 );
 
-export const ACTIVATED_RULE = i18n.translate(
-  'xpack.securitySolution.detectionEngine.ruleDetails.activatedRuleLabel',
+export const ACTIVATE_RULE = i18n.translate(
+  'xpack.securitySolution.detectionEngine.ruleDetails.activateRuleLabel',
   {
-    defaultMessage: 'Activated',
+    defaultMessage: 'Activate',
   }
 );
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts
index 0ac73df6704c8..9c557f83012bf 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts
@@ -126,6 +126,8 @@ export const endpointActivityLogHttpMock = httpHandlerMockFactory<EndpointActivi
           body: {
             page: 1,
             pageSize: 50,
+            startDate: 'now-1d',
+            endDate: 'now',
             data: [
               {
                 type: 'response',
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
index ba07cd3c9d461..05d28c1cbf27f 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
@@ -6,6 +6,7 @@
  */
 
 import { Action } from 'redux';
+import { EuiSuperDatePickerRecentRange } from '@elastic/eui';
 import {
   HostResultList,
   HostInfo,
@@ -161,11 +162,23 @@ export interface EndpointDetailsActivityLogUpdatePaging {
     disabled?: boolean;
     page: number;
     pageSize: number;
-    startDate?: string;
-    endDate?: string;
+    startDate: string;
+    endDate: string;
   };
 }
 
+export interface UserUpdatedActivityLogRefreshOptions {
+  type: 'userUpdatedActivityLogRefreshOptions';
+  payload: {
+    autoRefreshOptions: { enabled: boolean; duration: number };
+  };
+}
+
+export interface UserUpdatedActivityLogRecentlyUsedDateRanges {
+  type: 'userUpdatedActivityLogRecentlyUsedDateRanges';
+  payload: EuiSuperDatePickerRecentRange[];
+}
+
 export interface EndpointDetailsLoad {
   type: 'endpointDetailsLoad';
   payload: {
@@ -194,6 +207,8 @@ export type EndpointAction =
   | EndpointDetailsActivityLogUpdatePaging
   | EndpointDetailsActivityLogUpdateIsInvalidDateRange
   | EndpointDetailsActivityLogChanged
+  | UserUpdatedActivityLogRefreshOptions
+  | UserUpdatedActivityLogRecentlyUsedDateRanges
   | EndpointDetailsLoad
   | ServerReturnedEndpointPolicyResponse
   | ServerFailedToReturnEndpointPolicyResponse
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.ts
index f4f2bc0c7015c..3c100ebc38a97 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.ts
@@ -24,9 +24,14 @@ export const initialEndpointPageState = (): Immutable<EndpointState> => {
           disabled: false,
           page: 1,
           pageSize: 50,
-          startDate: undefined,
-          endDate: undefined,
+          startDate: 'now-1d',
+          endDate: 'now',
           isInvalidDateRange: false,
+          autoRefreshOptions: {
+            enabled: false,
+            duration: DEFAULT_POLL_INTERVAL,
+          },
+          recentlyUsedDateRanges: [],
         },
         logData: createUninitialisedResourceState(),
       },
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
index 7fbe2dfc0a099..49ba88fd47717 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
@@ -48,7 +48,14 @@ describe('EndpointList store concerns', () => {
               disabled: false,
               page: 1,
               pageSize: 50,
+              startDate: 'now-1d',
+              endDate: 'now',
               isInvalidDateRange: false,
+              autoRefreshOptions: {
+                enabled: false,
+                duration: DEFAULT_POLL_INTERVAL,
+              },
+              recentlyUsedDateRanges: [],
             },
             logData: { type: 'UninitialisedResourceState' },
           },
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts
index e51fe15e7130f..83d3e62cf98f2 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.test.ts
@@ -267,6 +267,8 @@ describe('endpoint list middleware', () => {
         payload: {
           page,
           pageSize: 50,
+          startDate: 'now-1d',
+          endDate: 'now',
         },
       });
     };
@@ -311,6 +313,8 @@ describe('endpoint list middleware', () => {
       expect(mockedApis.responseProvider.activityLogResponse).toHaveBeenCalledWith({
         path: expect.any(String),
         query: {
+          end_date: 'now',
+          start_date: 'now-1d',
           page: 1,
           page_size: 50,
         },
@@ -396,6 +400,8 @@ describe('endpoint list middleware', () => {
         query: {
           page: 3,
           page_size: 50,
+          start_date: 'now-1d',
+          end_date: 'now',
         },
       });
     });
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
index df4361a6048a8..6b88183db6841 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts
@@ -640,12 +640,12 @@ async function endpointDetailsActivityLogChangedMiddleware({
   });
 
   try {
-    const { page, pageSize } = getActivityLogDataPaging(getState());
+    const { page, pageSize, startDate, endDate } = getActivityLogDataPaging(getState());
     const route = resolvePathVariables(ENDPOINT_ACTION_LOG_ROUTE, {
       agent_id: selectedAgent(getState()),
     });
     const activityLog = await coreStart.http.get<ActivityLog>(route, {
-      query: { page, page_size: pageSize },
+      query: { page, page_size: pageSize, start_date: startDate, end_date: endDate },
     });
     dispatch({
       type: 'endpointDetailsActivityLogChanged',
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
index 02d2adce833cf..b16caf00b4e28 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
@@ -24,6 +24,7 @@ import { AppAction } from '../../../../common/store/actions';
 import { ImmutableReducer } from '../../../../common/store';
 import { Immutable } from '../../../../../common/endpoint/types';
 import { createUninitialisedResourceState, isUninitialisedResourceState } from '../../../state';
+import { DEFAULT_POLL_INTERVAL } from '../../../common/constants';
 
 type StateReducer = ImmutableReducer<EndpointState, AppAction>;
 type CaseReducer<T extends AppAction> = (
@@ -172,7 +173,11 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
         },
       },
     };
-  } else if (action.type === 'endpointDetailsActivityLogUpdatePaging') {
+  } else if (
+    action.type === 'endpointDetailsActivityLogUpdatePaging' ||
+    action.type === 'endpointDetailsActivityLogUpdateIsInvalidDateRange' ||
+    action.type === 'userUpdatedActivityLogRefreshOptions'
+  ) {
     return {
       ...state,
       endpointDetails: {
@@ -186,7 +191,7 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
         },
       },
     };
-  } else if (action.type === 'endpointDetailsActivityLogUpdateIsInvalidDateRange') {
+  } else if (action.type === 'userUpdatedActivityLogRecentlyUsedDateRanges') {
     return {
       ...state,
       endpointDetails: {
@@ -195,7 +200,7 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
           ...state.endpointDetails.activityLog,
           paging: {
             ...state.endpointDetails.activityLog.paging,
-            ...action.payload,
+            recentlyUsedDateRanges: action.payload,
           },
         },
       },
@@ -315,9 +320,16 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
       logData: createUninitialisedResourceState(),
       paging: {
         disabled: false,
+        isInvalidDateRange: false,
         page: 1,
         pageSize: 50,
-        isInvalidDateRange: false,
+        startDate: 'now-1d',
+        endDate: 'now',
+        autoRefreshOptions: {
+          enabled: false,
+          duration: DEFAULT_POLL_INTERVAL,
+        },
+        recentlyUsedDateRanges: [],
       },
     };
 
@@ -337,7 +349,16 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
           ...stateUpdates,
           endpointDetails: {
             ...state.endpointDetails,
-            activityLog,
+            activityLog: {
+              ...activityLog,
+              paging: {
+                ...activityLog.paging,
+                startDate: state.endpointDetails.activityLog.paging.startDate,
+                endDate: state.endpointDetails.activityLog.paging.endDate,
+                recentlyUsedDateRanges:
+                  state.endpointDetails.activityLog.paging.recentlyUsedDateRanges,
+              },
+            },
             hostDetails: {
               ...state.endpointDetails.hostDetails,
               detailsError: undefined,
@@ -355,7 +376,16 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
           ...stateUpdates,
           endpointDetails: {
             ...state.endpointDetails,
-            activityLog,
+            activityLog: {
+              ...activityLog,
+              paging: {
+                ...activityLog.paging,
+                startDate: state.endpointDetails.activityLog.paging.startDate,
+                endDate: state.endpointDetails.activityLog.paging.endDate,
+                recentlyUsedDateRanges:
+                  state.endpointDetails.activityLog.paging.recentlyUsedDateRanges,
+              },
+            },
             hostDetails: {
               ...state.endpointDetails.hostDetails,
               detailsLoading: !isNotLoadingDetails,
@@ -372,7 +402,16 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
           ...stateUpdates,
           endpointDetails: {
             ...state.endpointDetails,
-            activityLog,
+            activityLog: {
+              ...activityLog,
+              paging: {
+                ...activityLog.paging,
+                startDate: state.endpointDetails.activityLog.paging.startDate,
+                endDate: state.endpointDetails.activityLog.paging.endDate,
+                recentlyUsedDateRanges:
+                  state.endpointDetails.activityLog.paging.recentlyUsedDateRanges,
+              },
+            },
             hostDetails: {
               ...state.endpointDetails.hostDetails,
               detailsLoading: true,
@@ -391,7 +430,15 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
       ...stateUpdates,
       endpointDetails: {
         ...state.endpointDetails,
-        activityLog,
+        activityLog: {
+          ...activityLog,
+          paging: {
+            ...activityLog.paging,
+            startDate: state.endpointDetails.activityLog.paging.startDate,
+            endDate: state.endpointDetails.activityLog.paging.endDate,
+            recentlyUsedDateRanges: state.endpointDetails.activityLog.paging.recentlyUsedDateRanges,
+          },
+        },
         hostDetails: {
           ...state.endpointDetails.hostDetails,
           detailsError: undefined,
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
index 82057af233e43..dd0bc79f1ba52 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { EuiSuperDatePickerRecentRange } from '@elastic/eui';
 import {
   ActivityLog,
   HostInfo,
@@ -41,9 +42,14 @@ export interface EndpointState {
         disabled?: boolean;
         page: number;
         pageSize: number;
-        startDate?: string;
-        endDate?: string;
+        startDate: string;
+        endDate: string;
         isInvalidDateRange: boolean;
+        autoRefreshOptions: {
+          enabled: boolean;
+          duration: number;
+        };
+        recentlyUsedDateRanges: EuiSuperDatePickerRecentRange[];
       };
       logData: AsyncResourceState<ActivityLog>;
     };
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/utils.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/utils.test.ts
index fa2aaaa16ae37..ee723bd0bf0f5 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/utils.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/utils.test.ts
@@ -10,12 +10,14 @@ import { getIsInvalidDateRange } from './utils';
 
 describe('utils', () => {
   describe('getIsInvalidDateRange', () => {
-    it('should return FALSE when either dates are undefined', () => {
-      expect(getIsInvalidDateRange({})).toBe(false);
-      expect(getIsInvalidDateRange({ startDate: moment().subtract(1, 'd').toISOString() })).toBe(
-        false
-      );
-      expect(getIsInvalidDateRange({ endDate: moment().toISOString() })).toBe(false);
+    it('should return FALSE when startDate is before endDate', () => {
+      expect(getIsInvalidDateRange({ startDate: 'now-1d', endDate: 'now' })).toBe(false);
+      expect(
+        getIsInvalidDateRange({
+          startDate: moment().subtract(1, 'd').toISOString(),
+          endDate: moment().toISOString(),
+        })
+      ).toBe(false);
     });
 
     it('should return TRUE when startDate is after endDate', () => {
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/utils.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/utils.ts
index e2d619743c83b..1bfb99c68ef66 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/utils.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/utils.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import dateMath from '@elastic/datemath';
 import moment from 'moment';
 import { HostInfo, HostMetadata } from '../../../../common/endpoint/types';
 
@@ -29,12 +30,12 @@ export const getIsInvalidDateRange = ({
   startDate,
   endDate,
 }: {
-  startDate?: string;
-  endDate?: string;
+  startDate: string;
+  endDate: string;
 }) => {
-  if (startDate && endDate) {
-    const start = moment(startDate);
-    const end = moment(endDate);
+  const start = moment(dateMath.parse(startDate));
+  const end = moment(dateMath.parse(endDate));
+  if (start.isValid() && end.isValid()) {
     return start.isAfter(end);
   }
   return false;
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/activity_log_date_range_picker/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/activity_log_date_range_picker/index.tsx
index e921078539303..30ab082559c7b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/activity_log_date_range_picker/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/activity_log_date_range_picker/index.tsx
@@ -8,95 +8,140 @@
 import { useDispatch } from 'react-redux';
 import React, { memo, useCallback } from 'react';
 import styled from 'styled-components';
-import moment from 'moment';
-import { EuiFlexGroup, EuiFlexItem, EuiDatePicker, EuiDatePickerRange } from '@elastic/eui';
+import dateMath from '@elastic/datemath';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSuperDatePicker,
+  EuiSuperDatePickerRecentRange,
+} from '@elastic/eui';
 
-import * as i18 from '../../../translations';
 import { useEndpointSelector } from '../../../hooks';
-import { getActivityLogDataPaging } from '../../../../store/selectors';
+import {
+  getActivityLogDataPaging,
+  getActivityLogRequestLoading,
+} from '../../../../store/selectors';
+import { DEFAULT_TIMEPICKER_QUICK_RANGES } from '../../../../../../../../common/constants';
+import { useUiSetting$ } from '../../../../../../../common/lib/kibana';
+
+interface Range {
+  from: string;
+  to: string;
+  display: string;
+}
 
 const DatePickerWrapper = styled.div`
   width: ${(props) => props.theme.eui.fractions.single.percentage};
-  background: white;
+  max-width: 350px;
 `;
 const StickyFlexItem = styled(EuiFlexItem)`
-  max-width: 350px;
+  background: ${(props) => `${props.theme.eui.euiHeaderBackgroundColor}`};
   position: sticky;
-  top: ${(props) => props.theme.eui.euiSizeM};
+  top: 0;
   z-index: 1;
-  padding: ${(props) => `0 ${props.theme.eui.paddingSizes.m}`};
+  padding: ${(props) => `${props.theme.eui.paddingSizes.m}`};
 `;
 
 export const DateRangePicker = memo(() => {
   const dispatch = useDispatch();
-  const { page, pageSize, startDate, endDate, isInvalidDateRange } = useEndpointSelector(
-    getActivityLogDataPaging
-  );
+  const {
+    page,
+    pageSize,
+    startDate,
+    endDate,
+    autoRefreshOptions,
+    recentlyUsedDateRanges,
+  } = useEndpointSelector(getActivityLogDataPaging);
+
+  const activityLogLoading = useEndpointSelector(getActivityLogRequestLoading);
 
-  const onChangeStartDate = useCallback(
-    (date) => {
+  const dispatchActionUpdateActivityLogPaging = useCallback(
+    async ({ start, end }) => {
       dispatch({
         type: 'endpointDetailsActivityLogUpdatePaging',
         payload: {
           disabled: false,
           page,
           pageSize,
-          startDate: date ? date?.toISOString() : undefined,
-          endDate: endDate ? endDate : undefined,
+          startDate: dateMath.parse(start)?.toISOString(),
+          endDate: dateMath.parse(end)?.toISOString(),
         },
       });
     },
-    [dispatch, endDate, page, pageSize]
+    [dispatch, page, pageSize]
   );
 
-  const onChangeEndDate = useCallback(
-    (date) => {
+  const onRefreshChange = useCallback(
+    (evt) => {
       dispatch({
-        type: 'endpointDetailsActivityLogUpdatePaging',
+        type: 'userUpdatedActivityLogRefreshOptions',
         payload: {
-          disabled: false,
-          page,
-          pageSize,
-          startDate: startDate ? startDate : undefined,
-          endDate: date ? date.toISOString() : undefined,
+          autoRefreshOptions: { enabled: !evt.isPaused, duration: evt.refreshInterval },
         },
       });
     },
-    [dispatch, startDate, page, pageSize]
+    [dispatch]
   );
 
+  const onRefresh = useCallback(() => {
+    dispatch({
+      type: 'endpointDetailsActivityLogUpdatePaging',
+      payload: {
+        disabled: false,
+        page,
+        pageSize,
+        startDate,
+        endDate,
+      },
+    });
+  }, [dispatch, page, pageSize, startDate, endDate]);
+
+  const onTimeChange = useCallback(
+    ({ start: newStart, end: newEnd }) => {
+      const newRecentlyUsedDateRanges = [
+        { start: newStart, end: newEnd },
+        ...recentlyUsedDateRanges
+          .filter(
+            (recentlyUsedRange) =>
+              !(recentlyUsedRange.start === newStart && recentlyUsedRange.end === newEnd)
+          )
+          .slice(0, 9),
+      ];
+      dispatch({
+        type: 'userUpdatedActivityLogRecentlyUsedDateRanges',
+        payload: newRecentlyUsedDateRanges,
+      });
+
+      dispatchActionUpdateActivityLogPaging({ start: newStart, end: newEnd });
+    },
+    [dispatch, recentlyUsedDateRanges, dispatchActionUpdateActivityLogPaging]
+  );
+
+  const [quickRanges] = useUiSetting$<Range[]>(DEFAULT_TIMEPICKER_QUICK_RANGES);
+  const commonlyUsedRanges = !quickRanges.length
+    ? []
+    : quickRanges.map(({ from, to, display }) => ({
+        start: from,
+        end: to,
+        label: display,
+      }));
+
   return (
     <StickyFlexItem grow={false}>
-      <EuiFlexGroup justifyContent="flexEnd" responsive>
-        <DatePickerWrapper>
+      <EuiFlexGroup justifyContent="flexStart" responsive>
+        <DatePickerWrapper data-test-subj="activityLogSuperDatePicker">
           <EuiFlexItem>
-            <EuiDatePickerRange
-              fullWidth={true}
-              data-test-subj="activityLogDateRangePicker"
-              startDateControl={
-                <EuiDatePicker
-                  aria-label="Start date"
-                  endDate={endDate ? moment(endDate) : undefined}
-                  isInvalid={isInvalidDateRange}
-                  onChange={onChangeStartDate}
-                  placeholderText={i18.ACTIVITY_LOG.datePicker.startDate}
-                  selected={startDate ? moment(startDate) : undefined}
-                  showTimeSelect
-                  startDate={startDate ? moment(startDate) : undefined}
-                />
-              }
-              endDateControl={
-                <EuiDatePicker
-                  aria-label="End date"
-                  endDate={endDate ? moment(endDate) : undefined}
-                  isInvalid={isInvalidDateRange}
-                  onChange={onChangeEndDate}
-                  placeholderText={i18.ACTIVITY_LOG.datePicker.endDate}
-                  selected={endDate ? moment(endDate) : undefined}
-                  showTimeSelect
-                  startDate={startDate ? moment(startDate) : undefined}
-                />
-              }
+            <EuiSuperDatePicker
+              isLoading={activityLogLoading}
+              commonlyUsedRanges={commonlyUsedRanges}
+              end={dateMath.parse(endDate)?.toISOString()}
+              isPaused={!autoRefreshOptions.enabled}
+              onTimeChange={onTimeChange}
+              onRefreshChange={onRefreshChange}
+              refreshInterval={autoRefreshOptions.duration}
+              onRefresh={onRefresh}
+              recentlyUsedRanges={recentlyUsedDateRanges as EuiSuperDatePickerRecentRange[]}
+              start={dateMath.parse(startDate)?.toISOString()}
             />
           </EuiFlexItem>
         </DatePickerWrapper>
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_activity_log.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_activity_log.tsx
index 5172b59450e03..f0b6b5fbc8962 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_activity_log.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_activity_log.tsx
@@ -9,11 +9,13 @@ import React, { memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import styled from 'styled-components';
 
 import {
+  EuiCallOut,
   EuiText,
   EuiFlexGroup,
   EuiFlexItem,
   EuiLoadingContent,
   EuiEmptyPrompt,
+  EuiSpacer,
 } from '@elastic/eui';
 import { useDispatch } from 'react-redux';
 import { LogEntry } from './components/log_entry';
@@ -114,6 +116,17 @@ export const EndpointActivityLog = memo(
             <>
               <DateRangePicker />
               <EuiFlexItem grow={true}>
+                {!isPagingDisabled && activityLogLoaded && !activityLogData.length && (
+                  <>
+                    <EuiSpacer size="m" />
+                    <EuiCallOut
+                      data-test-subj="activityLogNoDataCallout"
+                      size="s"
+                      title={i18.ACTIVITY_LOG.LogEntry.dateRangeMessage}
+                      iconType="alert"
+                    />
+                  </>
+                )}
                 {activityLogLoaded &&
                   activityLogData.map((logEntry) => (
                     <LogEntry key={`${logEntry.item.id}`} logEntry={logEntry} />
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx
index 372bd4491d7d4..123a51e5a52bd 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx
@@ -22,6 +22,8 @@ export const dummyEndpointActivityLog = (
   data: {
     page: 1,
     pageSize: 50,
+    startDate: moment().subtract(5, 'day').fromNow().toString(),
+    endDate: moment().toString(),
     data: [
       {
         type: 'action',
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
index 996198568ad27..ea999334ee771 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx
@@ -10,6 +10,8 @@ import * as reactTestingLibrary from '@testing-library/react';
 import { EndpointList } from './index';
 import '../../../../common/mock/match_media';
 
+import { createUseUiSetting$Mock } from '../../../../../public/common/lib/kibana/kibana_react.mock';
+
 import {
   mockEndpointDetailsApiResult,
   mockEndpointResultList,
@@ -28,7 +30,7 @@ import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_da
 import { POLICY_STATUS_TO_HEALTH_COLOR, POLICY_STATUS_TO_TEXT } from './host_constants';
 import { mockPolicyResultList } from '../../policy/store/test_mock_utils';
 import { getEndpointDetailsPath } from '../../../common/routing';
-import { KibanaServices, useKibana, useToasts } from '../../../../common/lib/kibana';
+import { KibanaServices, useKibana, useToasts, useUiSetting$ } from '../../../../common/lib/kibana';
 import { hostIsolationHttpMocks } from '../../../../common/lib/endpoint_isolation/mocks';
 import {
   createFailedResourceState,
@@ -40,7 +42,11 @@ import {
 import { getCurrentIsolationRequestState } from '../store/selectors';
 import { licenseService } from '../../../../common/hooks/use_license';
 import { FleetActionGenerator } from '../../../../../common/endpoint/data_generators/fleet_action_generator';
-import { APP_PATH, MANAGEMENT_PATH } from '../../../../../common/constants';
+import {
+  APP_PATH,
+  MANAGEMENT_PATH,
+  DEFAULT_TIMEPICKER_QUICK_RANGES,
+} from '../../../../../common/constants';
 import { TransformStats, TRANSFORM_STATE } from '../types';
 import { metadataTransformPrefix } from '../../../../../common/endpoint/constants';
 
@@ -63,6 +69,59 @@ jest.mock('../../policy/store/services/ingest', () => {
     sendGetEndpointSecurityPackage: () => Promise.resolve({}),
   };
 });
+const mockUseUiSetting$ = useUiSetting$ as jest.Mock;
+const timepickerRanges = [
+  {
+    from: 'now/d',
+    to: 'now/d',
+    display: 'Today',
+  },
+  {
+    from: 'now/w',
+    to: 'now/w',
+    display: 'This week',
+  },
+  {
+    from: 'now-15m',
+    to: 'now',
+    display: 'Last 15 minutes',
+  },
+  {
+    from: 'now-30m',
+    to: 'now',
+    display: 'Last 30 minutes',
+  },
+  {
+    from: 'now-1h',
+    to: 'now',
+    display: 'Last 1 hour',
+  },
+  {
+    from: 'now-24h',
+    to: 'now',
+    display: 'Last 24 hours',
+  },
+  {
+    from: 'now-7d',
+    to: 'now',
+    display: 'Last 7 days',
+  },
+  {
+    from: 'now-30d',
+    to: 'now',
+    display: 'Last 30 days',
+  },
+  {
+    from: 'now-90d',
+    to: 'now',
+    display: 'Last 90 days',
+  },
+  {
+    from: 'now-1y',
+    to: 'now',
+    display: 'Last 1 year',
+  },
+];
 
 jest.mock('../../../../common/lib/kibana');
 jest.mock('../../../../common/hooks/use_license');
@@ -759,6 +818,14 @@ describe('when on the endpoint list page', () => {
           disconnect: jest.fn(),
         }));
 
+        mockUseUiSetting$.mockImplementation((key, defaultValue) => {
+          const useUiSetting$Mock = createUseUiSetting$Mock();
+
+          return key === DEFAULT_TIMEPICKER_QUICK_RANGES
+            ? [timepickerRanges, jest.fn()]
+            : useUiSetting$Mock(key, defaultValue);
+        });
+
         const fleetActionGenerator = new FleetActionGenerator('seed');
         const responseData = fleetActionGenerator.generateResponse({
           agent_id: agentId,
@@ -766,9 +833,12 @@ describe('when on the endpoint list page', () => {
         const actionData = fleetActionGenerator.generate({
           agents: [agentId],
         });
+
         getMockData = () => ({
           page: 1,
           pageSize: 50,
+          startDate: 'now-1d',
+          endDate: 'now',
           data: [
             {
               type: 'response',
@@ -838,7 +908,7 @@ describe('when on the endpoint list page', () => {
         expect(emptyState).not.toBe(null);
       });
 
-      it('should display empty state when no log data', async () => {
+      it('should not display empty state when no log data', async () => {
         const activityLogTab = await renderResult.findByTestId('activity_log');
         reactTestingLibrary.act(() => {
           reactTestingLibrary.fireEvent.click(activityLogTab);
@@ -848,36 +918,39 @@ describe('when on the endpoint list page', () => {
           dispatchEndpointDetailsActivityLogChanged('success', {
             page: 1,
             pageSize: 50,
+            startDate: 'now-1d',
+            endDate: 'now',
             data: [],
           });
         });
 
         const emptyState = await renderResult.queryByTestId('activityLogEmpty');
-        expect(emptyState).not.toBe(null);
+        expect(emptyState).toBe(null);
+
+        const superDatePicker = await renderResult.queryByTestId('activityLogSuperDatePicker');
+        expect(superDatePicker).not.toBe(null);
       });
 
-      it('should not display empty state with no log data while date range filter is active', async () => {
-        const activityLogTab = await renderResult.findByTestId('activity_log');
+      it('should display activity log when tab is loaded using the URL', async () => {
+        const userChangedUrlChecker = middlewareSpy.waitForAction('userChangedUrl');
         reactTestingLibrary.act(() => {
-          reactTestingLibrary.fireEvent.click(activityLogTab);
+          history.push(
+            `${MANAGEMENT_PATH}/endpoints?page_index=0&page_size=10&selected_endpoint=1&show=activity_log`
+          );
         });
+        const changedUrlAction = await userChangedUrlChecker;
+        expect(changedUrlAction.payload.search).toEqual(
+          '?page_index=0&page_size=10&selected_endpoint=1&show=activity_log'
+        );
         await middlewareSpy.waitForAction('endpointDetailsActivityLogChanged');
         reactTestingLibrary.act(() => {
-          dispatchEndpointDetailsActivityLogChanged('success', {
-            page: 1,
-            pageSize: 50,
-            startDate: new Date().toISOString(),
-            data: [],
-          });
+          dispatchEndpointDetailsActivityLogChanged('success', getMockData());
         });
-
-        const emptyState = await renderResult.queryByTestId('activityLogEmpty');
-        const dateRangePicker = await renderResult.queryByTestId('activityLogDateRangePicker');
-        expect(emptyState).toBe(null);
-        expect(dateRangePicker).not.toBe(null);
+        const logEntries = await renderResult.queryAllByTestId('timelineEntry');
+        expect(logEntries.length).toEqual(2);
       });
 
-      it('should display activity log when tab is loaded using the URL', async () => {
+      it('should display a callout message if no log data', async () => {
         const userChangedUrlChecker = middlewareSpy.waitForAction('userChangedUrl');
         reactTestingLibrary.act(() => {
           history.push(
@@ -890,10 +963,17 @@ describe('when on the endpoint list page', () => {
         );
         await middlewareSpy.waitForAction('endpointDetailsActivityLogChanged');
         reactTestingLibrary.act(() => {
-          dispatchEndpointDetailsActivityLogChanged('success', getMockData());
+          dispatchEndpointDetailsActivityLogChanged('success', {
+            page: 1,
+            pageSize: 50,
+            startDate: 'now-1d',
+            endDate: 'now',
+            data: [],
+          });
         });
-        const logEntries = await renderResult.queryAllByTestId('timelineEntry');
-        expect(logEntries.length).toEqual(2);
+
+        const activityLogCallout = await renderResult.findByTestId('activityLogNoDataCallout');
+        expect(activityLogCallout).not.toBeNull();
       });
     });
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/translations.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/translations.ts
index 57ad3e4808bd5..c8a29eed3fda7 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/translations.ts
@@ -15,20 +15,6 @@ export const ACTIVITY_LOG = {
   tabTitle: i18n.translate('xpack.securitySolution.endpointDetails.activityLog', {
     defaultMessage: 'Activity Log',
   }),
-  datePicker: {
-    startDate: i18n.translate(
-      'xpack.securitySolution.endpointDetails.activityLog.datePicker.startDate',
-      {
-        defaultMessage: 'Pick a start date',
-      }
-    ),
-    endDate: i18n.translate(
-      'xpack.securitySolution.endpointDetails.activityLog.datePicker.endDate',
-      {
-        defaultMessage: 'Pick an end date',
-      }
-    ),
-  },
   LogEntry: {
     endOfLog: i18n.translate(
       'xpack.securitySolution.endpointDetails.activityLog.logEntry.action.endOfLog',
@@ -36,6 +22,13 @@ export const ACTIVITY_LOG = {
         defaultMessage: 'Nothing more to show',
       }
     ),
+    dateRangeMessage: i18n.translate(
+      'xpack.securitySolution.endpointDetails.activityLog.logEntry.dateRangeMessage.title',
+      {
+        defaultMessage:
+          'Nothing to show for selected date range, please select another and try again.',
+      }
+    ),
     emptyState: {
       title: i18n.translate(
         'xpack.securitySolution.endpointDetails.activityLog.logEntry.emptyState.title',
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts
index 83f38bc904576..4bd63c83169e5 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.test.ts
@@ -48,19 +48,13 @@ describe('Action Log API', () => {
       }).not.toThrow();
     });
 
-    it('should work without query params', () => {
+    it('should not work when no params while requesting with query params', () => {
       expect(() => {
         EndpointActionLogRequestSchema.query.validate({});
-      }).not.toThrow();
-    });
-
-    it('should work with query params', () => {
-      expect(() => {
-        EndpointActionLogRequestSchema.query.validate({ page: 10, page_size: 100 });
-      }).not.toThrow();
+      }).toThrow();
     });
 
-    it('should work with all query params', () => {
+    it('should work with all required query params', () => {
       expect(() => {
         EndpointActionLogRequestSchema.query.validate({
           page: 10,
@@ -71,24 +65,24 @@ describe('Action Log API', () => {
       }).not.toThrow();
     });
 
-    it('should work with just startDate', () => {
+    it('should not work without endDate', () => {
       expect(() => {
         EndpointActionLogRequestSchema.query.validate({
           page: 1,
           page_size: 100,
           start_date: new Date(new Date().setDate(new Date().getDate() - 1)).toISOString(), // yesterday
         });
-      }).not.toThrow();
+      }).toThrow();
     });
 
-    it('should work with just endDate', () => {
+    it('should not work without startDate', () => {
       expect(() => {
         EndpointActionLogRequestSchema.query.validate({
           page: 1,
           page_size: 100,
           end_date: new Date().toISOString(), // today
         });
-      }).not.toThrow();
+      }).toThrow();
     });
 
     it('should not work without allowed page and page_size params', () => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
index 80fb1c5d9c7b0..a04a6eea5ab65 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions.ts
@@ -31,8 +31,8 @@ export const getAuditLogResponse = async ({
   elasticAgentId: string;
   page: number;
   pageSize: number;
-  startDate?: string;
-  endDate?: string;
+  startDate: string;
+  endDate: string;
   context: SecuritySolutionRequestHandlerContext;
   logger: Logger;
 }): Promise<ActivityLog> => {
@@ -71,8 +71,8 @@ const getActivityLog = async ({
   elasticAgentId: string;
   size: number;
   from: number;
-  startDate?: string;
-  endDate?: string;
+  startDate: string;
+  endDate: string;
   logger: Logger;
 }) => {
   const options = {
@@ -84,13 +84,10 @@ const getActivityLog = async ({
 
   let actionsResult;
   let responsesResult;
-  const dateFilters = [];
-  if (startDate) {
-    dateFilters.push({ range: { '@timestamp': { gte: startDate } } });
-  }
-  if (endDate) {
-    dateFilters.push({ range: { '@timestamp': { lte: endDate } } });
-  }
+  const dateFilters = [
+    { range: { '@timestamp': { gte: startDate } } },
+    { range: { '@timestamp': { lte: endDate } } },
+  ];
 
   try {
     // fetch actions with matching agent_id
diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
index 38e74e15f7ae7..5910de62271e9 100644
--- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
+++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -4079,6 +4079,19 @@
             }
           }
         },
+        "PNGV2": {
+          "properties": {
+            "available": {
+              "type": "boolean"
+            },
+            "total": {
+              "type": "long"
+            },
+            "deprecated": {
+              "type": "long"
+            }
+          }
+        },
         "printable_pdf": {
           "properties": {
             "available": {
@@ -4115,6 +4128,42 @@
             }
           }
         },
+        "printable_pdf_v2": {
+          "properties": {
+            "available": {
+              "type": "boolean"
+            },
+            "total": {
+              "type": "long"
+            },
+            "deprecated": {
+              "type": "long"
+            },
+            "app": {
+              "properties": {
+                "canvas workpad": {
+                  "type": "long"
+                },
+                "dashboard": {
+                  "type": "long"
+                },
+                "visualization": {
+                  "type": "long"
+                }
+              }
+            },
+            "layout": {
+              "properties": {
+                "print": {
+                  "type": "long"
+                },
+                "preserve_layout": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
         "_all": {
           "type": "long"
         },
@@ -4180,6 +4229,19 @@
                     }
                   }
                 },
+                "PNGV2": {
+                  "properties": {
+                    "canvas workpad": {
+                      "type": "long"
+                    },
+                    "dashboard": {
+                      "type": "long"
+                    },
+                    "visualization": {
+                      "type": "long"
+                    }
+                  }
+                },
                 "printable_pdf": {
                   "properties": {
                     "canvas workpad": {
@@ -4192,6 +4254,19 @@
                       "type": "long"
                     }
                   }
+                },
+                "printable_pdf_v2": {
+                  "properties": {
+                    "canvas workpad": {
+                      "type": "long"
+                    },
+                    "dashboard": {
+                      "type": "long"
+                    },
+                    "visualization": {
+                      "type": "long"
+                    }
+                  }
                 }
               }
             },
@@ -4236,6 +4311,19 @@
                     }
                   }
                 },
+                "PNGV2": {
+                  "properties": {
+                    "canvas workpad": {
+                      "type": "long"
+                    },
+                    "dashboard": {
+                      "type": "long"
+                    },
+                    "visualization": {
+                      "type": "long"
+                    }
+                  }
+                },
                 "printable_pdf": {
                   "properties": {
                     "canvas workpad": {
@@ -4248,6 +4336,19 @@
                       "type": "long"
                     }
                   }
+                },
+                "printable_pdf_v2": {
+                  "properties": {
+                    "canvas workpad": {
+                      "type": "long"
+                    },
+                    "dashboard": {
+                      "type": "long"
+                    },
+                    "visualization": {
+                      "type": "long"
+                    }
+                  }
                 }
               }
             },
@@ -4292,6 +4393,19 @@
                     }
                   }
                 },
+                "PNGV2": {
+                  "properties": {
+                    "canvas workpad": {
+                      "type": "long"
+                    },
+                    "dashboard": {
+                      "type": "long"
+                    },
+                    "visualization": {
+                      "type": "long"
+                    }
+                  }
+                },
                 "printable_pdf": {
                   "properties": {
                     "canvas workpad": {
@@ -4304,6 +4418,19 @@
                       "type": "long"
                     }
                   }
+                },
+                "printable_pdf_v2": {
+                  "properties": {
+                    "canvas workpad": {
+                      "type": "long"
+                    },
+                    "dashboard": {
+                      "type": "long"
+                    },
+                    "visualization": {
+                      "type": "long"
+                    }
+                  }
                 }
               }
             },
@@ -4348,6 +4475,19 @@
                     }
                   }
                 },
+                "PNGV2": {
+                  "properties": {
+                    "canvas workpad": {
+                      "type": "long"
+                    },
+                    "dashboard": {
+                      "type": "long"
+                    },
+                    "visualization": {
+                      "type": "long"
+                    }
+                  }
+                },
                 "printable_pdf": {
                   "properties": {
                     "canvas workpad": {
@@ -4360,6 +4500,19 @@
                       "type": "long"
                     }
                   }
+                },
+                "printable_pdf_v2": {
+                  "properties": {
+                    "canvas workpad": {
+                      "type": "long"
+                    },
+                    "dashboard": {
+                      "type": "long"
+                    },
+                    "visualization": {
+                      "type": "long"
+                    }
+                  }
                 }
               }
             },
@@ -4404,6 +4557,19 @@
                     }
                   }
                 },
+                "PNGV2": {
+                  "properties": {
+                    "canvas workpad": {
+                      "type": "long"
+                    },
+                    "dashboard": {
+                      "type": "long"
+                    },
+                    "visualization": {
+                      "type": "long"
+                    }
+                  }
+                },
                 "printable_pdf": {
                   "properties": {
                     "canvas workpad": {
@@ -4416,6 +4582,19 @@
                       "type": "long"
                     }
                   }
+                },
+                "printable_pdf_v2": {
+                  "properties": {
+                    "canvas workpad": {
+                      "type": "long"
+                    },
+                    "dashboard": {
+                      "type": "long"
+                    },
+                    "visualization": {
+                      "type": "long"
+                    }
+                  }
                 }
               }
             }
@@ -4471,6 +4650,19 @@
                 }
               }
             },
+            "PNGV2": {
+              "properties": {
+                "available": {
+                  "type": "boolean"
+                },
+                "total": {
+                  "type": "long"
+                },
+                "deprecated": {
+                  "type": "long"
+                }
+              }
+            },
             "printable_pdf": {
               "properties": {
                 "available": {
@@ -4507,6 +4699,42 @@
                 }
               }
             },
+            "printable_pdf_v2": {
+              "properties": {
+                "available": {
+                  "type": "boolean"
+                },
+                "total": {
+                  "type": "long"
+                },
+                "deprecated": {
+                  "type": "long"
+                },
+                "app": {
+                  "properties": {
+                    "canvas workpad": {
+                      "type": "long"
+                    },
+                    "dashboard": {
+                      "type": "long"
+                    },
+                    "visualization": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "layout": {
+                  "properties": {
+                    "print": {
+                      "type": "long"
+                    },
+                    "preserve_layout": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "_all": {
               "type": "long"
             },
@@ -4572,6 +4800,19 @@
                         }
                       }
                     },
+                    "PNGV2": {
+                      "properties": {
+                        "canvas workpad": {
+                          "type": "long"
+                        },
+                        "dashboard": {
+                          "type": "long"
+                        },
+                        "visualization": {
+                          "type": "long"
+                        }
+                      }
+                    },
                     "printable_pdf": {
                       "properties": {
                         "canvas workpad": {
@@ -4584,6 +4825,19 @@
                           "type": "long"
                         }
                       }
+                    },
+                    "printable_pdf_v2": {
+                      "properties": {
+                        "canvas workpad": {
+                          "type": "long"
+                        },
+                        "dashboard": {
+                          "type": "long"
+                        },
+                        "visualization": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
@@ -4628,6 +4882,19 @@
                         }
                       }
                     },
+                    "PNGV2": {
+                      "properties": {
+                        "canvas workpad": {
+                          "type": "long"
+                        },
+                        "dashboard": {
+                          "type": "long"
+                        },
+                        "visualization": {
+                          "type": "long"
+                        }
+                      }
+                    },
                     "printable_pdf": {
                       "properties": {
                         "canvas workpad": {
@@ -4640,6 +4907,19 @@
                           "type": "long"
                         }
                       }
+                    },
+                    "printable_pdf_v2": {
+                      "properties": {
+                        "canvas workpad": {
+                          "type": "long"
+                        },
+                        "dashboard": {
+                          "type": "long"
+                        },
+                        "visualization": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
@@ -4684,6 +4964,19 @@
                         }
                       }
                     },
+                    "PNGV2": {
+                      "properties": {
+                        "canvas workpad": {
+                          "type": "long"
+                        },
+                        "dashboard": {
+                          "type": "long"
+                        },
+                        "visualization": {
+                          "type": "long"
+                        }
+                      }
+                    },
                     "printable_pdf": {
                       "properties": {
                         "canvas workpad": {
@@ -4696,6 +4989,19 @@
                           "type": "long"
                         }
                       }
+                    },
+                    "printable_pdf_v2": {
+                      "properties": {
+                        "canvas workpad": {
+                          "type": "long"
+                        },
+                        "dashboard": {
+                          "type": "long"
+                        },
+                        "visualization": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
@@ -4740,6 +5046,19 @@
                         }
                       }
                     },
+                    "PNGV2": {
+                      "properties": {
+                        "canvas workpad": {
+                          "type": "long"
+                        },
+                        "dashboard": {
+                          "type": "long"
+                        },
+                        "visualization": {
+                          "type": "long"
+                        }
+                      }
+                    },
                     "printable_pdf": {
                       "properties": {
                         "canvas workpad": {
@@ -4752,6 +5071,19 @@
                           "type": "long"
                         }
                       }
+                    },
+                    "printable_pdf_v2": {
+                      "properties": {
+                        "canvas workpad": {
+                          "type": "long"
+                        },
+                        "dashboard": {
+                          "type": "long"
+                        },
+                        "visualization": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
@@ -4796,6 +5128,19 @@
                         }
                       }
                     },
+                    "PNGV2": {
+                      "properties": {
+                        "canvas workpad": {
+                          "type": "long"
+                        },
+                        "dashboard": {
+                          "type": "long"
+                        },
+                        "visualization": {
+                          "type": "long"
+                        }
+                      }
+                    },
                     "printable_pdf": {
                       "properties": {
                         "canvas workpad": {
@@ -4808,6 +5153,19 @@
                           "type": "long"
                         }
                       }
+                    },
+                    "printable_pdf_v2": {
+                      "properties": {
+                        "canvas workpad": {
+                          "type": "long"
+                        },
+                        "dashboard": {
+                          "type": "long"
+                        },
+                        "visualization": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 }
diff --git a/x-pack/plugins/timelines/public/assets/illustration_product_no_results_magnifying_glass.svg b/x-pack/plugins/timelines/public/assets/illustration_product_no_results_magnifying_glass.svg
new file mode 100644
index 0000000000000..b9a0df1630b20
--- /dev/null
+++ b/x-pack/plugins/timelines/public/assets/illustration_product_no_results_magnifying_glass.svg
@@ -0,0 +1 @@
+<svg fill="none" height="148" viewBox="0 0 200 148" width="200" xmlns="http://www.w3.org/2000/svg"><g fill="#e6ebf2"><path d="m66.493 121.253c.1447-.064.2618-.178.3302-.321.0685-.143.0837-.305.0431-.459-.1139-.178-.2841-.312-.4834-.382-.1994-.07-.4164-.072-.6166-.004-.1547.096-.2648.25-.3061.428-.0412.177-.0103.364.0861.518.0963.155.2502.265.4278.307.1775.041.3641.01.5189-.087z"/><path d="m46.666 68.1202c.12-.1134.3733-.44.2866-.6-.0866-.16-.5133-.0467-.6666 0-.1534.0466-.22.2666-.0734.4533.1467.1867.3.2933.4534.1467z"/><path d="m45.4062 81.1265c-.057-.0967-.1499-.1671-.2585-.1958s-.2241-.0134-.3215.0425c-.2467.1067-.46.2533-.46.5733 0 .9467.1733 1.16 1.1 1.3334h.0667c-.1215-.0187-.2452-.0187-.3667 0-.0457.0077-.0888.0264-.1256.0544-.0369.0281-.0664.0646-.0861.1065-.0197.042-.0289.0881-.0268.1343.002.0463.0152.0914.0385.1314.0124.0499.0359.0964.0688.1359s.0743.071.1212.0922c.0468.0212.0979.0314.1493.03.0513-.0013.1017-.0144.1474-.0381.12-.095.214-.2188.2733-.36.053.0902.1392.1561.2401.1835s.2086.0142.2999-.0368c.0652-.0378.1204-.0905.1611-.1539.0406-.0634.0656-.1356.0728-.2106.0071-.0749-.0037-.1506-.0316-.2205-.0279-.07-.0721-.1322-.129-.1817-.2266-.22-.1466-.4266-.12-.6666.7067.0466 1-.2667.88-.8667-.0147-.0587-.0325-.1165-.0533-.1733-.1467-.3934-.38-.4867-.7533-.3-.3734.1866-.6.3266-.4867.8733-.2-.1333-.3333-.1867-.4-.2867z"/><path d="m45.4194 80.0002c.091-.047.1596-.1281.1908-.2256.0313-.0975.0226-.2034-.0241-.2944-.0318-.1072-.0995-.2002-.1918-.2633-.0922-.0632-.2034-.0926-.3149-.0834-.0751.011-.1473.0374-.2118.0776-.0645.0401-.1201.0931-.1633.1556-.0431.0626-.0729.1333-.0875.2079s-.0137.1514.0026.2256c.0391.0659.0909.1235.1524.1693s.1315.079.2059.0976.1517.0223.2276.0108c.0758-.0115.1486-.0379.2141-.0777z"/><path d="m104.966 134.133c-.085.15-.112.327-.075.495.037.169.135.318.275.419.147.117.334.172.521.151s.358-.115.476-.262c.117-.146.172-.334.151-.521-.02-.187-.115-.358-.261-.475-.181-.074-.379-.095-.572-.061-.192.034-.371.123-.515.254z"/><path d="m47.0795 69.0398c-.0635.0231-.121.0603-.1681.1087-.0471.0485-.0826.1071-.1037.1713-.0212.0641-.0276.1323-.0186.1993s.0331.1311.0704.1874c.0657.1.165.1732.28.2062s.238.0237.3467-.0262c.1008-.0745.1726-.1818.203-.3034.0305-.1216.0176-.2501-.0364-.3633-.0525-.0995-.1422-.1743-.2496-.208-.1073-.0337-.2237-.0237-.3237.028z"/><path d="m46.9868 64.0001c.12-.0866.3466-.4.28-.5067-.0667-.1066-.4267-.1266-.58-.1-.1534.0267-.2467.26-.14.4867.0126.0441.0363.0842.069.1164.0326.0322.0729.0555.1172.0675.0442.0121.0908.0125.1352.0013.0445-.0111.0853-.0336.1186-.0652z"/><path d="m51.4726 108c-.1429.128-.233.305-.2527.496s.0323.382.146.537c.1749.138.3948.205.6168.189.2219-.016.4299-.114.5832-.276.064-.057.1152-.126.1503-.205.0351-.078.0532-.162.0532-.248s-.0181-.17-.0532-.248c-.0351-.079-.0863-.148-.1503-.205-.0659-.08-.1479-.145-.2406-.19-.0926-.046-.1939-.071-.2971-.075s-.2061.014-.3018.053c-.0958.039-.1823.097-.2538.172z"/><path d="m53.0133 100.154c.0244-.011.0457-.028.0624-.048.0166-.021.028-.046.0332-.072s.0041-.0528-.0032-.0784c-.0074-.0256-.0208-.0491-.039-.0684-.0096-.0255-.0255-.0482-.0462-.0658-.0207-.0177-.0456-.0297-.0723-.0351-.0267-.0053-.0544-.0038-.0803.0045-.0259.0084-.0493.0232-.0679.043-.0251.0112-.047.0284-.0638.0501-.0168.0216-.028.0471-.0327.0741-.0046.0271-.0024.055.0062.081.0087.026.0237.049.0436.068.0118.023.0286.042.0491.058.0206.015.0443.025.0694.029.0252.005.051.004.0755-.003s.0471-.02.066-.037z"/><path d="m49.7333 91.7797c.0712.1903.1605.3733.2667.5466-.0497.0839-.0942.1707-.1334.26-.0723.1653-.0945.3483-.0637.5261.0309.1778.1133.3426.2371.4739.1261.0971.2731.1634.4294.1935s.3174.0232.4706-.0201c-.0345.1648-.0345.3351 0 .5l.3133.1466c-.4067-1.12-.7667-2.2666-1.1067-3.42-.0638.0231-.1243.0545-.18.0934-.1104.0748-.1931.1839-.2353.3104-.0422.1266-.0415.2635.002.3896z"/><path d="m52.5402 102.127c.0525.017.1095.015.1608-.006.0513-.02.0935-.059.1192-.108.0172-.061.0156-.126-.0046-.187s-.0581-.114-.1087-.153c-.0934-.06-.24.06-.2867.154-.0467.093.0067.266.12.3z"/><path d="m52.7327 106.413c.0843-.096.1392-.214.1581-.341.0189-.126.001-.256-.0515-.372-.0264-.041-.0614-.077-.1025-.104-.0412-.026-.0876-.044-.1361-.052-.0485-.007-.0981-.005-.1455.009-.0473.013-.0914.036-.1292.067-.3133.213-.4533.447-.36.613.1.096.2238.163.3587.195s.2758.027.408-.015z"/><path d="m53.0528 104.127c.0915-.145.1338-.315.1206-.486-.0132-.17-.0813-.332-.1939-.461-.1356-.063-.2859-.087-.4342-.069s-.2888.076-.4058.169c-.0758.095-.117.212-.117.333 0 .122.0412.239.117.334.3533.32.7133.393.9133.18z"/><path d="m44.4995 73.3736c-.1873.0998-.331.2653-.4036.4647-.0726.1993-.069.4185.0102.6153.0828.1942.233.3518.423.4437s.4068.1119.6104.0563c.2009-.1305.3546-.3221.4386-.5464.084-.2244.0938-.4698.028-.7002-.1121-.1809-.2865-.3146-.4903-.3759-.2038-.0614-.4229-.0463-.6163.0425z"/><path d="m54.3862 101.46c-.1734-.326-.34-.666-.5067-.986-.2533.16-.3533.393-.2533.593.0915.116.2066.211.3376.278.1311.068.275.107.4224.115z"/><path d="m55.1802 106.173c-.12.26-.22.527.0867.667.3066.14.4733-.034.6-.274-.0117-.075-.0402-.146-.0832-.209-.0431-.062-.0997-.115-.1656-.152-.066-.038-.1396-.061-.2154-.066s-.1518.006-.2225.034z"/><path d="m51.0395 95.3332c-.12.0466-.1667.12-.1133.2466.0533.1267.1266.16.2533.1134.0245-.0065.0472-.0182.0667-.0344.0194-.0161.0351-.0364.0459-.0592.0108-.0229.0164-.0478.0166-.0731.0001-.0253-.0053-.0504-.0159-.0733-.0466-.12-.12-.1734-.2533-.12z"/><path d="m55.1867 108.2c-.0344.037-.0608.08-.0772.128-.0165.048-.0227.098-.0183.149.0044.05.0193.099.0438.143s.058.083.0984.113c.0419.047.0932.085.1507.11.0574.026.1197.039.1826.039.063 0 .1252-.013.1826-.039.0575-.025.1088-.063.1507-.11.038-.04.0672-.088.0859-.14s.0264-.107.0226-.162c-.0037-.055-.0189-.109-.0444-.158-.0256-.049-.061-.092-.1041-.127-.047-.042-.1021-.074-.162-.094-.0598-.02-.1231-.028-.186-.023-.063.005-.1243.023-.1802.052s-.1053.07-.1451.119z"/><path d="m55.6861 110.907c.0895.086.209.135.3333.135.1244 0 .2439-.049.3334-.135.0759-.082.1181-.189.1181-.3s-.0422-.219-.1181-.3c-.0325-.045-.0742-.083-.1225-.111-.0482-.028-.1019-.046-.1573-.051-.0555-.006-.1116 0-.1645.018-.0529.017-.1014.046-.1424.084-.0523.035-.0963.081-.1292.135s-.0539.114-.0614.177c-.0076.062-.0017.126.0174.186s.0509.115.0932.162z"/><path d="m54.3328 104.666c-.0296.04-.0501.086-.0602.134-.01.049-.0093.099.0022.148.0114.048.0333.093.064.132.0308.039.0697.071.114.093.3134.213.5867.253.6667.107.0513-.128.0672-.267.0461-.404-.0211-.136-.0785-.263-.1661-.37-.1152-.036-.2381-.04-.3555-.012s-.225.088-.3112.172z"/><path d="m37.2201 85.493c-.16-.3-.3533-.2934-.5133-.2067s-.3.26-.16.4333c.14.1734.34.22.4466.1667.1067-.0533.1734-.2867.2267-.3933z"/><path d="m38.3067 92.5403c-.133.0676-.2395.178-.3023.3134-.0629.1354-.0785.2879-.0443.4332.0751.1437.1955.2588.3424.3274.147.0687.3124.0872.4709.0526.26-.1067.3333-.5267.16-.9066-.0624-.104-.1592-.183-.2736-.2231-.1145-.0402-.2394-.0391-.3531.0031z"/><path d="m37.9193 89.1732c-.2733-.1066-.5133-.2733-.7467 0-.0713.0745-.1111.1736-.1111.2767s.0398.2022.1111.2767c.0509.0575.1135.1033.1837.1344.0702.031.1463.0466.223.0456.3333-.0867.38-.3667.34-.7334z"/><path d="m44.9994 100.606c-.26 0-.48.56-.3.794.18.233.6.293.74.106.14-.186-.1733-.84-.44-.9z"/><path d="m43.2135 95.5601-.2066.22c-.1273-.1332-.2631-.258-.4067-.3734-.0407-.0489-.0916-.0883-.1492-.1153-.0576-.0271-.1205-.0411-.1841-.0411-.0637 0-.1265.014-.1842.0411-.0576.027-.1085.0664-.1492.1153-.1093.0939-.1852.2206-.2165.3612-.0312.1406-.0161.2875.0432.4188.0516.1288.1462.2357.2678.3026.1215.0668.2625.0895.3989.0641.2014-.0187.4003-.059.5933-.12.0669.0714.1406.1361.22.1933.1426.1112.3151.1775.4955.1906s.3606-.0277.5178-.1172c.1411-.1137.2508-.2616.3185-.4296.0677-.1681.0912-.3507.0682-.5304-.0192-.1372-.0909-.2615-.2-.3467-.0891-.0754-.1931-.1312-.3051-.1638-.112-.0327-.2297-.0414-.3453-.0257-.1157.0157-.2267.0555-.326.1169-.0993.0613-.1845.1429-.2503.2393z"/><path d="m46.1728 105.334c-.0372.033-.0669.075-.0872.121-.0204.045-.0309.095-.0309.145 0 .051.0105.1.0309.146.0203.046.05.087.0872.121.0288.035.0643.063.1043.083.0401.021.0838.033.1286.036.0449.003.0899-.003.1323-.018.0425-.014.0816-.037.1149-.068.0421-.025.0784-.059.1065-.1.0282-.04.0476-.086.057-.134.0094-.049.0086-.098-.0023-.146-.011-.048-.0318-.094-.0613-.133-.0336-.043-.0756-.079-.1235-.105s-.1006-.042-.1549-.047c-.0544-.005-.1091.001-.161.018-.0518.017-.0997.045-.1406.081z"/><path d="m40.3331 86.1863c0-.3533-.2133-.4933-.5667-.5-.1933-.8267-.6666-.9267-1.3333-.3133-.0575-.014-.1134-.0342-.1667-.06-.0867-.0521-.19-.0693-.289-.0483-.0989.021-.1862.0788-.2443.1616-.0652.0637-.1086.1462-.1242.236s-.0024.1821.0375.264c.1534.4667.36.5667.82.38l1.04-.4c.2867.62.3667.64.8267.28z"/><path d="m41.3329 88.8003c-.0319-.115-.0894-.2211-.1683-.3105s-.1771-.1597-.2871-.2056c-.1101-.0459-.2291-.0661-.3481-.0593-.1191.0069-.235.0408-.339.099-.104.0583-.1935.1394-.2615.2373-.0681.0979-.113.21-.1314.3278s-.0098.2383.0252.3522c.035.114.0955.2185.1768.3057.1421.1708.3439.281.5643.3083.2205.0272.443-.0306.6224-.1616.0713-.0465.1322-.1074.1787-.1787.0465-.0714.0777-.1516.0914-.2357.0138-.084.01-.17-.0113-.2525-.0212-.0824-.0594-.1596-.1121-.2264z"/><path d="m41.9465 92.0001c-.0958-.1538-.2409-.2705-.4117-.331-.1707-.0606-.357-.0614-.5283-.0023-.1425.0952-.2468.2378-.2944.4025-.0475.1647-.0354.3409.0344.4975.1467.3067.4267.3667.82.1733.2667-.1333.4734-.5333.38-.74z"/><path d="m42.8393 97.9398c-.0974-.0154-.1971.0034-.2822.0533-.0851.0498-.1503.1276-.1845.22-.0116.0685-.0045.1389.0205.2037s.067.1216.1215.1646c.0546.043.1197.0705.1886.0796.0688.0091.1389-.0005.2027-.0279.0581-.0406.1043-.0958.134-.1602.0297-.0643.0418-.1354.035-.2059s-.0322-.138-.0736-.1955-.0973-.1029-.162-.1317z"/><path d="m44.3393 66.8467c.1-.0467.0933-.3.0533-.3667s-.1866-.1667-.2866-.1133c-.0485.0311-.0853.0774-.1046.1317-.0194.0543-.0201.1135-.0021.1683.0467.0733.2467.2333.34.18z"/><path d="m43.0463 75.7404c.1066.1067.3933.3534.54.26.1466-.0933.04-.4866 0-.6-.04-.1133-.2867-.0866-.4067-.04-.0426.0033-.0833.0189-.1171.0449s-.0594.0613-.0735.1016c-.0142.0403-.0163.0838-.0061.1253s.0322.0791.0634.1082z"/><path d="m42.7535 71.9601c.1419-.1152.2376-.2776.2694-.4576.0319-.18-.0022-.3655-.096-.5223-.1135-.1308-.2706-.2158-.4421-.2392-.1715-.0235-.3456.0162-.49.1116-.1444.0955-.2492.2402-.2948.4071-.0456.167-.0289.3449.0469.5004.1071.1599.2732.2707.462.3082.1887.0375.3845-.0014.5446-.1082z"/><path d="m41.2198 84.8734c-.2267.1133-.3067.3-.1467.48s.3133.46.56.3267c.2467-.1334.1133-.4867.0867-.6667-.0267-.18-.2934-.2467-.5-.14z"/><path d="m40.4998 81.8067c-.1534.1298-.2604.3061-.3049.5021s-.0241.4012.0582.5845c.0623.0916.1427.1694.2363.2286.0936.0591.1984.0984.3079.1152.1094.0169.2212.0111.3283-.0171s.2072-.0781.2942-.1467c.0867-.0389.1641-.0959.227-.1672s.1098-.1553.1376-.2462.0358-.1867.0235-.281c-.0123-.0942-.0446-.1848-.0948-.2656-.1241-.1972-.3193-.3391-.5453-.3962-.2259-.0571-.4651-.025-.668.0896z"/><path d="m45.086 72.0931c.1475-.0869.2614-.2211.3231-.3808.0617-.1598.0677-.3356.0169-.4992-.0591-.118-.1608-.2092-.2846-.255s-.2604-.0428-.3821.0084c-.1378.0846-.2402.2165-.2881.371-.0478.1546-.0378.3212.0281.469.0179.0585.0477.1128.0874.1594.0398.0465.0887.0844.1437.1113s.115.0422.1761.0449c.0612.0028.1223-.0071.1795-.029z"/><path d="m45.5861 69.7262c.0263-.021.0441-.0507.0502-.0838.0061-.033.0001-.0672-.0168-.0962 0-.04-.14-.0466-.1667 0-.0136.0088-.0253.0201-.0345.0334s-.0156.0282-.0191.044c-.0034.0158-.0036.0321-.0007.048s.0089.0311.0176.0446c.0088.0136.0201.0253.0334.0345s.0282.0157.044.0191.0321.0036.048.0007.0311-.0089.0446-.0176z"/><path d="m43.7065 77.4263c.1036.1215.2474.2019.4052.2263.1579.0245.3192-.0085.4548-.093.3866-.22.5-.4667.34-.7667-.0917-.1545-.2343-.2724-.4034-.3332s-.3542-.0609-.5233-.0001c-.1428.1109-.2463.2645-.2955.4384-.0492.174-.0414.3591.0222.5283z"/><path d="m40.7993 74.7869c.12-.1133.3867-.4467.2933-.5867-.0933-.14-.4933-.0866-.6666-.0466-.1734.04-.2134.3466-.0934.52.12.1733.3334.2599.4667.1133z"/><path d="m38.3535 72.9266c0 .04.18.1334.22.1067s.2467-.14.2-.2867c-.0466-.1467-.2667-.12-.3-.0867-.0722.0706-.1151.1659-.12.2667z"/><path d="m38.5999 76.4801c.046.1061.1322.1895.2398.2321.1075.0425.2275.0405.3336-.0055.1061-.0459.1895-.1322.2321-.2397.0425-.1075.0405-.2275-.0055-.3336-.0669-.0996-.1633-.1756-.2757-.2175-.1125-.0418-.2352-.0474-.3509-.0158-.0953.0583-.1657.1498-.1977.2568s-.0233.2221.0243.3232z"/><path d="m40.9266 65.8929c.0734-.04.0734-.2067.0534-.3s-.1734-.1933-.2867-.1333-.0533.2733 0 .36c.0288.032.0656.0557.1066.0686.0411.0129.0849.0145.1267.0047z"/><path d="m37.9998 71.1003c.1113.0157.2246-.0095.3189-.0707.0943-.0613.1634-.1545.1944-.2626.0428-.0806.052-.1747.0258-.2621-.0262-.0873-.0858-.1608-.1658-.2046-.2933-.1933-.52-.0466-.7667.16.06.3.0467.6067.3934.64z"/><path d="m40.7593 79.3996c.1105-.1034.1845-.2398.211-.3889.0264-.149.0038-.3026-.0644-.4378-.1309-.0746-.2832-.1027-.4321-.0797s-.2856.0957-.3879.2064c-.0445.0933-.0591.1981-.0416.3001.0175.1019.0661.1958.1393.269.0731.0731.1671.1217.269.1392s.2067.0029.3-.0416z"/><path d="m38.3734 80.6665c.2867-.16.3667-.38.2333-.6666-.0815-.1728-.2236-.3097-.3993-.3846-.1758-.075-.3729-.0828-.554-.0221-.1239.1051-.2052.2519-.2285.4127-.0234.1608.0129.3246.1018.4606.0878.1365.2251.2336.383.2709s.3241.0119.4637-.0709z"/><path d="m45.6061 107.934c-.1334 0-.2867.266-.4134.433-.0197.017-.0355.038-.0463.061-.0109.024-.0165.05-.0165.076s.0056.051.0165.075c.0108.023.0266.044.0463.061.107.058.2298.08.3501.062s.2314-.075.3166-.162c.0333-.055.0531-.116.0579-.18s-.0055-.128-.0302-.188c-.0247-.059-.0631-.111-.1119-.153-.0488-.041-.1068-.071-.1691-.085z"/><path d="m79.2334 128.127c-.1266-.254-.4666-.32-.8466-.154-.28.134-.4867.507-.3934.72.0874.159.2232.285.3876.361.1644.075.3486.096.5258.059.0426-.017.083-.039.12-.066-.0331.126-.0331.26 0 .386.1.329.3093.614.5933.807.1003.077.1766.181.22.3.0114.098.0472.191.104.271s.1328.145.2211.188c.0882.043.1859.063.284.059.0981-.005.1935-.034.2776-.085-.0065.058.0052.116.0333.167.0794.095.1901.159.3124.18.1222.021.2479-.003.3543-.067.1279-.049.2319-.146.2902-.27.0584-.124.0666-.266.0231-.396-.0291-.053-.0686-.1-.1162-.138-.0475-.038-.1021-.065-.1605-.081-.0584-.017-.1195-.021-.1796-.013s-.1181.028-.1704.058c-.0191-.153-.0789-.298-.1733-.42-.1493-.158-.2306-.369-.2267-.586 0-.36-.2533-.58-.5-.78-.1357-.077-.2902-.113-.4457-.106s-.306.057-.4343.146l-.0666.06c.0687-.197.0567-.413-.0334-.6z"/><path d="m89.2063 134.106c.1.2.4133.14.5533.114.0453-.004.0891-.018.1281-.041.0391-.023.0724-.055.0974-.093s.0412-.081.0471-.126c.006-.045.0017-.09-.0126-.134-.06-.213-.34-.4-.5-.28s-.4133.36-.3133.56z"/><path d="m93.4526 132.774c-.0796.033-.1511.084-.2098.147-.0586.064-.1029.139-.1301.221-.0271.082-.0364.169-.0272.255.0091.086.0366.169.0804.243.1734.354.5134.52.7734.374.1715-.108.3012-.271.3679-.463.0666-.191.0662-.4-.0013-.591-.0959-.128-.235-.218-.3918-.252-.1567-.035-.3206-.011-.4615.066z"/><path d="m93.6128 135.74c-.12.193.0933.427.1933.533.0274.036.0627.065.1032.085.0404.02.085.031.1301.031.0452 0 .0898-.011.1302-.031.0405-.02.0758-.049.1032-.085.1467-.166.16-.5 0-.573s-.54-.147-.66.04z"/><path d="m90.1928 131.573c-.0227-.064-.0594-.122-.1074-.169-.048-.048-.1061-.085-.1701-.107-.0639-.022-.1321-.03-.1995-.023-.0673.008-.1322.03-.1897.066-.0752.04-.138.101-.1818.174s-.067.157-.067.243c0 .085.0232.169.067.242.0438.074.1066.134.1818.174-.0062.06.0083.121.041.172s.0817.089.139.108c.1415.02.2851.02.4267 0 .0392-.063.0626-.135.0684-.209s-.0062-.149-.0351-.217c.041-.068.0648-.145.0695-.224.0046-.079-.0101-.158-.0428-.23z"/><path d="m75.9995 127.926c.34-.167.4867-.467.3533-.72-.1094-.17-.2722-.299-.4629-.366-.1906-.068-.3983-.07-.5904-.007-.115.099-.1929.234-.2208.383-.0278.149-.004.303.0675.437.0306.08.079.153.1414.212.0625.059.1375.104.2195.13s.1688.034.254.022c.0853-.012.1667-.043.2384-.091z"/><path d="m66.7799 124.22c.0945.071.204.119.32.14.28-.146.3734-.406.2334-.546-.0545-.051-.1186-.09-.1885-.115-.0698-.025-.1441-.036-.2182-.032-.1933.033-.26.4-.1467.553z"/><path d="m71.5127 123.413c.3-.106.5533-.446.48-.666-.1467-.46-.6667-.454-.92-.44-.2534.013-.38.613-.14.96.0603.093.1536.16.2612.187.1075.027.2214.013.3188-.041z"/><path d="m114.093 132.72c-.3.113-.22.366-.167.606.26.12.494.14.667-.126.021-.06.028-.124.018-.187-.009-.063-.034-.122-.071-.173-.06-.054-.132-.093-.209-.113-.078-.021-.159-.024-.238-.007z"/><path d="m113.56 134.593c.113.073.206.167.353.147s.2-.234.087-.4c-.115-.152-.285-.253-.474-.28-.032-.004-.066 0-.096.012-.031.011-.059.029-.082.053-.022.024-.039.053-.049.084-.009.032-.011.065-.006.097.021.065.056.124.102.173.046.05.102.089.165.114z"/><path d="m116.073 130.46c.353.047.493-.187.626-.487-.093-.113-.173-.233-.26-.32l-.666.147c-.043.094-.061.197-.054.3 0 .047.008.094.025.137.018.044.044.084.077.117.032.034.072.06.115.078.043.019.09.028.137.028z"/><path d="m121.213 128.873c.033 0 .14 0 .16-.053.02-.054 0-.127 0-.16-.026-.025-.061-.039-.097-.039s-.07.014-.097.039c-.023.033-.033.073-.027.113s.028.076.061.1z"/><path d="m114.58 132.12c.201-.015.389-.103.528-.248.139-.146.219-.337.226-.538-.044-.2-.16-.377-.325-.498s-.369-.177-.573-.159c-.204.019-.394.112-.534.261-.141.149-.222.344-.228.549-.034.347.44.6.906.633z"/><path d="m117.56 135.086c-.046.048-.072.111-.072.177s.026.129.072.177c.133.126.28-.06.347-.127.066-.067 0-.227-.034-.24-.049-.023-.103-.034-.158-.032-.054.003-.108.018-.155.045z"/><path d="m118.033 130.46c0-.147 0-.433-.114-.473-.074-.01-.15-.002-.221.023-.071.026-.135.068-.186.123-.06.087-.053.44.054.507.106.067.433-.113.467-.18z"/><path d="m107.713 134.32c-.029.052-.047.11-.052.17-.005.059.002.119.021.176.02.056.051.108.092.152s.09.078.145.102c.194.093.407.2.534 0 .206-.334.186-.62 0-.76-.057-.045-.123-.076-.194-.092-.07-.016-.143-.016-.214-.001-.07.015-.137.046-.194.089-.057.044-.105.1-.138.164z"/><path d="m107.333 132.207c-.051.139-.053.292-.007.433.045.142.137.264.26.347.048.028.101.046.155.052.055.006.11 0 .163-.017.052-.017.1-.045.141-.082s.073-.083.095-.133c.233-.354.253-.627.073-.767-.145-.069-.309-.09-.467-.06s-.303.109-.413.227z"/><path d="m103.893 136.267c-.031.044-.053.095-.063.149s-.009.11.005.163c.013.053.038.103.072.145.034.043.077.078.126.103.109.062.236.084.359.059.123-.024.232-.093.308-.193.053-.108.065-.231.035-.347-.031-.117-.102-.218-.202-.286-.055-.031-.116-.05-.178-.056-.063-.006-.126.001-.186.02-.06.02-.116.051-.163.093-.048.042-.086.092-.113.15z"/><path d="m112 131.2c.155.096.341.13.52.095.179-.034.338-.135.447-.282.096-.209.112-.446.046-.666l-1.4.213c.015.128.057.252.123.362.067.111.157.206.264.278z"/><path d="m110.253 133.193c.051.033.108.055.169.064.06.009.121.005.179-.012.059-.018.113-.047.158-.087.046-.04.083-.089.107-.145.267-.413.254-.7-.046-.893-.147-.059-.308-.069-.461-.031s-.291.124-.393.244c-.037.156-.031.319.02.471s.143.287.267.389z"/><path d="m50.8796 97.4535c.0122.0368.0122.0765 0 .1133-.0559.0213-.1095.0481-.16.08-.0734-.1-.2267-.12-.4867.04-.0623.0246-.1186.0623-.1651.1107-.0465.0483-.082.106-.1041.1693-.0221.0632-.0304.1305-.0242.1972.0062.0668.0267.1314.0601.1895.0604.1218.1567.2222.2759.2878.1191.0655.2555.093.3907.0789.0506.0557.115.0971.1867.1199.2467.0734.4867.2534.6667.1534.0626-.0296.1174-.0732.1602-.1276s.0724-.118.0864-.1857c.0759-.1286.1064-.2788.0867-.4267-.0328-.1366-.0917-.2657-.1733-.38.0067-.071.0067-.1424 0-.2133-.0334-.2667-.0934-.6667-.46-.6134-.3667.0534-.3667.2867-.34.4067z"/><path d="m46.8258 73.2064c-.3 0-.6133 0-.6133.4334-.0089.1105.0208.2208.084.3119.0632.0912.156.1576.2626.1881.0451.0204.0939.031.1434.031.0494 0 .0983-.0106.1433-.031.1467-.1667.2667-.36.4133-.56.2344-.0052.4637-.0694.6667-.1867 0-.2933 0-.5933 0-.8867-.1614-.1572-.3749-.2497-.6-.26-.4-.02-.5.18-.5.96z"/><path d="m47.9061 84.4203c.0759.099.1827.1699.3035.2013s.2486.0215.3631-.028c0 0 0 0 .04-.0467-.0533-.28-.1066-.56-.1533-.84-.1384-.0467-.2883-.0467-.4267 0-.058.0361-.1079.084-.1462.1405-.0383.0566-.0643.1206-.0763.1879-.0119.0673-.0096.1364.007.2027.0165.0663.0468.1284.0889.1823z"/><path d="m47.0396 76.4866c.0635-.006.1246-.0273.1781-.0622.0534-.0348.0975-.0821.1286-.1378.0933-.28-.0667-.4534-.3467-.56-.2.1266-.4466.2466-.3333.5466.0428.0608.0984.1114.1629.1483.0645.0368.1364.0591.2104.0651z"/><path d="m49.2461 93.8936c.0866.1533.2066.3.4266.2133.1124-.0643.195-.1703.2299-.2951.035-.1247.0194-.2582-.0432-.3716-.1611-.0271-.3256-.0271-.4867 0-.2.0734-.2266.2734-.1266.4534z"/><path d="m49.0668 86.833c-.0481.1125-.0599.2373-.0336.3569.0263.1195.0894.2278.1803.3098-.0467-.24-.1067-.4534-.1467-.6667z"/><path d="m48.666 90.2132c.1732.0912.3731.1185.5645.077.1914-.0414.3621-.149.4821-.3037.0428-.0986.0611-.2061.0534-.3133-.04-.14-.0867-.2734-.12-.4134-.0832-.1646-.2264-.2911-.4-.3533-.1719-.0707-.3623-.083-.5418-.0348-.1796.0482-.3382.1541-.4516.3015-.22.2666.0267.7466.4134 1.04z"/><path d="m47.5263 77.6201c-.4067.0933-.8733.2466-.9733.74-.0179.16-.0017.3219.0475.4752s.1303.2944.238.4141c.1077.1196.2396.2151.3868.2802.1473.065.3067.0981.4677.0971.0683-.0061.1371.0062.1992.0355s.1153.0746.1541.1312c-.0867-1.0667-.14-2.1333-.1667-3.2133-.1489.3353-.2672.6833-.3533 1.04z"/><path d="m50.9331 102.426c.0214-.01.0403-.024.0553-.043.015-.018.0257-.039.0315-.062.0057-.023.0063-.047.0016-.07-.0046-.024-.0143-.046-.0284-.065-.06-.073-.1867-.213-.3333-.153-.1467.06-.06.287 0 .32s.1533.147.2733.073z"/><path d="m50.6663 95.3331c-.009-.0977-.0519-.1893-.1213-.2587s-.161-.1123-.2587-.1213c-.2334 0-.3.14-.28.62.0546.0454.1202.0757.1902.0879.0699.0122.1419.0058.2087-.0185.0667-.0242.1259-.0656.1718-.1199.0458-.0542.0766-.1196.0893-.1895z"/><path d="m49.5996 101.153c.0087.034.0246.066.0467.093.0424.055.097.099.1595.129s.1311.046.2005.045c.1266 0 .2533.066.4333 0 .1324-.064.2483-.157.3386-.273.0902-.115.1523-.25.1814-.394.0155-.127-.0028-.255-.0532-.372s-.1309-.219-.2335-.295c-.091-.06-.1964-.0949-.3054-.1007-.109-.0059-.2176.0177-.3146.0677-.1093.047-.2055.12-.2799.213s-.1248.203-.1467.32c-.0623-.023-.1311-.023-.1934 0-.3066.074-.6666.067-.9066.38l.04.454c-.3134.28-.4667.666-.3267.86.0528.079.131.138.2219.167s.189.027.2781-.007c.3667-.12.4467-.26.4133-.72.18-.24.3134-.387.4467-.567z"/><path d="m48.8398 104.667c.2467-.24.22-.527-.08-.82-.0357-.052-.0817-.097-.1354-.13-.0536-.034-.1135-.056-.1761-.065-.0626-.01-.1264-.006-.1875.01-.0611.017-.1182.045-.1676.085-.1068.138-.1743.303-.1955.477-.0211.173.005.35.0755.51.2733.28.5666.253.8666-.067z"/><path d="m62.7397 119.267c0-.134-.2466-.174-.32-.154-.0518.019-.0976.051-.1328.093s-.0584.093-.0672.147c0 .107.18.174.2667.174s.2667-.134.2533-.26z"/><path d="m48.2866 95.6997c-.0182.015-.0328.0339-.0428.0552-.0101.0213-.0153.0446-.0153.0681 0 .0236.0052.0469.0153.0682.01.0213.0246.0402.0428.0552.06.0666.2333.22.3333.1333s0-.28 0-.3133c0-.0334-.2133-.16-.3333-.0667z"/><path d="m48.1469 96.8662c.1133 0 .28.1667.16.2067s-.1867.1867-.0934.4933c.0101.0655.0337.1281.0694.1839.0357.0557.0828.1034.1381.1398.0553.0365.1176.0609.1829.0718.0653.0108.1322.0078.1963-.0088.1787-.0428.3334-.1542.4307-.3101.0973-.156.1294-.3439.0893-.5232-.08-.38-.3066-.4-.3333-.6667s-.18-.3133-.4467-.3533-.6667-.0734-.7067.3c-.04.3733.2.4666.3134.4666z"/><path d="m48.3197 86.1664c.2667-.1533.2734-.5533 0-.9666-.0873-.0958-.2031-.1611-.3303-.1863s-.2591-.009-.3763.0463c-.1107.0999-.1939.2265-.2417.3677-.0479.1412-.0588.2923-.0317.4389.1081.1503.2625.261.4395.3152.177.0541.3668.0488.5405-.0152z"/><path d="m46.9933 88.3529c-.1616-.1865-.3718-.3246-.6072-.3987-.2354-.0742-.4867-.0815-.7261-.0213-.1762.1197-.3013.301-.3507.5083-.0493.2072-.0193.4255.084.6117.1248.1837.3075.3203.519.3879.2115.0677.4395.0626.6477-.0145.1972-.0879.3526-.249.4334-.4492.0809-.2002.0808-.424-.0001-.6242z"/><path d="m42.96 78.9199c.0312-.1742.0312-.3525 0-.5267-.0734-.2467-.4334-.2933-.6667-.14-.0454.0318-.0839.0724-.1133.1194-.0293.047-.049.0994-.0577.1542-.0087.0547-.0063.1106.007.1644.0134.0538.0374.1044.0707.1487.0921.1085.2224.1774.364.1923.1415.0149.2833-.0254.396-.1123z"/><path d="m45.5793 96.8004c-.06.2266.0667.3266.5333.42.0519-.0417.0925-.0957.1182-.1571.0257-.0613.0356-.1281.029-.1943s-.0296-.1297-.067-.1847c-.0373-.0551-.0878-.1-.1468-.1306-.0943-.0184-.192-.004-.2769.0409-.085.0449-.1519.1175-.1898.2058z"/><path d="m42.0666 80.4133c.0728.1032.1821.1751.3058.2011.1236.0259.2526.0041.3608-.0611.0955-.0697.1619-.1722.1865-.2879.0246-.1156.0057-.2363-.0531-.3388-.0749-.1009-.1845-.1704-.3077-.1951-.1232-.0246-.2511-.0026-.359.0618-.0975.0665-.1658.1679-.1906.2833s-.0043.236.0573.3367z"/><path d="m46.0329 92.9536c-.0538-.0171-.1106-.0227-.1668-.0167-.0561.0061-.1104.0239-.1593.0521s-.0914.0663-.1248.1119c-.0334.0455-.0569.0975-.0691.1527-.0189.0812-.0185.1657.0012.2468.0197.081.0581.1563.1122.2199.26.2066.52.0733.7466-.1467-.0066-.24-.04-.54-.34-.62z"/><path d="m45.3334 91.0667c.24-.2067.12-.4667 0-.7467-.2934 0-.6-.1-.7267.2467-.0065.033-.0065.067 0 .1-.1339-.0477-.2761-.0682-.418-.0602-.142.0081-.2809.0444-.4087.1069-.0489.0333-.0908.0761-.123.1259-.0323.0497-.0544.1053-.0649.1636-.0106.0584-.0094.1182.0034.1761s.037.1126.0712.161c.0727.1525.2005.2717.3576.3336.1572.0619.332.0618.4891-.0002.0939-.054.1748-.128.237-.2167s.1042-.19.123-.2967c.0774.0311.1622.0389.244.0223.0817-.0166.1568-.0568.216-.1156z"/><path d="m47.4735 93.3731c.6667.72 1.2533.3467 1.6533-.16.1355-.1683.2106-.3773.2134-.5933-.0065-.1434-.0439-.2837-.1094-.4114-.0656-.1277-.1579-.2398-.2706-.3286-.2467-.2267-.2534-.5667-.5667-.6667-.2801-.1068-.5875-.119-.8752-.0347s-.5399.2604-.7181.5014c-.1199.1416-.2023.311-.2395.4927-.0373.1818-.0283.3699.0261.5473.1267.36.62.3467.8867.6533z"/><path d="m43.5266 82.7732c.28-.16.32-.4667.1066-.8467-.2133-.38-.46-.4333-.6666-.2933-.1269.1208-.2251.2686-.2874.4325-.0623.1638-.0871.3395-.0726.5141.0967.1473.2477.2502.4201.2865.1724.0362.3521.0027.4999-.0931z"/><path d="m45.4528 86.9932c.0927-.0811.161-.1864.1975-.3041s.0397-.2432.0091-.3625c-.027-.0603-.0666-.114-.1163-.1576-.0496-.0436-.108-.0759-.1713-.0949-.0632-.019-.1298-.0241-.1952-.0151-.0654.0091-.1281.0321-.1838.0676-.1047.0601-.1848.1553-.2262.2687-.0415.1134-.0417.2378-.0005.3513.0825.098.1895.1724.3101.2157s.2505.054.3766.0309z"/><path d="m43.8333 92.6666c-.17.091-.3018.2399-.3715.4197-.0697.1797-.0727.3785-.0085.5604.1122.1698.2835.2918.4806.3423.1972.0505.4061.0259.5861-.069.064-.0384.1199-.089.1643-.1491.0444-.06.0766-.1282.0945-.2007.018-.0725.0214-.1478.0102-.2217-.0112-.0738-.037-.1447-.0757-.2085-.1533-.32-.6333-.5734-.88-.4734z"/><path d="m43.1398 86.0331c.1133.2133.78.2866 1.0467.1133.0919-.0898.1559-.2043.1843-.3297s.02-.2563-.0243-.3769c-.0739-.1513-.2022-.2691-.3592-.3297-.1571-.0606-.3312-.0595-.4875.003-.1598.0853-.2839.2248-.3499.3935s-.0696.3554-.0101.5265z"/><path d="m44.1659 89.0466c.1152-.0436.2189-.113.3031-.2029.0843-.0899.1468-.1978.1828-.3156.0361-.1178.0447-.2422.0252-.3638-.0196-.1216-.0667-.2372-.1377-.3377-.124-.1975-.3198-.3391-.5461-.395-.2264-.056-.4656-.0219-.6673.0949-.1678.1612-.2787.3726-.3159.6022-.0373.2297.001.4652.1093.6712.0498.0878.1172.1643.198.2248.0808.0606.1732.1037.2715.1269.0982.0232.2002.0258.2995.0077s.1938-.0565.2776-.1127z"/><path d="m93.2926 134.153c.0333-.234-.38-.667-.6667-.707-.2866-.04-.5266-.08-.6666.253-.14.334-.2267.474-.3467.714-.0483.036-.0875.083-.1145.136-.027.054-.0411.114-.0411.174s.0141.119.0411.173.0662.101.1145.137c.0973.076.2192.113.3423.104.123-.008.2386-.062.3244-.151.1195-.118.2596-.213.4133-.28.1472-.013.286-.074.3946-.174s.1808-.234.2054-.379z"/><path d="m98.306 134.3v.033c-.0667.267.18.353.3733.433.2667-.113.4134-.293.2934-.56-.04-.093-.2267-.206-.3067-.18l-.1533.08c.0215-.041.0351-.086.04-.133-.0124-.058-.0372-.112-.0726-.159-.0355-.047-.0808-.086-.1328-.114s-.1095-.044-.1684-.048c-.059-.003-.118.006-.1729.028-.0536.032-.0986.077-.1311.13s-.0516.114-.0556.176c.0064.073.0295.144.0677.206.0382.063.0903.115.1523.154.0451.013.0925.015.1387.007.0461-.008.0899-.026.128-.053z"/><path d="m96.28 137.18c.0411-.048.0717-.104.0897-.165s.0231-.124.0149-.187-.0294-.123-.0623-.177c-.033-.055-.0769-.101-.1289-.137-.1039-.063-.2253-.089-.3457-.076-.1205.013-.2332.066-.321.149-.0398.05-.0686.108-.0846.17-.0159.061-.0187.126-.008.189s.0346.123.0701.176.0818.098.1358.132c.0451.041.0984.072.1565.091s.1196.025.1802.018c.0607-.007.1192-.027.1715-.058.0523-.032.0973-.074.1318-.125z"/><path d="m97.6728 131.866c-.0431-.035-.0932-.061-.1471-.076-.0538-.015-.1102-.018-.1654-.01-.0553.008-.1082.028-.1555.057-.0472.03-.0876.07-.1186.116-.0456.044-.0811.098-.1041.157s-.033.122-.0292.186c.0038.063.0213.125.0512.181s.0715.104.1221.143c.0489.039.105.067.1651.084s.1229.022.1848.014c.062-.007.1219-.027.1762-.057.0544-.031.1021-.072.1405-.121.0677-.107.093-.236.0708-.36-.0222-.125-.0903-.237-.1908-.314z"/><path d="m96.9602 138.667c-.1415-.108-.32-.155-.4963-.132-.1762.024-.3359.117-.4437.258-.1079.142-.1551.32-.1314.497.0238.176.1166.335.258.443.1836.09.3921.115.5918.072.1997-.044.3788-.154.5082-.312.16-.206.0067-.64-.2866-.826z"/><path d="m95.6728 135.447c.0512.03.1082.05.1673.058.0591.007.1191.003.1765-.013.0573-.017.1108-.044.1571-.082.0464-.037.0846-.084.1124-.136.0392-.051.0672-.11.0822-.172.0149-.062.0164-.127.0045-.19-.012-.063-.0372-.123-.074-.176-.0368-.052-.0843-.096-.1394-.129-.1187-.047-.2498-.051-.3713-.012s-.2258.118-.2953.225c-.0514.109-.0614.232-.0283.347.0331.116.1072.215.2083.28z"/><path d="m93.8669 139.907c-.06.173-.14.606 0 .713s.4933-.187.5-.253c0-.2.08-.46-.1-.607s-.3667.06-.4.147z"/><path d="m95.7195 132.54c.0953-.012.187-.044.2695-.093.0826-.05.1542-.115.2105-.193.0769-.106.1303-.226.1568-.354.0264-.127.0252-.259-.0035-.386 1.3778.16 2.76.278 4.1462.353-.033.113-.053.227-.08.347-.284.05-.5487.177-.7662.366l-.1867-.1c-.1913-.039-.3905-.011-.5633.08-.1727.091-.3083.24-.3833.42-.0171.22.051.437.1901.607s.3384.28.5565.307c.1194.012.2399 0 .3544-.036.1145-.035.2208-.093.3123-.171l.0932.08c.38.3.713.14 1.033-.127.194.18.32.474.667.287.091-.046.164-.122.204-.216s.046-.199.016-.297c-.1-.367-.407-.3-.667-.267-.06-.16-.113-.307-.173-.453l.58-.254c.031-.162.047-.327.047-.493l1.62.04h.066c.067.01.134.01.2 0h1.467c-.01.124.014.248.071.359.056.111.143.204.249.268.095.067.204.114.319.136.114.022.233.02.346-.007.114-.028.22-.079.313-.15.092-.072.168-.163.222-.266.07-.116.102-.251.093-.387l1.147-.053c.135 0 .263-.053.358-.148s.149-.224.149-.359c0-.134-.054-.263-.149-.358s-.223-.148-.358-.148c-12.2998.12-24.5398-2.667-34.9132-9.414-6.2448-4.129-11.6176-9.446-15.8133-15.646-.8222-1.153-1.5618-2.363-2.2133-3.62-.0004-.03-.0073-.059-.0202-.085-.0129-.027-.0314-.05-.0544-.068-.0229-.019-.0496-.032-.0782-.039s-.0584-.007-.0872-.002l-.18-.313c-.2037-.049-.4187-.018-.6.087-.0582.055-.1044.121-.1361.194-.0316.073-.048.153-.048.232 0 .08.0164.159.048.233.0317.073.0779.139.1361.194.0329.055.0776.103.1309.139s.1139.06.1775.07c.0635.01.1286.006.1905-.011.0619-.018.1191-.049.1677-.091l.06.14c-.0543.059-.0887.134-.0983.215-.0095.08.0062.161.045.231.0314.06.0799.109.1393.141.0593.032.1269.046.194.039.4711 1.018.9986 2.008 1.58 2.967-.0116.074-.0063.15.0157.221.0219.072.0599.138.111.192.0571.061.1316.103.2133.12.1334.22.2734.447.4134.667-.1667.267-.1334.507.1533.787.1442.143.337.226.54.233.12.167.2333.347.36.513-.1959.007-.3838.08-.5333.207-.4134.327-.3534 1.013 0 1.127.3533.113.5333-.074.6.053.0666.127.08.447.3333.5s.46-.28.6133-.513c.3334.444.6734.889 1.02 1.333-.0249.084-.0312.172-.0185.258.0127.087.044.169.0919.242.0675.072.1492.129.2398.168s.1882.059.2868.059c.0667.073.1267.153.1934.233.42.5.86 1 1.3333 1.487-.1271.012-.2466.066-.34.153-.0772.131-.1074.284-.0855.435.0218.15.0943.288.2055.392.0544.067.123.121.2008.158.0779.037.163.056.2492.056s.1713-.019.2492-.056c.0778-.037.1464-.091.2008-.158.037-.04.0684-.085.0933-.134.8.84 1.6334 1.647 2.4867 2.434-.0308.064-.0468.135-.0468.206 0 .072.016.143.0468.207.0591.073.1331.133.2169.175.0839.043.1758.067.2698.072.0508-.009.0988-.029.14-.06.5133.453 1.04.893 1.5666 1.333-.0705.148-.107.31-.107.473 0 .164.0365.326.107.474.0717.188.2152.34.399.423.1837.082.3927.088.581.017.1592-.067.2975-.175.4-.314.36.28.7334.554 1.1.82.0557.07.1295.123.2134.154 1.2133.889 2.46 1.704 3.74 2.446-.0267.092-.0267.189 0 .28.0851.173.2298.31.4074.384.1775.075.3761.083.5592.023.0326-.017.0601-.042.08-.073.4934.28.9867.553 1.4867.813-.0086.092.0075.184.0467.267.2133.473.7533.78 1.1133.626.0889-.041.1684-.1.2333-.173.6667.333 1.3734.667 2.0734.96.0522.1.1368.178.2399.223.103.045.2183.053.3267.024.7267.313 1.46.613 2.2.893 0 .253.2734.3.52.26v-.053l.98.353c-.0123.071-.0123.143 0 .213.0213.056.0535.107.0948.15.0412.043.0906.077.1452.101.0547.023.1135.036.173.036.0596.001.1186-.011.1737-.033l.08-.04c.0606.146.1607.272.2891.363.1284.092.28.146.4375.157h.0601c-.0954.123-.1521.272-.1627.427-.0107.156.025.311.1026.446.053.12.125.23.2134.327-.0555.009-.1082.031-.1543.063-.0462.032-.0845.074-.1124.123-.033.073-.051.152-.0531.232-.002.08.0119.16.0411.234.0292.075.0731.143.1289.2.0559.058.1227.103.1965.134.1365.055.286.069.4303.041.1444-.028.2775-.098.383-.201.0784-.104.1208-.232.1208-.363s-.0424-.258-.1208-.363c.1698-.1.3002-.255.3694-.44.0691-.184.0729-.387.0106-.574-.0809-.184-.2187-.339-.3933-.44 1.2733.374 2.56.667 3.8533.974-.016.035-.0243.074-.0245.113-.0001.039.0079.078.0236.114.0157.035.0387.068.0676.094.0288.026.0629.046.1.059.1415.02.2851.02.4266 0 .0399-.077.0626-.161.0667-.247.56.116 1.12.222 1.68.32.0257.038.0572.072.0933.1.0734.071.1714.111.2734.111.1019 0 .1999-.04.2733-.111.3133.053.6266.107.94.147-.0691.105-.123.219-.16.34-.0358-.043-.0808-.077-.1316-.1-.0507-.023-.106-.035-.1617-.034-.0782.009-.1538.034-.2224.073-.0686.038-.1288.09-.1772.152s-.084.133-.1046.209c-.0207.076-.0261.155-.0158.233.0232.145.0878.28.186.388.0982.109.2257.187.3673.225.1309.015.2633-.012.3773-.078.1141-.066.2039-.167.256-.288.1357.062.2841.092.4333.086.013.023.0315.041.0537.054.0222.012.0474.019.073.019s.0508-.007.073-.019c.0223-.013.0408-.031.0537-.054z"/><path d="m102.887 138.153c-.07-.011-.142-.006-.209.016-.068.022-.129.06-.178.111-.073.093-.153.407-.04.507s.413-.047.513-.127c.035-.036.06-.08.075-.128.015-.047.018-.098.009-.147-.008-.049-.028-.096-.058-.136-.029-.04-.068-.073-.112-.096z"/><path d="m100.667 142.246c-.066.11-.086.24-.058.364.029.125.104.233.211.303.052.038.112.065.175.079.063.013.129.013.192-.001s.122-.041.174-.08.095-.088.126-.145c.058-.104.077-.226.051-.343s-.094-.22-.191-.29c-.051-.04-.11-.069-.173-.085s-.128-.019-.192-.008c-.064.01-.125.034-.179.07-.055.035-.101.082-.136.136z"/><path d="m101.747 135.18c-.071-.048-.151-.081-.236-.096-.084-.015-.171-.012-.254.008-.083.021-.161.059-.228.112s-.123.12-.162.196c-.1.138-.147.307-.133.477.013.169.086.329.206.45.166.067.348.083.523.045s.334-.128.457-.259c.059-.069.101-.151.124-.238.023-.088.027-.18.01-.269-.016-.09-.052-.174-.106-.248-.053-.073-.122-.134-.201-.178z"/><path d="m98.2799 140.314c-.0123.031-.0137.066-.0041.099.0097.032.0299.061.0575.081.0333 0 .14 0 .16-.054.02-.053 0-.126 0-.16-.0154-.013-.0337-.023-.0535-.029s-.0407-.007-.061-.004c-.0204.003-.0398.011-.0569.022-.0171.012-.0314.027-.042.045z"/><path d="m46.4134 101.506c.0533-.073.16-.226.06-.353s-.2933 0-.3133.053c-.0336.045-.0517.098-.0517.154 0 .055.0181.109.0517.153.0161.018.0359.032.058.042.0222.009.0461.014.0702.013.024 0 .0477-.006.0693-.017s.0406-.026.0558-.045z"/><path d="m100.667 137.6c-.024-.08-.063-.155-.114-.22-.061-.092-.147-.165-.248-.21-.102-.044-.213-.059-.3228-.042-.1093.017-.2115.064-.2946.137s-.1435.169-.1743.275c-.1095.303-.179.619-.2067.94.0128.188.0839.367.2034.513s.2814.251.4633.3c.2067.04.6667-.033.6667-.46-.347-.62.153-.707.027-1.233z"/><path d="m98.1798 143.026c-.057.046-.1033.104-.1355.17-.0323.065-.0497.137-.0511.21.0666.294.44.314.58.24.0429-.04.0764-.088.0984-.143.0219-.054.0316-.113.0284-.171-.0032-.059-.0192-.116-.0468-.167-.0277-.052-.0664-.097-.1134-.132-.0543-.032-.116-.049-.1791-.051-.0631-.001-.1254.014-.1809.044z"/><path d="m99.4929 135.713c-.1134-.16-.6667-.126-.72.12-.0171.099.0009.2.0509.286.0499.087.1286.153.2224.187.24.047.5666-.433.4467-.593z"/><path d="m83.9999 135.147c-.1867.106-.1467.26-.08.406.0666.147.3133.3.4733.16.0947-.108.1733-.229.2333-.36-.0261-.056-.0635-.106-.1097-.147s-.1003-.072-.159-.091c-.0587-.02-.1207-.027-.1823-.021-.0615.005-.1213.023-.1756.053z"/><path d="m85.3333 138.873c-.038.026-.0676.063-.0853.105-.0178.043-.0229.09-.0147.135.04.08.2066.1.3.087.0933-.013.2-.153.1533-.273s-.2533-.08-.3533-.054z"/><path d="m87.6796 133.554c-.1575-.06-.3284-.073-.4934-.04s-.3174.111-.44.226c-.1666.2-.3466.407-.1266.667s.2866.44.4333.667c.0035.059.0209.117.0508.168.03.052.0716.096.1216.128.0499.033.1068.053.1661.059.0592.007.1191-.001.1748-.022.1234-.04.2264-.126.2873-.241.061-.114.0751-.248.0394-.372-.0364-.165-.0364-.336 0-.5.0453-.131.0492-.272.011-.404-.0382-.133-.1166-.25-.2243-.336z"/><path d="m91.9199 138.246c-.0534.047-.1134.287 0 .36.1133.074.28-.066.3466-.126.0667-.06.0534-.194 0-.24-.053-.031-.1132-.046-.1742-.045-.061.002-.1206.019-.1724.051z"/><path d="m85.4664 131.287c-.0438.021-.0938.024-.1401.01-.0464-.015-.0856-.046-.1099-.088-.0244-.042-.032-.091-.0215-.139.0105-.047.0384-.089.0782-.117.1122-.193.1451-.423.0916-.641-.0534-.217-.189-.405-.3782-.525-.1177-.063-.2472-.101-.3804-.112-.1331-.01-.267.007-.393.052 0 0 0 0 0-.04-.0307-.068-.0754-.129-.1313-.178s-.1216-.086-.1928-.108c-.0712-.023-.1463-.029-.2203-.02s-.1452.034-.2089.072c-.0869.026-.1666.071-.2325.133s-.1162.139-.1467.224c-.0306.085-.0406.177-.0291.266.0114.09.044.176.095.251.0484.112.1226.21.2165.288.0938.077.2046.132.3234.158.0297.169.1228.319.26.42.2085.096.4424.122.6667.074-.0391.114-.0391.239 0 .353.043.103.1237.185.2254.229.1018.045.2168.049.3213.011.0623-.01.1215-.033.173-.07.0515-.036.0937-.084.1235-.14.0297-.056.0461-.117.0479-.18s-.0112-.126-.0378-.183z"/><path d="m103.767 134c.093-.118.14-.267.13-.417s-.075-.291-.184-.396c-.098-.075-.22-.111-.343-.101-.123.009-.238.064-.323.154-.075.144-.098.308-.067.467.032.159.116.302.24.406.088.057.194.076.296.055.103-.021.192-.081.251-.168z"/><path d="m82.6662 136.334c-.08 0-.26.2-.22.3s.2933.12.3666.086c.0499-.025.0903-.067.1154-.117.0252-.05.0338-.107.0246-.163-.0304-.045-.0745-.08-.126-.099-.0515-.02-.1077-.022-.1606-.007z"/><path d="m84.0925 133.333c-.0255-.055-.0621-.105-.1077-.146s-.0992-.072-.1573-.092c-.0582-.019-.1197-.026-.1808-.021s-.1203.023-.1742.053c-.1866.106-.1466.26-.08.406.0128.048.0371.092.0709.128.0339.036.0761.063.1229.079.0469.016.0969.02.1457.012.0487-.008.0947-.028.1339-.059.0951-.106.1717-.228.2266-.36z"/><path d="m90.1063 135.267c-.2531-.086-.5289-.076-.7749.029-.246.104-.4448.296-.5585.538-.1133.36.3334.566.5934.493s.1866 0 .3866.187c.0496.066.1157.118.1918.151.076.033.1594.045.2418.036.0823-.009.1608-.04.2274-.09.0667-.049.1192-.115.1524-.191.0781-.215.0744-.451-.0104-.664s-.2448-.387-.4496-.489z"/><path d="m90.6127 136.593c-.0434.028-.0789.067-.1034.112-.0245.046-.0371.096-.0366.148 0 .067.18.247.2933.2s.0867-.267.0667-.36c-.0189-.04-.0514-.072-.0917-.09-.0403-.019-.0858-.022-.1283-.01z"/><path d="m91.8195 132.574c-.0214-.056-.0535-.107-.0946-.15s-.0903-.078-.1448-.102-.1132-.037-.1728-.039c-.0595-.001-.1188.009-.1744.031-.1059.055-.1906.144-.2412.253-.0506.108-.0642.23-.0388.347.0224.055.0559.105.0982.147.0424.042.0929.075.1484.097.0555.021.1149.032.1745.03.0595-.002.1182-.016.1722-.041.0575-.017.1108-.046.1563-.085.0456-.038.0825-.087.1083-.141s.0399-.113.0414-.172c.0015-.06-.0096-.12-.0327-.175z"/><path d="m87.9461 131.294c-.0667.093.0466.313.1133.353.0215.017.0461.03.0724.037.0264.008.0539.01.0812.007.0272-.003.0536-.011.0776-.025.0239-.013.0451-.031.0621-.052.0171-.022.0298-.046.0374-.073.0075-.026.0098-.054.0067-.081s-.0115-.053-.0248-.077-.0311-.046-.0526-.063c-.06-.053-.32-.113-.3733-.026z"/><path d="m86.9726 136.853c-.2084.173-.3454.418-.3848.686-.0393.268.0217.541.1715.767.2467.28.6667 0 .7267-.253s.0866-.167.36-.233c.0832-.006.1635-.034.2324-.081s.1239-.111.1593-.187.0499-.159.042-.242-.038-.163-.0871-.23c-.1419-.179-.3435-.3-.5676-.341-.2242-.042-.4558-.001-.6524.114z"/><path d="m113.593 141.18c-.015.031-.018.065-.009.098.008.033.028.062.055.082.04 0 .147 0 .16-.054.014-.053.034-.126 0-.16-.015-.013-.032-.023-.052-.029-.019-.006-.039-.007-.059-.004s-.039.011-.055.022c-.017.012-.031.027-.04.045z"/><path d="m117.366 139.433c-.038.051-.066.108-.082.17-.015.062-.018.126-.007.188.011.063.034.123.069.176s.08.098.134.133c.038.04.085.071.138.09.052.019.108.025.164.017.055-.007.108-.027.154-.058.046-.032.084-.074.11-.122.039-.046.068-.1.085-.157.017-.058.022-.118.015-.178-.008-.059-.028-.117-.059-.168-.03-.051-.072-.096-.121-.131-.089-.064-.197-.095-.307-.087-.109.007-.213.052-.293.127z"/><path d="m115.266 133.626c-.065.082-.112.175-.139.276-.027.1-.032.205-.017.308.016.102.053.201.108.288.055.088.128.164.214.222.196.124.43.172.658.135.229-.037.436-.156.582-.335.102-.196.136-.421.096-.638-.039-.217-.151-.415-.316-.562-.096-.064-.205-.106-.319-.125-.113-.019-.23-.014-.342.015s-.216.081-.307.153c-.09.071-.165.161-.218.263z"/><path d="m114.813 141.113c-.053.04-.08.307 0 .353.08.047.28-.06.347-.126.067-.067 0-.227 0-.24-.054-.028-.115-.042-.175-.039-.061.002-.12.02-.172.052z"/><path d="m115.793 136.92c-.093.133 0 .4.247.54.029.028.064.049.102.06.039.012.08.014.119.006.04-.008.077-.025.108-.051.031-.025.055-.058.071-.095.107-.18.153-.373-.047-.533-.093-.059-.203-.083-.313-.07-.109.013-.21.064-.287.143z"/><path d="m113.913 135.567c-.061.079-.089.179-.078.278.012.1.061.191.138.255.133.14.62 0 .667-.153.01-.08.003-.161-.023-.237-.025-.077-.068-.146-.124-.203-.038-.043-.085-.076-.138-.096-.053-.021-.111-.028-.167-.022-.057.005-.111.025-.159.056s-.088.072-.116.122z"/><path d="m113.673 139.08c-.015.054-.014.112.002.167.017.054.048.102.091.139.087.047.267.134.32 0 .023-.051.031-.107.024-.162s-.029-.107-.064-.151c-.046-.02-.32-.093-.373.007z"/><path d="m123.547 130.726c-.067.094.046.314.113.354.021.017.046.029.072.037.027.008.054.01.082.007.027-.003.053-.012.077-.025s.045-.031.062-.053c.017-.021.03-.046.038-.072.007-.026.009-.054.006-.081s-.011-.054-.024-.078c-.014-.024-.032-.045-.053-.062-.06-.053-.307-.087-.373-.027z"/><path d="m113.426 139.887c-.124-.053-.262-.071-.396-.051s-.26.077-.364.164c-.055.107-.068.231-.034.346.033.116.11.214.214.274.052.033.11.054.17.062.061.008.122.004.181-.013.058-.017.112-.046.159-.086.046-.039.084-.088.11-.143.147-.22.14-.44-.04-.553z"/><path d="m104.366 137.473c-.266-.186-.573-.086-.813.267-.044.049-.077.106-.099.168s-.031.128-.027.194c.003.065.02.129.048.189.029.059.069.112.118.156.16.077.338.109.514.091.177-.018.345-.084.486-.191.05-.07.085-.151.1-.235.016-.085.013-.172-.008-.255-.022-.084-.062-.161-.117-.227-.055-.067-.124-.12-.202-.157z"/><path d="m127.293 130.04c-.042-.021-.09-.029-.136-.022-.047.007-.09.029-.124.062-.047.067 0 .22.087.293.086.074.233.094.313 0 .08-.093-.1-.28-.14-.333z"/><path d="m122.426 134.44c-.066.134-.14.514 0 .58.14.067.447-.073.567-.166.12-.094.107-.34-.087-.5-.028-.043-.069-.077-.117-.097-.047-.02-.1-.026-.151-.016-.051.009-.098.033-.135.068-.038.035-.064.081-.077.131z"/><path d="m120.033 129.287c-.107-.065-.233-.088-.356-.066-.122.022-.233.088-.31.186-.056.112-.071.24-.042.362.03.122.101.23.202.304.092.061.206.082.314.06.109-.023.204-.087.266-.18.04-.048.071-.103.09-.163.018-.06.024-.123.017-.186-.007-.062-.026-.123-.057-.177-.032-.055-.074-.103-.124-.14z"/><path d="m121.333 130.533c-.18-.087-.38-.113-.46.087s-.133.56 0 .666c.134.107.474-.18.58-.306.107-.127.114-.314-.12-.447z"/><path d="m120.24 139.14c-.054.107-.094.34 0 .413.066.03.139.042.212.035.072-.007.141-.033.201-.075.073-.066.147-.413.047-.486-.1-.074-.42.04-.46.113z"/><path d="m119.006 130.827c-.173-.053-.359-.045-.527.021-.168.067-.309.188-.399.345-.194.307-.08.607.306.84.125.062.267.081.403.053.137-.028.26-.1.351-.206.07-.172.095-.36.071-.544-.023-.185-.093-.36-.205-.509z"/><path d="m107.406 136.56c-.4-.287-.84-.307-1.02-.047-.066.166-.079.348-.037.521s.137.329.271.446c.148.056.309.066.463.027.154-.038.292-.122.397-.24.07-.109.101-.238.088-.366-.014-.129-.071-.249-.162-.341z"/><path d="m108.353 139.886c.04-.049.069-.105.086-.166s.021-.125.012-.187c-.008-.063-.03-.123-.063-.177s-.077-.1-.128-.136c-.106-.067-.232-.092-.355-.071s-.234.086-.312.184c-.057.111-.072.239-.044.361s.098.23.197.306c.047.033.1.057.157.07.056.012.114.013.171.003.057-.011.111-.033.159-.065s.089-.073.12-.122z"/><path d="m107.846 144.134c-.093.093-.173.626 0 .766.174.14.627-.213.74-.373.047-.098.062-.207.043-.314s-.071-.204-.149-.279c-.167-.134-.48.066-.634.2z"/><path d="m104.946 140.38c-.047-.042-.103-.073-.162-.092-.06-.019-.123-.025-.186-.019-.062.006-.123.025-.178.056-.054.03-.102.071-.141.121-.041.037-.073.083-.093.135-.021.051-.029.107-.023.162.005.055.023.108.052.155.03.047.07.086.118.115.043.048.096.085.155.11.059.024.124.035.188.031s.126-.022.182-.054c.056-.031.104-.075.141-.127.067-.088.099-.197.089-.307s-.06-.212-.142-.286z"/><path d="m108.593 141.14c-.18-.1-.373-.167-.533 0-.049.115-.058.245-.024.366s.108.227.211.3c.146 0 .3-.106.413-.226.031-.031.055-.068.069-.109.014-.042.017-.086.011-.129-.007-.043-.023-.083-.049-.119-.025-.035-.059-.064-.098-.083z"/><path d="m105.48 138.906c-.057.13-.064.276-.019.41.044.134.136.247.259.317.067.054.144.093.227.115.084.022.17.026.255.012s.166-.045.238-.092.133-.109.18-.182c.092-.119.138-.269.128-.42s-.074-.293-.182-.4c-.182-.087-.388-.111-.585-.068-.197.044-.373.152-.501.308z"/><path d="m104.86 142.906c-.07.103-.099.227-.083.35s.076.236.17.317c.107.067.237.09.361.063.124-.026.233-.098.305-.203.058-.111.074-.238.047-.36-.026-.122-.095-.23-.193-.307-.048-.035-.103-.06-.161-.073-.058-.012-.118-.011-.175.002-.058.013-.112.039-.159.076-.047.036-.085.082-.112.135z"/><path d="m110.84 137.546c-.115-.052-.245-.063-.366-.03-.122.033-.229.107-.301.21-.077.129-.109.28-.089.429.019.149.088.287.196.391.15.083.322.115.492.094.17-.022.329-.097.454-.214.107-.193-.086-.673-.386-.88z"/><path d="m111.373 143c-.021.061-.023.127-.005.189s.054.117.105.158c.047.02.098.027.149.019.05-.007.098-.027.137-.059.025-.044.038-.094.038-.144s-.013-.099-.038-.143c-.086-.053-.32-.14-.386-.02z"/><path d="m112.666 132.667c.098-.128.146-.286.137-.447-.01-.16-.078-.312-.19-.426-.227-.26-.507-.24-.787.18-.082.315-.144.636-.187.96-.007.056-.003.113.013.167s.043.105.079.148.082.078.132.103c.051.025.106.039.163.042.111.017.225-.011.316-.077s.153-.166.171-.277c.034-.13.085-.256.153-.373z"/><path d="m113.027 136.873c.113-.093.053-.527-.147-.667s-.293 0-.393.147c-.034.036-.059.08-.071.128-.013.047-.014.097-.003.146.011.048.034.092.067.13.033.037.074.065.12.083.147.073.314.126.427.033z"/><path d="m110.239 134.44c-.046-.533-.153-.72-.446-.747-.099-.014-.201.004-.288.054s-.155.127-.192.22c-.063.108-.084.236-.06.358.025.123.093.233.193.308.313.16.553-.033.793-.193z"/><path d="m109.559 131.587c.117.094.26.15.409.158.15.008.298-.031.424-.111.088-.137.141-.293.154-.454.013-.162-.015-.325-.08-.473-.667.073-1.334.147-2 .2.046.167.16.313.313.3.153-.022.309.003.448.07.14.068.255.176.332.31z"/><path d="m110.3 135.6c-.049-.055-.11-.097-.178-.123-.069-.025-.143-.034-.215-.024-.086.04-.162.096-.225.166s-.111.152-.142.241c-.067.353.26.38.527.5.246-.24.426-.474.233-.76z"/><path d="m92.9794 135.633c-.2133.073-.14.347-.08.42s.4467.433.6067.373.1-.526.04-.566-.3467-.3-.5667-.227z"/><path d="m56.6658 111.58c-.24.1-.1533.667.18.947.0833.074.1913.116.3033.116.1121 0 .2201-.042.3034-.116.2466-.2.38-.614.2333-.807-.28-.387-.76-.247-1.02-.14z"/><path d="m56.5793 115.62c-.1379.119-.2276.285-.2522.465-.0245.181.0177.364.1189.515.1371.12.3104.189.4919.198.1815.008.3605-.045.5081-.151.2-.167.1533-.667-.0733-.933-.045-.06-.1016-.11-.1664-.147-.0647-.037-.1363-.06-.2104-.069s-.1492-.002-.2208.019-.1382.056-.1958.103z"/><path d="m55.8463 114.487c-.1666-.12-.5266 0-.6666.1-.0356.037-.0629.081-.08.129-.0171.049-.0237.1-.0193.151.0045.051.0198.101.0449.146.0252.045.0596.083.101.114.0311.034.0699.06.1133.076.0433.016.0899.022.1357.016.0459-.006.0896-.023.1275-.05.0379-.026.0689-.061.0902-.102.1133-.12.3067-.454.1533-.58z"/><path d="m58.4726 119.6c-.12-.167-.38 0-.4533.053s-.1733.24-.0533.367c.0515.042.1163.066.1833.066s.1318-.024.1833-.066c.08-.02.26-.247.14-.42z"/><path d="m55.9058 122c-.0246.042-.0376.089-.0376.137s.013.095.0376.137c.0457.026.0974.04.1501.04.0526 0 .1043-.014.15-.04.0533-.054.1666-.234 0-.36-.1667-.127-.2067.046-.3001.086z"/><path d="m55.6868 117.253c-.016.057-.016.117 0 .174.0408.015.0858.015.1266 0 0-.054.0867-.127.0467-.18-.04-.054-.1133.006-.1733.006z"/><path d="m60.5529 116.82c-.0457.064-.0776.137-.0937.214-.016.077-.0159.156.0003.233.0534.12.4667.26.6134.12.0785-.079.1227-.185.1227-.297 0-.111-.0442-.218-.1227-.296-.0317-.04-.0725-.072-.1189-.093s-.0972-.03-.148-.028c-.0509.003-.1004.018-.1444.043-.044.026-.0813.061-.1087.104z"/><path d="m61.8929 115.874c.0501-.043.0889-.098.1131-.16.0242-.061.033-.127.0258-.193s-.0303-.129-.0673-.183c-.037-.055-.0867-.1-.1449-.131-.1267-.047-.36.16-.5333.273-.0238.011-.045.027-.0622.047s-.03.044-.0375.069c-.0076.025-.0097.051-.0063.077s.0122.052.026.074c.0824.097.1957.162.3208.185s.2542.003.3658-.058z"/><path d="m58.7595 120.666c-.2.047-.4467.507-.3.667.1466.16.4333.36.6667 0 .2333-.36-.1667-.74-.3667-.667z"/><path d="m61.6331 123.42c-.0866.093-.2666.38-.0666.573.2.194.4266-.033.4933-.113.0327-.063.0498-.132.0498-.203s-.0171-.141-.0498-.204c-.0222-.034-.0517-.063-.0864-.085s-.0738-.036-.1145-.041-.082-.001-.121.011c-.039.013-.0748.034-.1048.062z"/><path d="m61.7993 121.613c.0734 0 .18-.173.1334-.28-.0467-.107-.2067-.133-.2867-.107-.08.027-.2533.2-.2133.3s.2933.12.3666.087z"/><path d="m62.5402 120.5c-.0241.011-.0432.03-.0533.054-.2067 0-.6667.366-.5334.6.0502.097.1338.173.2355.213.1017.041.2146.043.3179.007.1466-.074.1866-.34.1533-.547h.0733c.0534 0 .2067-.16.16-.28-.0466-.12-.2666-.073-.3533-.047z"/><path d="m54.6666 117.267c-.2.146-.0533.513-.08.726l.1267.074c.0899.022.1848.015.2702-.021s.1567-.099.2031-.179c.0942-.1.1508-.23.16-.367-.22-.067-.4933-.373-.68-.233z"/><path d="m60.1401 118c-.1667.06-.16.44 0 .56.1191.054.2493.079.38.073.2533-.22.3-.486.1333-.573-.0772-.044-.1624-.072-.2506-.082-.0881-.01-.1775-.003-.2627.022z"/><path d="m60.0934 115.333c-.16-.667-.7866-.367-.7333-.8s.4267-.2.46-.82-.48-1.013-.86-.8-.3533.607-.4533.627-.5667 0-.58.353c0 .733.6666.587.6666.807s-.1.666-.04.98c.0867.466.42.84.9.666.1114-.019.2175-.061.3115-.124.0939-.063.1737-.144.234-.24.0603-.095.0999-.203.1162-.314.0163-.112.0089-.226-.0217-.335z"/><path d="m48.8661 107.333c-.039.032-.0705.072-.0921.118-.0216.045-.0328.095-.0328.146 0 .05.0112.1.0328.145.0216.046.0531.086.0921.118.0905.12.2215.203.3687.234.1472.03.3004.006.4313-.067.0999-.11.1637-.247.1828-.394.0191-.146-.0075-.295-.0761-.426-.1933-.2-.6133-.134-.9067.126z"/><path d="m55.3861 113.16c.0864-.134.1271-.293.1163-.453s-.0726-.312-.1763-.433c-.0938-.074-.2079-.117-.327-.125-.1192-.007-.2376.023-.3396.085-.3334.306-.4334.733-.22.946.1401.096.3067.146.4765.142.1698-.003.3342-.06.4701-.162z"/><path d="m47.7398 105.647c-.0804.113-.1236.248-.1236.387 0 .138.0432.273.1236.386.0425.046.094.083.1514.108.0573.025.1193.038.1819.038.0627 0 .1246-.013.182-.038s.1089-.062.1514-.108c.0879-.085.1428-.199.155-.321s-.0191-.244-.0884-.345c-.0979-.089-.2199-.146-.3504-.165-.1306-.019-.2638.001-.3829.058z"/><path d="m51.2534 103.26c-.1743-.121-.3812-.186-.5933-.186-.2467-.087-.8.046-.8867.26-.0867.213.1467.373.3733.46.0416.133.1148.254.2134.353.26.253.5733.213.8866-.113.0814-.113.1258-.247.127-.386s-.0409-.274-.1203-.388z"/><path d="m48.0333 112.7c-.0261.037-.0401.082-.0401.127s.014.09.0401.127c.06.066.22 0 .3067 0 .0866 0 .14-.214.06-.314s-.2934.027-.3667.06z"/><path d="m47.6396 99.5865c-.1533-.28-.2333-.6333-.5933-.78l-.4267.1467c-.108-.0743-.2273-.1306-.3533-.1667.0032-.0154.0032-.0313 0-.0467-.0534-.1266-.2667-.0933-.3067-.06l-.0867.0734c-.0613.0146-.117.0471-.16.0933-.06.0746-.0928.1675-.0928.2633s.0328.1888.0928.2634c.2067.3266.36.3666.7934.2266.2524.1436.5128.2727.78.3867.0534.0135.1096.0122.1623-.0041.0527-.0162.0999-.0467.1364-.088.0366-.0414.061-.092.0706-.1463s.0041-.1102-.016-.1616z"/><path d="m80.9267 132.833c-.0787.033-.1498.082-.2088.143-.059.062-.1046.135-.134.215s-.042.166-.0369.251.0277.168.0664.244c.1.274.4467.36.8267.207.0634-.014.1228-.042.1742-.082s.0935-.091.1234-.148c.0298-.058.0467-.122.0494-.187s-.0088-.13-.0337-.19c-.0872-.14-.209-.255-.3539-.335-.1448-.079-.3076-.12-.4728-.118z"/><path d="m49.9599 105.247c-.1334-.147-.28-.12-.4334.04 0 .06-.0333.166 0 .213.1212.178.1798.392.1667.607 0 .1.22.246.3467.26.0773-.003.1532-.022.2231-.055.0699-.034.1323-.081.1835-.139.021-.062.0283-.128.0214-.194s-.0279-.129-.0614-.186c-.1339-.194-.2833-.376-.4466-.546z"/><path d="m53.0733 113.213c-.1267-.166-.32-.073-.46.06-.14.134-.1667.434 0 .514.1666.08.4266.253.5733.04.1467-.214-.0133-.494-.1133-.614z"/><path d="m53.6466 114.246c-.1366-.056-.29-.056-.4266 0-.1667.094-.14.467.0466.567.1119.036.2301.047.3467.033.2133-.233.2133-.513.0333-.6z"/><path d="m54.3264 109.667c-.1737-.153-.3939-.243-.6251-.255-.2311-.013-.4596.054-.6483.188-.3533.28-.32.833.0667 1.287.0631.077.1411.141.2293.188.0882.046.1849.075.2843.084.0995.008.1997-.003.2947-.034.0949-.03.1828-.08.2584-.145.1802-.164.2941-.388.3199-.63s-.0382-.485-.1799-.683z"/><path d="m51.0131 117.487c-.0511.039-.0926.089-.1211.147s-.0434.122-.0434.186c0 .065.0149.128.0434.186s.07.108.1211.147c.034.043.0766.079.125.104.0484.026.1016.041.1562.045.0546.003.1093-.004.1608-.023.0514-.019.0985-.048.138-.086.2067-.206.28-.62.1333-.766-.1123-.059-.239-.085-.3654-.074-.1263.011-.247.057-.3479.134z"/><path d="m51.1599 114c-.0927.092-.1502.214-.1624.344-.0121.131.0217.261.0957.369.1533.167.54.127.8534-.153 0-.087 0-.274-.04-.387-.0781-.12-.1993-.204-.3385-.237-.1392-.032-.2855-.009-.4082.064z"/><path d="m50.9467 111.246c-.0565.071-.0986.151-.124.237-.0253.087-.0335.177-.0239.267.0194.18.1098.346.2512.46.1415.114.3224.167.5031.148.1806-.02.3462-.11.4602-.252.1213-.103.1984-.249.2158-.408.0173-.158-.0265-.317-.1224-.445-.1632-.134-.3676-.208-.5788-.209-.2113-.001-.4165.07-.5812.202z"/><path d="m47.4332 113.673c-.0666.047-.18.28-.1067.36.0734.08.3201 0 .3734-.04.021-.017.0383-.039.0511-.063.0127-.024.0205-.051.023-.078.0024-.027-.0005-.055-.0086-.081s-.0213-.05-.0389-.071c-.0175-.021-.0389-.038-.0632-.051-.0242-.013-.0507-.021-.0779-.023-.0272-.003-.0547 0-.0808.008-.0261.009-.0504.022-.0714.039z"/><path d="m74 131.293c-.0547 0-.1082.016-.1551.044s-.0854.068-.1116.116c-.04.1.1067.227.1934.253.0866.027.2933-.04.3266-.166.0334-.127-.1666-.247-.2533-.247z"/><path d="m76.1132 132.42c-.0666-.194-.5133-.16-.7533.1s.0667.62.2333.666c.1667.047.5867-.58.52-.766z"/><path d="m76.1534 129.62c-.1-.18-.2467-.293-.44-.227-.4988.141-.9459.423-1.2867.814-.0398.071-.069.147-.0867.226-.0275.105-.0247.216.0082.319.0329.104.0945.196.1776.266s.1843.114.2918.129c.1076.014.2171-.002.3158-.047.3071-.105.5986-.25.8666-.433.131-.137.2162-.312.2437-.499.0274-.188-.0041-.379-.0903-.548z"/><path d="m72.8993 133.067c.017.107.071.205.1525.277.0816.072.1856.113.2942.116.2733-.04.4333-.667.2733-.773-.16-.107-.7466.113-.72.38z"/><path d="m71.8465 135.1c-.1067.06-.3733.273-.2467.52.1267.247.4134.107.5067.053.0551-.044.0986-.102.1264-.167.0279-.065.0395-.136.0336-.206-.0081-.045-.0268-.087-.0544-.123s-.0634-.065-.1044-.085c-.041-.019-.0861-.029-.1315-.027-.0454.001-.0899.013-.1297.035z"/><path d="m73.333 129.22c.0985-.051.1737-.137.2097-.241.0361-.105.0302-.219-.0163-.319-.0172-.048-.0453-.091-.082-.126-.0368-.035-.0812-.061-.1297-.076s-.0998-.019-.1499-.01c-.0501.008-.0975.028-.1385.058-.0628.047-.1154.105-.1544.173s-.0636.143-.0722.221c-.02.133.32.433.5333.32z"/><path d="m72.2268 129.486c-.18 0-.3.367-.1733.54.1267.174.26.154.3333.194.3134-.127.4467-.36.32-.5-.125-.136-.2963-.219-.48-.234z"/><path d="m75.7396 138.373c-.0183.058-.0219.12-.0102.179.0116.059.0381.115.0769.161.0636.038.1361.058.21.058s.1464-.02.21-.058c.0867-.106-.0733-.386-.1533-.426-.0584-.015-.1196-.015-.178 0-.0583.015-.1118.045-.1554.086z"/><path d="m79.5059 134.627c.1092-.026.204-.093.2639-.188s.0801-.209.0561-.319c-.0405-.144-.1364-.266-.2667-.34-.24-.113-.4133 0-.6666.447.1466.213.2466.513.6133.4z"/><path d="m72.1465 127.72c.1129.016.2278.008.3373-.023.1095-.032.211-.087.2979-.16.087-.074.1573-.165.2064-.268s.0758-.215.0784-.329c.06-.667-.6266-.607-.4333-1s.4733-.047.7067-.62c.2333-.573-.12-1.113-.5534-1.04-.4333.073-.5266.453-.6266.447-.1-.007-.54-.187-.6667.14-.2667.666.4067.76.3933.986-.0133.227-.3133.587-.3666.92-.0734.467.1266.927.6266.947z"/><path d="m79.6394 138.38c-.1885.111-.3338.283-.4124.488-.0787.204-.086.429-.0209.638.0835.206.2421.373.4437.467s.4313.108.6429.04c.1894-.148.3353-.345.4221-.569s.1115-.467.0713-.704c-.1099-.195-.2894-.34-.5023-.407-.2129-.066-.4432-.05-.6444.047z"/><path d="m79.3329 132.474c.1031-.059.1814-.153.2201-.265.0388-.112.0353-.234-.0097-.344-.045-.109-.1284-.199-.2347-.251-.1062-.053-.228-.065-.3424-.034-.1105.046-.1998.132-.2504.241-.0506.108-.0587.232-.0229.346.0493.122.1422.221.2606.277.1184.057.2537.068.3794.03z"/><path d="m78.0794 130.793c-.0758-.014-.1538-.009-.2272.015-.0733.023-.1397.064-.1931.12-.0535.055-.0924.123-.1133.197s-.0231.153-.0064.228c.0303.089.0802.169.146.236s.1457.119.234.151c.0845.008.1698-.003.2488-.035.0789-.031.1491-.081.2045-.145.0385-.069.0614-.145.0672-.223.0057-.078-.0058-.156-.0338-.23-.028-.073-.0718-.139-.1283-.193-.0564-.055-.1242-.096-.1984-.121z"/><path d="m76.0395 134.98c-.0861.029-.1653.076-.2329.136-.0676.061-.1221.134-.1601.217-.0381.082-.059.172-.0613.262-.0024.091.0138.181.0476.265.1067.216.2837.389.5018.491s.4643.126.6982.069c.1708-.091.3012-.243.3654-.425.0642-.183.0575-.383-.0187-.561-.042-.107-.1055-.205-.1867-.286-.0811-.082-.1781-.146-.285-.188-.1069-.043-.2213-.063-.3363-.059-.115.003-.228.03-.332.079z"/><path d="m63.7734 126c-.0552.024-.1049.058-.1457.102-.0407.044-.0716.096-.0905.153-.019.057-.0255.117-.0193.177.0063.059.0252.117.0555.168.0173.052.0455.1.0827.14.0371.041.0824.073.1329.094.0504.021.1048.032.1596.031.0548-.002.1087-.014.1581-.038.2667-.12.4734-.493.38-.667-.0926-.089-.2082-.152-.3341-.18s-.2571-.021-.3792.02z"/><path d="m66.8995 131.9c-.0321.036-.0549.079-.0665.125-.0116.047-.0117.095-.0002.142.0347.041.0793.072.1294.091.0502.018.1044.024.1573.016.0666 0 .2333-.167.14-.334-.0934-.166-.28-.08-.36-.04z"/><path d="m67.2792 126.993c-.2334.073-.22.46-.3134.667.0331.036.0643.074.0934.113.0744.055.1643.084.2566.084.0924 0 .1823-.029.2567-.084.1218-.065.2163-.171.2667-.3-.16-.14-.32-.553-.56-.48z"/><path d="m66.9465 125.366c.0467-.126-.1933-.333-.2866-.346-.0608.006-.1187.029-.1678.065-.0492.036-.0879.085-.1122.141.0026.061.0205.121.0519.173s.0755.096.1281.127c.0729.011.1474.002.2155-.026s.1272-.075.1711-.134z"/><path d="m64.7734 119.48c-.1267-.153-.54 0-.6667.347s.2667.567.4467.573c.18.007.3466-.76.22-.92z"/><path d="m66.5994 123.134c.12.113.28.246.44.133s.14-.467.0867-.62c-.0096-.035-.0291-.067-.0563-.092-.0271-.025-.0608-.042-.097-.048.0019-.194-.0695-.382-.2-.527-.0749-.087-.1669-.158-.2704-.209-.1036-.05-.2163-.079-.3314-.084-.115-.005-.2298.014-.3373.055-.1075.042-.2054.104-.2876.185-.1295.104-.2157.252-.2416.416s.0104.332.1016.471c-.0514-.032-.1087-.052-.1684-.06s-.1204-.004-.1783.013c-.1215.057-.2187.155-.2737.278-.0551.122-.0644.26-.0263.389.0934.2.4667.293.86.133 0-.087.12-.253.0867-.38-.014-.05-.0366-.097-.0667-.14.1443.083.3049.134.4706.149.1657.014.3326-.007.4894-.062z"/><path d="m64.0797 117.88c.0836-.173.1106-.367.077-.557-.0335-.189-.1257-.362-.2636-.496-.0579-.073-.1414-.12-.2333-.132-.0919-.013-.1851.011-.2601.065-.429.293-.7591.709-.9466 1.194-.013.079-.013.16 0 .24.0062.11.044.217.1089.307s.1542.159.2573.2c.1031.04.2157.051.3245.029.1088-.021.2092-.073.2893-.15.2437-.205.461-.44.6466-.7z"/><path d="m69.6459 126.067c-.1675.07-.3044.198-.3862.361-.0818.162-.1032.349-.0604.525.0892.158.2295.282.3979.349.1684.068.3548.077.5287.025.24-.094.3667-.58.24-.907-.0232-.071-.0605-.137-.1095-.193-.049-.057-.1088-.103-.1759-.136-.0671-.032-.1402-.052-.2148-.056s-.1493.007-.2198.032z"/><path d="m70.0529 131.526c-.2067 0-.5867.334-.5134.56.0734.227.2934.487.6667.254.3733-.234.0533-.787-.1533-.814z"/><path d="m68.1934 127.474s.1066.08.12.066c.0133-.013.1199-.093.1-.153-.02-.06-.0934-.047-.1467-.067-.034.046-.0589.098-.0733.154z"/><path d="m69.8466 130.82c.0933 0 .3333-.167.28-.367-.0534-.2-.36-.14-.4467-.1s-.24.167-.1733.327c.0302.06.0813.108.1438.133.0625.026.1321.028.1962.007z"/><path d="m71.2662 123.913c-.1679-.146-.3852-.224-.6079-.216-.2227.007-.4343.099-.5921.256-.1415.167-.2225.378-.2297.597-.0073.219.0596.434.1897.61.1468.167.3516.272.573.295.2215.022.4431-.041.6203-.175.1362-.2.2129-.435.2211-.677.0083-.242-.0522-.481-.1744-.69z"/><path d="m69.3329 123.333c.127-.098.2185-.236.2606-.391s.0325-.319-.0273-.469c-.0628-.103-.1566-.183-.2679-.23s-.2345-.057-.3521-.03c-.4133.18-.6667.547-.5133.827.1006.137.2415.238.4029.291s.3352.053.4971.002z"/><path d="m69.3327 124.76c-.1133-.173-.4933-.167-.6333-.113-.0458.022-.0862.054-.1183.094-.0322.039-.0554.085-.0681.135-.0126.049-.0145.101-.0053.151.0091.05.029.098.0583.14.0178.042.0456.08.0811.11.0355.029.0776.05.1228.06s.0921.008.1367-.004.0856-.035.1194-.066c.1134-.087.4134-.334.3067-.507z"/><path d="m174.579 74.8867h-8.253v8.2534h8.253z"/><path d="m193.666 93.9736h-8.253v8.2534h8.253z"/><path d="m174.579 93.9736h-8.253v8.2534h8.253z"/><path d="m155.499 74.8867h-8.253v8.2534h8.253z"/><path d="m155.499 93.9736h-8.253v8.2534h8.253z"/><path d="m134.393 74.8867h-8.253v8.2534h8.253z"/></g><path d="m105.439 32.8135c-8.4385 0-16.6877 2.5023-23.7042 7.1906s-12.4852 11.3519-15.7145 19.1482c-3.2294 7.7963-4.0743 16.3752-2.428 24.6517s5.7099 15.879 11.677 21.846c5.967 5.967 13.5695 10.031 21.846 11.677 8.2767 1.646 16.8557.801 24.6517-2.428s14.46-8.698 19.148-15.7145 7.191-15.2657 7.191-23.7044c0-11.3159-4.495-22.1683-12.497-30.1698-8.002-8.0016-18.854-12.4968-30.17-12.4968zm0 69.3935c-5.291 0-10.4642-1.569-14.8639-4.5094-4.3997-2.94-7.8287-7.1187-9.8534-12.0076-2.0248-4.8889-2.5542-10.2685-1.5213-15.4583 1.0328-5.1898 3.5815-9.9568 7.3236-13.698 3.7422-3.7413 8.5098-6.2888 13.7-7.3203 5.19-1.0315 10.569-.5008 15.458 1.5251 4.888 2.0259 9.066 5.456 12.005 9.8565 2.939 4.4004 4.507 9.5735 4.505 14.8651 0 3.513-.692 6.9916-2.036 10.2371-1.345 3.2455-3.315 6.1943-5.8 8.678-2.484 2.4838-5.433 4.4538-8.679 5.7978s-6.725 2.035-10.238 2.034z" fill="#1ba9f5"/><path d="m133.935 93.1051-10.465 10.4649 27.143 27.144 10.465-10.465z" fill="#0a89db"/><path d="m73.0864 74.8332c.0636.0134.1293.0139.193.0012.0638-.0127.1243-.0382.178-.075.0536-.0368.0992-.0841.1339-.139.0348-.0549.0581-.1164.0684-.1806.0109-.1304-.0228-.2607-.0954-.3697-.0726-.1089-.18-.1901-.3046-.2303-.1378.0177-.268.0732-.3762.1602-.1082.0871-.1903.2024-.2371.3332-.0267.16.24.46.44.5z" fill="#0d90e0"/><path d="m83.3734 59.4865c.1466.0533.2333-.18.2266-.2267-.0066-.0466-.0333-.22-.1733-.2466-.0225-.0072-.0464-.0092-.0697-.0056-.0234.0035-.0456.0124-.065.026-.0194.0135-.0353.0314-.0467.0521-.0113.0208-.0177.0439-.0186.0675-.0067.0933-.0067.28.1467.3333z" fill="#0d90e0"/><path d="m84.3733 58.993c.1533-.2.3067-.4066.4733-.6-.0408-.0455-.0908-.0818-.1466-.1066-.28-.0867-.6667.0866-.6667.32-.0333.12.1467.2733.34.3866z" fill="#0d90e0"/><path d="m69.1263 76.9668c.0618.0065.1243.0005.1838-.0176s.1148-.0479.1626-.0876c.0479-.0398.0873-.0887.1159-.1439.0287-.0552.046-.1155.051-.1775.0533-.28-.14-.6667-.38-.6667-.1454-.0263-.2954.0039-.4193.0845-.1239.0805-.2124.2053-.2474.3488-.0168.0796-.0157.1618.0032.2409.019.079.0553.1528.1064.2161.0511.0632.1157.1142.189.1494.0733.0351.1535.0534.2348.0536z" fill="#0d90e0"/><path d="m69.4525 68.9864.22-.2266h-.7067c.1434.1107.3096.1882.4867.2266z" fill="#0d90e0"/><path d="m65.3335 70.3871c.0622.0203.1282.0261.1929.0168.0647-.0092.1265-.0332.1805-.0701.1466-.1157.2535-.2741.3061-.4532.0526-.1792.0481-.3703-.0128-.5468-.0255-.1082-.0917-.2024-.1847-.2632-.0931-.0608-.206-.0835-.3153-.0635-.1643.0143-.3192.083-.44.1954-.1207.1123-.2005.2618-.2267.4246-.0033.06-.0033.1201 0 .18v.04c.15.1948.3174.3755.5.54z" fill="#0d90e0"/><path d="m67.186 68.7598h-.4067.0533c.115.0363.2384.0363.3534 0z" fill="#0d90e0"/><path d="m63.5527 77.1999c.0099.1677.0577.331.1396.4776.082.1466.1961.2728.3338.3691.28.08.6133-.2.7066-.6.0934-.4-.06-.5734-.5-.6667-.0722-.0178-.1473-.021-.2208-.0094-.0735.0115-.144.0376-.2073.0767s-.1182.0905-.1614.151c-.0433.0606-.074.1291-.0905.2017z" fill="#0d90e0"/><path d="m68.8467 73.7733c.1219-.1799.1763-.3972.1533-.6133-.08-.2067-.3333-.34-.5333-.5334.1066-.1866.2333-.42 0-.6666-.62 0-.6667.1266-.3867.6666-.1206.224-.1996.4679-.2333.72.0432.2332.1573.4474.3267.6134.1733.2133.4933.12.6733-.1867z" fill="#0d90e0"/><path d="m64.3734 72.4263c.1515.1886.3536.3302.5827.4081.229.078.4756.089.7107.0319.3266-.1467.2533-.5867.34-.6667.0866-.08.5933.2334.9866 0 .179-.1336.3117-.3198.3798-.5325.0682-.2127.0682-.4414.0002-.6541-.0824-.2574-.2617-.4726-.5-.6-.1574-.0702-.3323-.0919-.5021-.0622s-.3269.1094-.4512.2288c-.2067.26-.2133.7667-.3333.82-.12.0534-.6-.2866-.98-.0533-.0885.0536-.1652.1246-.2253.2088-.06.0842-.1023.1798-.1241.2809-.0219.1011-.0228.2056-.0029.3071.02.1015.0604.1979.1189.2832z" fill="#0d90e0"/><path d="m70.046 75.5604c.0843-.0022.1672-.0224.243-.0592.0759-.0368.1431-.0893.197-.1541.1934-.34-.0466-.5533-.32-.7533-.26.1066-.5533.2066-.5466.5466-.0019.0563.0078.1123.0287.1646.0208.0522.0523.0996.0924.1391.0401.0394.088.0702.1406.0902s.1087.0289.1649.0261z" fill="#0d90e0"/><path d="m77.246 56.2935c.2733.0734.5933-.22.6666-.6133.0139-.0479.0173-.0982.01-.1475-.0074-.0493-.0253-.0964-.0525-.1382-.0272-.0417-.0631-.0772-.1052-.1038s-.0895-.0438-.1389-.0505c-.32-.0933-.7067.0733-.76.3133-.02.1474.0057.2974.0736.4298.068.1323.1749.2406.3064.3102z" fill="#0d90e0"/><path d="m75.2391 58.6202c-.08.16.1.5467.3067.6667.0451.0212.0942.0322.144.0324.0498.0001.099-.0107.1441-.0317.0452-.021.0852-.0516.1172-.0898.032-.0381.0552-.0828.068-.1309.14-.3467.1267-.62-.04-.7067-.1353-.0266-.2753-.0165-.4054.0292s-.2456.1254-.3346.2308z" fill="#0d90e0"/><path d="m76.6063 61.3331h.52c.1724-.0978.3011-.2575.36-.4467.0049-.1202-.0305-.2386-.1005-.3365-.0701-.0978-.1708-.1694-.2862-.2035-.46-.0733-.8.0667-.8467.3533.0021.1266.0354.2506.0971.3611.0616.1105.1497.2041.2563.2723z" fill="#0d90e0"/><path d="m80.7929 56.1531c.0521.0163.1069.0219.1612.0166.0543-.0054.107-.0216.1548-.0477.0479-.0261.0901-.0616.124-.1044.0339-.0427.0588-.0919.0733-.1445.0106-.0487.0112-.099.0017-.1479-.0095-.049-.0289-.0954-.057-.1366s-.0642-.0762-.1063-.103c-.0421-.0267-.0892-.0446-.1384-.0525-.0433-.013-.0888-.0171-.1338-.012s-.0884.0193-.1277.0418c-.0393.0224-.0737.0526-.1009.0888-.0272.0361-.0468.0775-.0576.1214-.0203.0448-.031.0934-.0315.1426s.0093.0979.0288.1431c.0194.0452.0481.0858.0842.1193.036.0334.0787.059.1252.075z" fill="#0d90e0"/><path d="m80.0793 57.3334c-.3333-.0734-.5667.1066-.6667.52-.1.4133.12.5666.5267.6666.1142.0375.2384.0301.3474-.0207.1089-.0508.1945-.1411.2393-.2526.0169-.1786-.0158-.3584-.0946-.5196-.0789-.1612-.2007-.2975-.3521-.3937z" fill="#0d90e0"/><path d="m80.2996 53.3797c.1133-.0733.0866-.3866.1-.5933.0047-.0255.0041-.0518-.0019-.0771-.006-.0252-.0172-.049-.0329-.0697s-.0355-.0379-.0582-.0505-.0478-.0203-.0737-.0227c-.1275.0049-.2493.0542-.3443.1394-.095.0853-.1571.201-.1757.3273.003.0676.0227.1334.0576.1914.0348.058.0835.1065.1418.1409.0582.0344.1242.0538.1918.0563s.1348-.0119.1955-.042z" fill="#0d90e0"/><path d="m79.1662 56.8003c.1324.0166.2667-.007.3855-.0676.1189-.0606.2168-.1555.2811-.2724.0081-.1445-.0312-.2878-.1118-.408-.0805-.1203-.1981-.2111-.3348-.2586-.1201-.0152-.2414.0176-.3375.0912s-.1593.1822-.1759.3021c-.0328.1204-.0213.2486.0326.3613.0538.1126.1464.202.2608.252z" fill="#0d90e0"/><path d="m77.4933 57.1604c-.0614.0449-.113.1017-.152.167-.0389.0653-.0643.1377-.0747.213 0 .0934.14.2467.2467.2934.2158.0863.4389.1532.6666.2.2.0466.3067-.0534.34-.2734-.0333-.0466-.06-.1533-.12-.1733-.2016-.0804-.3705-.2259-.48-.4133-.0649-.036-.1375-.056-.2117-.0583-.0742-.0024-.1479.0131-.2149.0449z" fill="#0d90e0"/><path d="m73.3328 60.1803c-.0467-.28-.1134-.5533-.4534-.5133s-.3733.3-.34.5667c.0514.0567.1149.101.1858.1297.071.0287.1475.0409.2238.0357.0764-.0051.1505-.0274.217-.0653s.1235-.0904.1668-.1535z" fill="#0d90e0"/><path d="m76.9463 75.1269c.1173.0247.2395.0075.3454-.0485.1059-.0561.1889-.1474.2346-.2581.0128-.1305-.011-.262-.0687-.3797-.0577-.1178-.147-.2171-.258-.287-.1281-.0081-.2557.0233-.3654.0901s-.1962.1657-.2479.2832c-.02.0631-.0264.1297-.0187.1954.0077.0658.0293.1291.0634.1858.034.0568.0797.1056.1341.1434.0544.0377.1161.0634.1812.0754z" fill="#0d90e0"/><path d="m77.3991 76.8667c.1758.041.3605.0187.5215-.063.1609-.0817.2879-.2176.3585-.3837.06-.2334-.3866-.7334-.6666-.7867-.1547-.0061-.3062.0452-.4253.1441s-.1973.2384-.2197.3916c-.0223.1532.0128.3092.0986.438.0859.1288.2164.2213.3664.2597z" fill="#0d90e0"/><path d="m74.5999 69.1536v.12c-.0733.1866-.1867.26-.36.12-.06-.0534-.1-.1334-.1667-.18-.1337-.0909-.2916-.1395-.4533-.1395s-.3196.0486-.4533.1395c-.143.0768-.2531.2032-.3095.3554-.0565.1522-.0555.3197.0028.4712.0482.1932.1452.3707.2818.5154.1366.1448.3082.252.4982.3113-.0549.1805-.0929.3658-.1133.5533 0 .5467.36.76.84.4867.0942-.0398.177-.1025.2408-.1825.0638-.0799.1066-.1746.1245-.2753s.0103-.2043-.0221-.3013-.0885-.1844-.1632-.2542c-.132-.1312-.2723-.2536-.42-.3667.1866-.1133.3066-.2533.4266-.2533.0812.0065.1628-.004.2395-.0311.0768-.027.1471-.0699.2062-.1259.0591-.0559.1057-.1237.1369-.1989s.0462-.1561.0441-.2375c.0274-.0961.0678-.1881.12-.2733.14-.3067.1067-.54-.0933-.6667h-.32c-.0746.0444-.1388.1043-.1882.1756-.0495.0713-.0831.1524-.0985.2378z" fill="#0d90e0"/><path d="m72.2794 72.4402c-.34 0-.7133-.1067-.9866.26-.0651.1-.1527.1834-.2557.2435-.103.0602-.2186.0955-.3377.1032-.1614.0266-.3091.1069-.4192.2279-.11.121-.1761.2756-.1874.4387.0895.2225.223.4245.3926.5941.1695.1695.3716.3031.594.3926.34-.1533.7934-.34 1.24-.5467.0534 0 .08-.1866.0667-.2733-.0186-.1171-.0128-.2367.017-.3514.0298-.1148.0831-.2221.1563-.3153.2-.2933.0267-.76-.28-.7733z" fill="#0d90e0"/><path d="m74.5134 72.86c-.2934-.0666-.5734.2267-.6667.6667-.0009.1289.0403.2547.1173.3581.077.1035.1856.179.3094.2152.1486.0016.2951-.0358.4249-.1083s.2384-.1776.3151-.305c.0128-.1727-.0284-.3451-.118-.4932s-.2232-.2647-.382-.3335z" fill="#0d90e0"/><path d="m77.9997 71.593c-.206-.0599-.4272-.0388-.6181.0592-.1909.0979-.3371.2652-.4086.4675-.0057.2394.0532.476.1705.6848.1174.2088.2887.3822.4962.5018.2127.0283.4283-.0246.6037-.1482.1754-.1235.2979-.3086.343-.5184.0308-.2147-.0099-.4336-.116-.6228-.106-.1892-.2715-.3382-.4707-.4239z" fill="#0d90e0"/><path d="m75.8197 78.5868c-.32-.0667-.5466.1333-.6666.56s.0533.6267.3133.6667c.1756-.0046.3478-.049.5037-.1298.1559-.0809.2914-.1961.3963-.3369.027-.1731-.0152-.3499-.1175-.4921s-.2565-.2385-.4292-.2679z" fill="#0d90e0"/><path d="m78.7058 74.9466c0-.4444.02-.8889.06-1.3333-.1687.1362-.2843.3273-.3267.54-.0287.144-.0193.293.0275.4322s.1293.2637.2392.3611z" fill="#0d90e0"/><path d="m78.8729 78.5339c0-.2134-.0467-.4334-.0667-.6667-.06.0867-.1067.1867-.1467.2466-.04.06.0067.3401.2134.4201z" fill="#0d90e0"/><path d="m68.1792 75.9999c-.0194-.0917-.058-.1783-.1131-.2541-.0551-.0759-.1256-.1392-.2069-.1859-.3734-.1467-.4867.2067-.7.4533.1933.32.3666.5667.7333.4467.0497-.0101.0968-.0303.1385-.0592.0416-.029.0769-.0661.1038-.1092.0268-.043.0446-.0911.0522-.1412.0076-.0502.005-.1013-.0078-.1504z" fill="#0d90e0"/><path d="m76.9727 69.6337c-.0639-.1859-.193-.3423-.3634-.4403-.1703-.0981-.3704-.1311-.5633-.093-.1773.0951-.315.2503-.3883.4378s-.0774.3949-.0116.5851c.0659.1902.1973.3508.3707.4528.1735.1021.3777.1391.5759.1043.3267-.0667.4533-.5867.38-1.0467z" fill="#0d90e0"/><path d="m65.0327 76.26c-.06.22.0933.58.2933.5933.3141.071.6432.0261.9267-.1267.4-.2866.4267-.3266.1933-.84-.24 0-.4333-.06-.6266-.1-.1656-.0237-.3343.0105-.4776.0967s-.2525.2193-.3091.3767z" fill="#0d90e0"/><path d="m79.1602 59.8931c.04-.3-.2934-.6667-.6667-.7267s-.5933.1467-.6667.5933c-.0099.1414.0255.2822.101.4021.0755.1198.1873.2125.319.2646.2667.0333.88-.3.9134-.5333z" fill="#0d90e0"/><path d="m74.4527 57.1998c.1017.032.2092.0416.315.0282s.2074-.0495.298-.1059c.0905-.0563.1678-.1316.2265-.2206.0588-.089.0976-.1896.1138-.2951.0445-.1871.0189-.3841-.0721-.5536-.0909-.1695-.2407-.2998-.4212-.3664-.3533-.1133-.8267.26-.9467.7467-.0237.0825-.0297.1691-.0174.254.0122.085.0423.1664.0883.2388.046.0725.1068.1344.1785.1816s.1526.0787.2373.0923z" fill="#0d90e0"/><path d="m74.9 60.967c.0013-.0497-.0081-.099-.0275-.1447-.0195-.0457-.0485-.0867-.0852-.1202-.0366-.0335-.0801-.0588-.1274-.074-.0472-.0153-.0972-.0202-.1466-.0144-.3733 0-.6266.12-.6666.3066.0123.0807.0404.1582.0828.228.0423.0697.098.1305.1638.1787h.5934c.1079-.094.1827-.2202.2133-.36z" fill="#0d90e0"/><path d="m72.466 69.2198c.0552-.0625.0972-.1354.1235-.2144.0264-.0791.0365-.1626.0299-.2456h-2.58c.0933.3733 0 .52-.42.3933-.1745-.0606-.365-.0562-.5364.0124-.1715.0685-.3125.1967-.397.3609-.1054.1366-.1626.3042-.1626.4767s.0572.3401.1626.4767c.0424.076.1.1424.1694.1949s.149.0899.2336.11c.0847.0201.1726.0223.2582.0065.0855-.0157.1669-.0492.2388-.0981.2292-.1347.4251-.3193.5734-.54.1266-.1733.2333-.3.4533-.2867.32 0 .4267-.1733.4267-.4666.1006.0929.2204.1626.3508.2044.1305.0418.2685.0546.4044.0374.1359-.0171.2664-.0638.3824-.1366.116-.0729.2146-.1702.289-.2852z" fill="#0d90e0"/><path d="m70.5463 71.8337c.0526.1091.1404.1974.2492.2506s.2324.0682.3508.0428c.1117-.0023.219-.0446.3021-.1192.0832-.0747.1369-.1767.1512-.2875.04-.34-.4533-.8733-.6666-.84-.1459.108-.2592.2541-.3275.4223-.0682.1682-.0887.3519-.0592.531z" fill="#0d90e0"/><path d="m69.5935 71.7863c-.1275-.0234-.2592-.0007-.3716.064-.1123.0647-.198.1673-.2417.2894-.0339.1459-.0204.2988.0383.4366s.1597.2534.2883.33c.1755.0442.3608.0265.5247-.05s.2965-.2072.3753-.37c.06-.2666-.2066-.56-.6133-.7z" fill="#0d90e0"/><path d="m72.2127 58.5135c0-.2534-.12-.3734-.34-.42-.0587-.0158-.1201-.0195-.1802-.0108-.0602.0088-.118.0297-.1698.0615-.0518.0319-.0965.0739-.1315.1237-.035.0497-.0594.1061-.0719.1656-.0094.0542-.0074.1098.006.1632.0134.0535.0378.1035.0718.1468.0339.0434.0766.0791.1252.105.0486.0258.1021.0411.157.045.1208.0176.2436-.0121.343-.0829s.1676-.1773.1904-.2971z" fill="#0d90e0"/><path d="m67.7533 76.9133c-.32-.0867-.54.2267-.6.4067s.2866.5333.6666.4333c.0689-.0283.1304-.0717.18-.1272.0497-.0554.0862-.1213.1067-.1928.0125-.0575.0133-.1169.0021-.1746-.0112-.0578-.034-.1127-.067-.1613-.0331-.0487-.0757-.0901-.1253-.1217-.0496-.0317-.1051-.0529-.1631-.0624z" fill="#0d90e0"/><path d="m67.3334 74.3735c-.4467-1.1467-1.12-1.2467-1.88-.3333-.0796-.0184-.1576-.0429-.2333-.0734-.115-.0615-.2497-.0751-.3746-.0376-.125.0375-.23.1229-.2921.2376-.0729.1034-.112.2269-.112.3534s.0391.2499.112.3533c.3133.6667.6133.7667 1.1867.4667.4333-.22.88-.4267 1.3333-.6667.5333.84.6667.8667 1.1867.32-.0135-.1048-.0493-.2054-.1049-.2952s-.1298-.1666-.2176-.2254c-.0878-.0587-.1871-.098-.2913-.1151-.1042-.0172-.2109-.0118-.3129.0157z" fill="#0d90e0"/><path d="m71.2198 60.7134c-.0194.0515-.0275.1066-.0235.1615.0039.055.0198.1084.0464.1565.0266.0482.0634.0901.1078.1226.0444.0326.0954.0551.1493.0661.115.0382.2403.0295.3489-.0242.1086-.0536.1917-.148.2311-.2625.0116-.0583.0114-.1183-.0005-.1765s-.0354-.1134-.0689-.1624c-.0335-.0491-.0765-.0909-.1264-.1232-.0499-.0322-.1057-.0542-.1642-.0646-.053-.0138-.1082-.0168-.1624-.0087-.0542.008-.1062.0269-.1529.0556-.0467.0286-.0871.0664-.1189.111-.0317.0447-.0541.0953-.0658.1488z" fill="#0d90e0"/><path d="m80.1133 61.3335h.76c-.0404-.0731-.1072-.128-.1867-.1534-.0662-.0206-.1363-.0253-.2046-.0138-.0684.0116-.133.0392-.1887.0805-.0533.0267-.12.0467-.18.0867z" fill="#0d90e0"/><path d="m67.526 85.4937c-.1686-.0366-.3447-.0142-.4989.0635-.1541.0776-.2768.2058-.3477.3632-.0339.1281-.0175.2643.0457.3808.0631.1164.1684.2044.2943.2459.1573.0273.3192-.0028.4562-.0848.137-.0819.2401-.2104.2904-.3619.0252-.0555.039-.1154.0405-.1763.0015-.0608-.0093-.1214-.0317-.178s-.0559-.1082-.0987-.1515c-.0427-.0434-.0938-.0777-.1501-.1009z" fill="#0d90e0"/><path d="m71.2595 82.9801c.18.0159.3603-.0277.5132-.124s.2701-.2401.3335-.4093c.0667-.26-.2133-.6067-.5467-.6667-.4333-.0933-.6666 0-.7666.3467-.0304.1741-.0008.3533.084.5083s.2197.2767.3826.345z" fill="#0d90e0"/><path d="m71.4735 84.1397c0-.1467-.0533-.5267-.2267-.5533-.1733-.0267-.3533.3333-.38.4666-.0266.1334.16.26.28.3067s.3467-.0133.3267-.22z" fill="#0d90e0"/><path d="m72.5133 86.3537c-.1667 0-.5867.0733-.6134.24-.0266.1667.3134.3933.46.4733.1467.08.3934-.1133.42-.3266.0267-.2134-.0533-.3934-.2666-.3867z" fill="#0d90e0"/><path d="m71.5331 90.8738c-.0842.033-.1525.097-.191.1789-.0384.0818-.044.1753-.0156.2611.0866.3401.3533.3801.6666.3934.1467-.2667.3601-.48.1334-.74-.0728-.0818-.1718-.1358-.28-.1529-.1082-.017-.2189.0041-.3134.0595z" fill="#0d90e0"/><path d="m69.3929 83.3332c-.2373-.0378-.4804.0022-.693.1139-.2127.1117-.3835.2893-.487.5061-.0343.209.0073.4234.1174.6044.11.181.2812.3166.4826.3823.2051.0478.4207.0187.6058-.0819s.3268-.2655.3983-.4637c.0715-.1981.0679-.4156-.0103-.6112-.0782-.1955-.2254-.3556-.4138-.4499z" fill="#0d90e0"/><path d="m70.6125 78.1469c-.0704-.0614-.1207-.1425-.1445-.2328-.0237-.0904-.0198-.1858.0112-.2739.002-.1405-.0503-.2764-.1459-.3794-.0956-.1031-.2272-.1653-.3675-.1739-.2933 0-.3733.1534-.3933.3934.0056.1742-.0286.3475-.1.5066-.2.32-.4533.6067-.6667.9267-.9066-.2533-1.18-.0933-1.1933.74-.0134.1043-.0001.2103.0387.3081.0388.0977.1018.184.1832.2507.0813.0666.1783.1115.2818.1304.1034.0189.21.0111.3096-.0225.351-.148.686-.3312 1-.5467.1706.1356.3776.2176.5949.2354.2172.0178.4348-.0294.6252-.1354.121-.11.2172-.2446.2819-.3948.0648-.1502.0967-.3126.0935-.4761-.0031-.1636-.0413-.3245-.1118-.4721s-.1717-.2785-.297-.3837z" fill="#0d90e0"/><path d="m67.5597 82.8198c-.2248.0333-.4475.0801-.6667.14-.4467-.3467-.8867-.4067-1.0933-.1467-.0962.1764-.1319.3794-.1018.578.0301.1987.1244.382.2684.522.3.2467.5067.1733 1.02-.4133.2467.18.48.3933.7534.0933.0808-.0769.1323-.1795.1457-.2902.0133-.1107-.0122-.2226-.0724-.3165-.0667-.08-.18-.1733-.2533-.1666z" fill="#0d90e0"/><path d="m69.1664 87.1465c-.1832-.0094-.3636.0485-.5072.1626-.1436.1142-.2406.2768-.2728.4574-.0734.3867.16.6667.6066.74.0876.0248.1794.0302.2693.0158.0898-.0143.1754-.048.2509-.0987.0755-.0508.139-.1174.1862-.1951.0472-.0778.0768-.1649.087-.2553.0266-.1918-.0236-.3863-.1397-.5411-.1162-.1549-.2888-.2575-.4803-.2856z" fill="#0d90e0"/><path d="m72.9999 89.1399c-.0866 0-.28-.0534-.34.0866s.1134.26.16.26c.0503-.0006.1-.0116.1459-.0323.0458-.0206.087-.0505.1208-.0877 0 0-.04-.2133-.0867-.2266z" fill="#0d90e0"/><path d="m69.1395 81.3335c.0075-.0749-.001-.1505-.0252-.2218-.0241-.0713-.0633-.1366-.1148-.1915-.0505-.0362-.1089-.0598-.1703-.0691s-.1241-.0039-.183.0158c-.26.1466-.2534.38-.12.6666.2333.0134.5.0867.6133-.2z" fill="#0d90e0"/><path d="m73.0065 80.0737c.0242-.1471-.0086-.2978-.0915-.4217-.083-.1238-.21-.2114-.3552-.245-.098-.0245-.2018-.0096-.289.0415-.0873.0511-.151.1343-.1776.2319-.0475.1017-.0589.2167-.0322.3257.0267.1091.0897.2059.1788.2743.0634.0388.134.0643.2076.0749.0735.0105.1485.006.2202-.0133.0718-.0193.1389-.0531.1971-.0992.0583-.0462.1065-.1037.1418-.1691z" fill="#0d90e0"/><path d="m78.7664 84.2871c.0038-.1542-.0459-.3048-.1408-.4264-.0948-.1215-.2288-.2064-.3792-.2403-.32-.0733-.5333.04-.6.32-.0532.1834-.0379.3799.043.5528.081.173.2221.3106.397.3872.1648-.0041.3229-.0656.4471-.174.1242-.1083.2066-.2567.2329-.4193z" fill="#0d90e0"/><path d="m78.3332 80.6668c.1-.4134-.2133-.7934-.7467-.9134-.0907-.029-.1865-.0383-.2811-.0272s-.1856.0424-.2671.0917c-.0815.0492-.1515.1154-.2053.194-.0537.0785-.0901.1677-.1065.2615-.0425.2257.0028.4591.1268.6525.1239.1933.3171.332.5399.3875.2066.0137.4118-.0426.5823-.16.1706-.1173.2966-.2888.3577-.4866z" fill="#0d90e0"/><path d="m73.6661 81.833c-.0933.0933-.2933.2067-.3733.3733-.08.1667.1266.5134.4066.5534.055.0074.111.0035.1644-.0115s.1032-.0408.1463-.0758.0786-.0784.1043-.1276c.0256-.0492.041-.1031.045-.1585.0023-.1373-.0471-.2705-.1385-.373-.0914-.1026-.2181-.1669-.3548-.1803z" fill="#0d90e0"/><path d="m73.0535 54.2596c.2131.0163.4254-.0409.6013-.1623.176-.1213.305-.2994.3654-.5044.015-.1768-.0408-.3523-.1552-.488-.1144-.1356-.278-.2203-.4548-.2353s-.3524.0408-.488.1552c-.1357.1144-.2203.278-.2353.4548-.0503.1522-.0403.3179.0279.463s.1894.2586.3387.317z" fill="#0d90e0"/><path d="m76.8199 88.7002c-.068-.0724-.1501-.1302-.2412-.1697-.0912-.0394-.1895-.0598-.2888-.0598-.0994 0-.1977.0204-.2888.0598-.0912.0395-.1733.0973-.2412.1697-.0759.1198-.1117.2606-.1021.4021s.064.2762.1554.3846c.075.112.19.1911.3215.2208.1314.0298.2693.008.3852-.0608.2066-.1.6666-.1867.7066-.5267s-.2866-.3066-.4066-.42z" fill="#0d90e0"/><path d="m77.7792 68.7598c-.0173.1024-.001.2076.0466.3.1375.2623.3554.4737.6217.6033.2663.1295.5671.1704.8583.1167.0756-.3423.1556-.6823.24-1.02z" fill="#0d90e0"/><path d="m74.7861 81.6662c.1165.0263.2388.0063.3408-.056.1021-.0622.1759-.1617.2058-.2774.0239-.1237-.0024-.2519-.073-.3563s-.1799-.1765-.3036-.2003c-.0613-.0118-.1243-.0115-.1855.0011-.0611.0125-.1192.0369-.1709.0719-.1044.0707-.1764.1799-.2003.3036-.0001.116.0376.2289.1073.3215.0698.0926.1679.16.2794.1919z" fill="#0d90e0"/><path d="m75.9998 83.4203c.0096-.1126-.0246-.2246-.0953-.3127-.0708-.0881-.1727-.1456-.2847-.1606-.3667-.0467-.6667.3733-.6667.52.0464.1379.1367.257.2571.3388.1203.0819.2642.1221.4096.1145.1164-.0166.2216-.0783.2927-.172.0711-.0936.1025-.2114.0873-.328z" fill="#0d90e0"/><path d="m74.4267 77.2334-.04-.06c.0836.0923.1829.169.2933.2267.0393.0246.084.0393.1303.0429.0463.0035.0927-.0042.1353-.0226.0427-.0183.0802-.0467.1094-.0828s.0492-.0787.0583-.1242c.0224-.0458.0345-.096.0352-.147.0008-.051-.0097-.1016-.0307-.1481s-.052-.0877-.0908-.1208c-.0388-.0332-.0845-.0573-.1337-.0708-.1518-.0122-.3041.0178-.44.0867.0184-.1031-.0031-.2092-.06-.2971s-.1451-.1508-.2466-.1762c-.0736-.0154-.1498-.013-.2223.0069-.0724.0199-.1391.0568-.1945.1077-.0554.0508-.0979.1141-.1239.1846-.0261.0705-.035.1461-.026.2208 0 .32-.18.4133-.3733.5933-.4934-.5067-.92-.4733-1.2267.06-.032.0505-.0588.1041-.08.16-.1533.3933-.0467.62.3533.7333.4.1134.6667.1534.9534-.3266.0557.1571.0915.3206.1066.4866-.0219.1104-.0001.2249.0608.3195.061.0945.1563.1617.2659.1872.1195.0536.2522.0708.3814.0495.1292-.0214.2493-.0803.3453-.1695.64-.7133.6533-.9933.06-1.72z" fill="#0d90e0"/><path d="m74.9791 85.9998c-.1094-.0152-.2208.0067-.3163.0623s-.1696.1417-.2103.2444c-.0178.1194.003.2413.0594.348.0563.1068.1453.1927.2539.2453.1094.0227.2232.0029.3186-.0552.0953-.0582.1649-.1505.1947-.2581.0282-.1175.0134-.2412-.0416-.3488-.055-.1075-.1466-.1919-.2584-.2379z" fill="#0d90e0"/><path d="m78.8194 87.0601c-.0521-.0174-.1071-.0241-.1619-.0197-.0547.0044-.1079.0198-.1565.0454-.0486.0255-.0915.0606-.1262.1032-.0346.0425-.0603.0917-.0755.1444-.0223.1093-.0041.2229.051.3198.0552.0969.1437.1704.249.2069.0515.0207.1067.0301.1621.0276.0553-.0025.1095-.0169.1588-.0422s.0926-.0609.127-.1044.059-.0938.0722-.1476c.0198-.11.0007-.2234-.054-.3207-.0548-.0974-.1418-.1726-.246-.2127z" fill="#0d90e0"/><path d="m69.8128 55.2067c.1204.0138.2421-.012.3467-.0733s.1864-.1549.2333-.2667c.1066-.44-.0467-.8467-.3467-.9067-.171-.0024-.3384.0491-.4784.1473-.14.0981-.2455.2379-.3016.3994-.06.24.26.6533.5467.7z" fill="#0d90e0"/><path d="m66.6134 93.0799c-.0057-.0601-.0315-.1165-.0734-.16z" fill="#0d90e0"/><path d="m65.9993 60.3004c.1466 0 .4133 0 .4666-.1734.0534-.1733-.1266-.38-.2533-.4933s-.2867 0-.3867.12l-.0666.18c-.0133.04-.0173.0824-.0118.1242s.0203.0818.0433.117c.0231.0352.0538.0648.0899.0865.0361.0218.0766.0351.1186.039z" fill="#0d90e0"/><path d="m67.1664 61.333h.4133c.0931-.0709.1966-.1271.3067-.1667.1399-.0288.2645-.1077.3505-.2218.0859-.1142.1272-.2557.1161-.3982 0-.3333-.2266-.6667-.18-.7933.0467-.1267.1534-.3334.3934-.24.24.0933.6266-.0467.7933-.5467s-.2733-1.04-.6667-.9267c-.3933.1134-.4.3534-.5333.2934s-.3133-.3267-.5533-.2267-.2534.8733-.1934.9867c.06.1133.3467.3466.1534.5333-.1934.1867-.5267.2333-.5867.5067-.06.2733-.2266.9133.1267 1.1867z" fill="#0d90e0"/><path d="m68.1727 57.0195c.46.16.76-.2533.9066-.4733.1467-.22-.2666-.6667-.6666-.6667-.1115-.012-.2235.0183-.3137.085-.0901.0667-.1519.1649-.173.275-.1067.2867.0133.7.2467.78z" fill="#0d90e0"/><path d="m71.4802 55.6471c-.0562.2366-.0242.4856.0899.7003.1141.2148.3026.3806.5301.4664.2317.0296.4666-.0202.6663-.1413.1998-.1211.3527-.3063.4337-.5254.1266-.4266-.2-.8666-.78-1.0266-.0963-.0284-.1973-.0372-.2971-.0259-.0997.0112-.1962.0423-.2838.0914-.0875.049-.1644.1151-.2261.1943s-.1069.1699-.133.2668z" fill="#0d90e0"/><path d="m70.2797 56.5466c-.119-.0227-.2421.0004-.3447.0647s-.1772.165-.2087.2819c-.0143.1107.0134.2227.0776.314.0641.0913.1601.1553.2691.1794.0529.0194.1092.0272.1654.0229.0561-.0043.1106-.0206.1599-.0477.0493-.0272.0922-.0647.1258-.1098.0336-.0452.0571-.0971.0689-.1521.0192-.0569.0262-.1171.0205-.1769-.0057-.0597-.0239-.1176-.0535-.1698-.0295-.0522-.0698-.0976-.1181-.1332s-.1036-.0606-.1622-.0734z" fill="#0d90e0"/><path d="m71.153 53.167c.2067.0734.3133-.12.3467-.3066.0333-.1867-.1-.4467-.2934-.42-.1933.0266-.4866 0-.4933.2866-.0067.2867.2933.3934.44.44z" fill="#0d90e0"/><path d="m69.4132 59.913c-.0026.2195.0672.4338.1986.6097.1313.1759.3168.3037.528.3637.2667.0466.5533-.2267.6133-.5934.06-.3666-.0933-.6666-.5533-.7533-.36-.0667-.7333.1067-.7866.3733z" fill="#0d90e0"/><path d="m70.0995 52.6663c.0727-.0122.1422-.0392.2041-.0794.0619-.0401.115-.0925.1559-.1539.0866-.1733-.1467-.4667-.3534-.4467-.114.0303-.2192.0875-.3066.1667-.0467.28.1066.5133.3.5133z" fill="#0d90e0"/><path d="m66.413 80.3798c.133-.0482.2622-.1061.3867-.1734.4133-.2.5533-.46.44-.8066-.0288-.0903-.0751-.174-.1363-.2463-.0611-.0723-.136-.1319-.2202-.1752-.0842-.0434-.1762-.0697-.2706-.0774-.0944-.0078-.1894.0032-.2796.0322-.4359.126-.8821.213-1.3333.26-.3667 0-.78.3067-.7534.56.0383.1099.1107.2048.2066.2707.0959.066.2104.0996.3268.096.32-.1067.4133.12.6066.2333.1941.0891.4067.1302.62.12.1408-.0014.2795-.0332.4067-.0933z" fill="#0d90e0"/><path d="m64.2527 85.5404c-.0784-.0226-.1616-.0226-.24 0l.22.8733c.0897-.0122.1732-.0523.239-.1144.0658-.0622.1104-.1434.1277-.2322.009-.1139-.0202-.2275-.083-.3229s-.1556-.1671-.2637-.2038z" fill="#0d90e0"/><path d="m64.5927 82.4329c-.0253-.1546-.0868-.301-.1795-.4273s-.2139-.2289-.3538-.2994c-.2533-.0666-.44.0934-.5133.4467-.0734.3533 0 .6133.2866.6667.3867.0933.7067-.0734.76-.3867z" fill="#0d90e0"/><path d="m67.0595 80.4529c-.1286-.0341-.2651-.0228-.3865.0318s-.2203.1493-.2801.2682c-.1334.4467 0 .86.28.94.1706.0227.3439-.0122.4924-.0992.1485-.0869.2638-.2209.3276-.3808.0315-.1576.005-.3213-.0746-.461-.0796-.1396-.207-.2458-.3588-.299z" fill="#0d90e0"/><path d="m65.5734 86.9202c-.034-.0022-.0677.0081-.0947.0289-.0271.0209-.0455.0509-.0519.0845 0 .04.0733.1266.1066.1266.0289.0038.0582-.002.0835-.0164.0253-.0145.0451-.0368.0565-.0636.004-.0171.0045-.0347.0016-.052s-.0091-.0339-.0184-.0487c-.0093-.0149-.0214-.0278-.0357-.0379-.0143-.0102-.0304-.0174-.0475-.0214z" fill="#0d90e0"/><path d="m63.4666 75.82c.0578-.1456.0683-.3058.03-.4577-.0383-.152-.1234-.288-.2433-.3889-.0728-.0301-.1521-.041-.2303-.0317-.0782.0094-.1527.0386-.2164.085v.4333.86h.0467c.1891.0311.3831-.0067.5467-.1066.0586-.0451.0981-.1107.1105-.1836.0123-.0729-.0033-.1479-.0439-.2098z" fill="#0d90e0"/><path d="m63.3327 72.2663c.0993-.1541.1366-.3401.1044-.5206-.0321-.1806-.1313-.3422-.2777-.4527.0858-.0603.1583-.1374.2133-.2267.0494-.0826.0754-.177.0754-.2733 0-.0962-.026-.1907-.0754-.2733.0688.0059.138.0059.2067 0 .2453-.0561.4604-.2025.6025-.41.142-.2076.2007-.4611.1642-.71.0651.0204.1349.0204.2 0 .0474-.0272.0886-.0639.121-.1079s.0553-.0942.0672-.1475c.0119-.0534.0126-.1086.002-.1621-.0106-.0536-.0322-.1044-.0636-.1492h-.54c-.0696.0818-.1075.1859-.1066.2933-.0974-.0869-.2182-.1434-.3473-.1624-.1292-.0189-.2611.0004-.3794.0558-.1933 1.2466-.32 2.52-.4 3.8066.14-.1.2933-.2333.4333-.56z" fill="#0d90e0"/><path d="m33.5663 123.433c-.2927 0-.58-.079-.832-.228-.2521-.149-.4597-.362-.6013-.618-.629-1.159-1.1877-2.355-1.6733-3.58-.0784-.2-.1167-.412-.1129-.626s.0498-.425.1352-.622c.0854-.196.2087-.373.3627-.522s.3358-.265.535-.344c.1991-.078.4118-.117.6258-.113s.4251.05.6214.135c.1962.086.3737.209.5223.363s.2655.336.3438.535c.4318 1.102.9328 2.175 1.5 3.214.1374.247.2077.526.2037.809s-.082.56-.2263.803c-.1443.244-.3499.445-.5962.584-.2463.14-.5249.212-.8079.21zm-3.44-10.826c-.4007-.001-.7869-.15-1.0846-.419-.2977-.268-.486-.636-.5287-1.035-.1201-1.073-.1802-2.153-.18-3.233 0-.24 0-.487 0-.733.0122-.431.1943-.84.5065-1.137s.7292-.459 1.1602-.45c.2136.006.424.054.619.141.1951.088.371.213.5177.368.1468.155.2614.338.3375.538.076.2.112.413.1058.626v.667c0 .962.0534 1.924.16 2.88.0467.429-.0787.858-.3487 1.195-.2701.336-.6626.551-1.0913.598zm1.1267-11.274c-.172 0-.3429-.027-.5067-.08-.2031-.066-.3912-.172-.5535-.311-.1622-.139-.2955-.309-.392-.5-.0966-.191-.1547-.399-.1709-.6117-.0162-.2131.0098-.4274.0764-.6305.4094-1.2638.9107-2.496 1.5-3.6866.1919-.3872.5297-.6824.9391-.8205.4095-.1382.8571-.108 1.2443.0838s.6823.5297.8205.9391c.1381.4095.108.857-.0839 1.2442-.5253 1.0472-.971 2.1325-1.3333 3.2462-.1062.326-.312.61-.5884.812-.2763.202-.6092.312-.9516.315zm5.8-9.7332c-.3189 0-.6308-.0937-.8969-.2695-.266-.1759-.4745-.426-.5996-.7194-.125-.2934-.161-.6171-.1036-.9308.0575-.3137.2059-.6036.4268-.8336.9152-.9554 1.8953-1.8464 2.9333-2.6667.1641-.1567.3591-.2773.5725-.3541.2135-.0769.4406-.1082.6669-.0921.2263.0162.4467.0795.6471.1859.2003.1064.3762.2535.5163.432.1402.1784.2414.3841.2973.604s.0651.449.0272.6727c-.0379.2236-.1222.4369-.2475.626-.1252.1892-.2887.3501-.4798.4723-.9195.7312-1.7882 1.5242-2.6 2.3733-.1512.1538-.3319.2756-.5312.358-.1993.0825-.4131.124-.6288.122zm9.3333-6.4333c-.3761.0051-.7424-.1203-1.0364-.3549-.2941-.2346-.4977-.5639-.5763-.9317-.0786-.3679-.0273-.7516.1452-1.0859s.4555-.5984.8009-.7475c1.203-.513 2.4338-.9581 3.6866-1.3333.2045-.0631.4193-.0852.6323-.0652s.4199.0817.6091.1817c.1891.1.3567.2362.4931.401.1365.1647.2392.3547.3022.5591.063.2045.0852.4193.0652.6323s-.0817.4199-.1817.6091c-.1.1891-.2362.3567-.401.4931-.1647.1365-.3547.2392-.5592.3022-1.1339.3465-2.2469.7582-3.3333 1.2333-.2015.0685-.4142.0979-.6267.0867zm33.88-2.6667c-.4314.0045-.8469-.1627-1.1551-.4646-.3082-.302-.4838-.7139-.4882-1.1454-.0044-.4314.1627-.8469.4647-1.1551.3019-.3082.7139-.4838 1.1453-.4882 1.2333 0 2.48-.0667 3.7067-.12.4314-.0203.8532.1315 1.1727.4222.3194.2907.5103.6964.5306 1.1278s-.1315.8532-.4222 1.1727c-.2907.3194-.6964.5103-1.1278.5306-1.26.0534-2.5333.1-3.7933.12zm-7.68 0h-.0466c-1.24-.0311-2.5-.0777-3.78-.14-.2136-.01-.4232-.0621-.6167-.1531-.1935-.0911-.3672-.2193-.5111-.3775s-.2553-.3432-.3277-.5444c-.0725-.2012-.1046-.4147-.0945-.6283.01-.2136.0621-.4232.1531-.6167.0911-.1935.2194-.3671.3775-.5111.1582-.1439.3432-.2553.5444-.3277.2012-.0725.4147-.1046.6283-.0945 1.2533.06 2.4933.1067 3.7133.1333.4143.0312.8012.219 1.0819.5253s.4341.7081.429 1.1235c-.0051.4155-.1683.8133-.4564 1.1127-.2882.2993-.6795.4776-1.0945.4985zm-15.1733-.1066c-.4214.0075-.8292-.1488-1.1376-.436-.3085-.2872-.4934-.6829-.5159-1.1037-.0224-.4209.1193-.834.3954-1.1524s.665-.5172 1.0848-.5546c1.2533-.14 2.5533-.2267 3.8666-.2667.2151-.0107.4302.022.6323.0963s.3871.1887.544.3362.2823.3252.3689.5224.1324.4098.1348.6251c.0063.2137-.0297.4264-.1057.6262-.0761.1997-.1908.3825-.3375.5379s-.3226.2804-.5177.3678c-.1951.0873-.4054.1354-.6191.1415-1.2266.04-2.4466.12-3.6133.2466zm34.26-.5534c-.4199.0035-.8248-.1555-1.1302-.4437-.3053-.2883-.4873-.6834-.508-1.1028s.1217-.8305.3972-1.1474.6628-.5149 1.081-.5527c1.2333-.1267 2.4733-.2734 3.6733-.4334.2119-.028.4272-.014.6337.0412.2064.0552.4.1505.5696.2805s.312.2922.419.4772c.1069.185.1764.3893.2044.6011.028.2119.014.4272-.0412.6337-.0552.2064-.1505.4-.2805.5696s-.2921.312-.4771.419c-.1851.1069-.3893.1764-.6012.2044-1.2333.1667-2.5.3133-3.7733.4467zm11.333-1.7066c-.402-.0003-.791-.15-1.09-.4201-.298-.2702-.486-.6416-.527-1.0424s.069-.8024.307-1.1271c.239-.3247.589-.5493.984-.6304 1.213-.2534 2.426-.52 3.6-.8134.42-.1025.863-.034 1.233.1904.369.2244.634.5864.737 1.0063.102.4199.034.8634-.191 1.2328-.224.3695-.586.6346-1.006.7372-1.213.2933-2.467.5733-3.72.8333-.114.0018-.228-.0071-.34-.0266zm10.994-3.0267c-.386.0007-.759-.1357-1.054-.3848-.294-.249-.49-.5946-.554-.975-.063-.3804.011-.7709.209-1.1019.198-.3309.507-.5808.872-.705 1.167-.4 2.327-.8266 3.44-1.2733.401-.16.85-.154 1.247.0166.397.1707.71.492.87.8934s.154.8498-.017 1.2468-.492.7099-.893.8699c-1.167.46-2.38.9066-3.594 1.3333-.17.0557-.348.0827-.526.08zm10.473-4.5467c-.36-.0033-.709-.1257-.993-.3482-.284-.2224-.486-.5324-.575-.8816s-.06-.7181.083-1.0491c.142-.331.39-.6056.705-.7811 1.087-.5866 2.14-1.2066 3.14-1.84.18-.1147.382-.1927.592-.2296.211-.037.426-.0321.635.0143.209.0465.406.1335.581.2563.175.1227.324.2787.439.459.114.1804.192.3816.229.5921s.032.4262-.014.6348-.134.4061-.256.5811c-.123.1749-.279.324-.459.4387-1.06.6667-2.18 1.3333-3.334 1.9533-.228.128-.485.1968-.746.2zm9.333-6.52c-.328-.0008-.648-.101-.919-.2874-.27-.1863-.478-.4502-.595-.7567-.118-.3066-.14-.6416-.063-.9609.076-.3194.247-.6081.491-.8283.9-.82 1.76-1.6667 2.553-2.5267.292-.3182.698-.5076 1.129-.5263.432-.0188.853.1346 1.171.4263.318.2918.508.698.526 1.1293.019.4314-.134.8525-.426 1.1707-.86.9334-1.793 1.86-2.78 2.7467-.285.2555-.651.4019-1.033.4133zm7.167-8.8333c-.283.0005-.562-.0729-.808-.213-.246-.1402-.451-.3421-.595-.5859-.144-.2437-.222-.5209-.226-.8041-.004-.2831.065-.5625.202-.8103.347-.6667.667-1.28.967-1.92.193-.44.393-.88.593-1.3334.088-.1956.213-.3721.369-.5194s.339-.2624.539-.3389c.2-.0764.414-.1127.628-.1067s.425.0542.621.1417.372.2128.519.3685c.148.1558.263.3391.339.5393.077.2003.113.4136.107.6279s-.054.4253-.142.621l-.606 1.3333c-.334.7267-.667 1.4467-1.087 2.1533-.134.2483-.331.4572-.57.6057-.24.1486-.515.2317-.797.241zm-9.133-8.0867c-.208-.0011-.414-.0419-.607-.12-1.199-.4887-2.37-1.0452-3.507-1.6666-.195-.0972-.369-.2328-.511-.3986-.142-.1659-.249-.3586-.315-.5667s-.089-.4274-.069-.6447c.021-.2173.085-.4283.189-.6203s.245-.3612.416-.4974c.17-.1362.367-.2367.577-.2954.21-.0588.43-.0746.647-.0466.216.028.425.0993.613.2097 1.048.57 2.127 1.0797 3.233 1.5266.354.1394.648.3983.831.7318.182.3334.242.7203.17 1.0935-.073.3732-.275.709-.569.9492-.295.2402-.665.3695-1.045.3655zm13.586-2.4533c-.172-.0005-.343-.0275-.506-.08-.204-.0671-.392-.1736-.554-.3136-.162-.1399-.295-.3104-.391-.5018s-.153-.3999-.168-.6135c-.016-.2135.012-.428.079-.6311.394-1.2067.747-2.38 1.027-3.4933.107-.4182.376-.7767.747-.9968.371-.22.815-.2835 1.233-.1766.418.107.777.3757.997.747.22.3714.283.8149.176 1.233-.3 1.1867-.666 2.4334-1.093 3.7134-.108.3246-.316.607-.593.8068-.278.1999-.612.3072-.954.3065zm-23.086-3.6933c-.218.0007-.434-.0426-.634-.1274-.201-.0848-.382-.2093-.533-.366-.954-.975-1.803-2.0475-2.533-3.2-.231-.3651-.307-.8069-.212-1.2282.095-.4214.353-.7877.718-1.0184.365-.2308.807-.307 1.229-.212.421.095.787.3535 1.018.7186.608.9614 1.316 1.8553 2.113 2.6667.223.2293.373.5192.432.8334s.024.6388-.1.9333c-.125.2944-.333.5457-.6.7224-.266.1766-.579.2709-.898.2709zm25.333-7.4867h-.04c-.214-.0052-.424-.0524-.62-.139-.195-.0866-.371-.2108-.519-.3656-.147-.1548-.262-.3371-.339-.5365-.077-.1993-.114-.4119-.109-.6256 0-.2133 0-.42 0-.6266.004-.9481-.063-1.8952-.2-2.8334-.031-.2114-.021-.427.031-.6344.052-.2073.144-.4025.271-.5743s.287-.3168.47-.4269c.184-.11.387-.1828.598-.2144.212-.0315.427-.021.635.0307.207.0518.402.144.574.2712s.317.287.427.4703.183.3864.214.5978c.165 1.1035.245 2.2178.24 3.3334v.7133c-.017.4256-.201.8274-.511 1.1191s-.723.45-1.149.4409zm-30-2.6667c-.416.0119-.82-.1353-1.131-.4116s-.505-.6608-.542-1.075c0-.42-.04-.8534-.04-1.28v-.1067c.006-.9106.077-1.8196.213-2.72.033-.2114.108-.4142.22-.5968.111-.1826.258-.3415.431-.4674.173-.126.369-.2167.577-.2669.208-.0501.424-.0588.635-.0256.212.0333.415.1079.597.2195.183.1117.342.2582.468.4312.126.1731.216.3692.266.5773.051.208.059.4239.026.6354-.115.739-.175 1.4855-.18 2.2333v.0333c0 .36 0 .7067.04 1.0534.029.4312-.113.8565-.397 1.1827-.284.3261-.685.5265-1.116.5573zm26.893-8.0933c-.248.0011-.493-.0549-.716-.1635-.223-.1087-.418-.2671-.57-.4632-.688-.8757-1.483-1.6619-2.367-2.34-.169-.1313-.311-.2947-.418-.4808-.106-.1862-.174-.3915-.201-.6041-.055-.4295.064-.8629.329-1.2051.265-.3421.655-.5649 1.085-.6192.429-.0544.863.064 1.205.3292 1.103.8456 2.095 1.8266 2.953 2.92.187.2401.303.5279.335.8307.032.3027-.022.6083-.155.8819-.134.2737-.341.5044-.599.666s-.556.2475-.861.2481zm-23.533-2.5c-.316.0003-.625-.0914-.89-.2639s-.473-.4183-.6-.7075c-.128-.2892-.168-.6092-.116-.9209.051-.3117.192-.6016.406-.8344.965-1.058 2.089-1.9578 3.333-2.6666.375-.214.82-.2702 1.236-.1565.416.1138.77.3883.984.7631.214.3749.271.8193.157 1.2357-.114.4163-.388.7704-.763.9843-.941.5319-1.793 1.2066-2.527 2-.152.1796-.343.3235-.557.4214s-.447.1475-.683.1453zm14-3.4667c-.142-.0002-.283-.0204-.42-.06-1.089-.2946-2.207-.4668-3.333-.5133-.214-.0086-.424-.0592-.618-.149s-.369-.2169-.513-.3742c-.145-.1573-.258-.3416-.331-.5424-.074-.2007-.107-.4141-.098-.6277.024-.4292.214-.832.53-1.1232s.733-.4479 1.163-.4368c1.37.0567 2.73.2669 4.053.6266.383.1006.716.3374.937.666s.315.7265.263 1.1191c-.051.3925-.244.7529-.543 1.0133-.298.2605-.681.4033-1.077.4016z" fill="#294492"/><path d="m139.447 49.7266c-.62.4333-8.36 5.0333-15.687 6.2466 3.363 3.1587 5.851 7.1336 7.223 11.5384s1.581 9.0897.606 13.5991c-.974 4.5095-3.098 8.6901-6.167 12.1355-3.068 3.4455-6.975 6.0385-11.342 7.5268.42 5.374.98 10.74 1.58 16.1 6.853-1.696 13.179-5.066 18.409-9.808s9.202-10.7073 11.56-17.362c2.357-6.6547 3.026-13.7904 1.947-20.7674s-3.872-13.5772-8.129-19.209z" fill="#1ba9f5"/><path d="m133.333 107.814c.021-.047.037-.097.047-.147-.207.18-.4.36-.607.527.121-.001.239-.037.338-.105.1-.068.177-.164.222-.275z" fill="#0066b1"/><path d="m137.907 105.913c.183.031.371.015.545-.047.175-.062.332-.167.455-.306.021-.128.004-.259-.048-.377s-.137-.219-.246-.29c0-.226-.18-.366-.52-.44-.143-.028-.293 0-.416.078-.124.078-.214.2-.25.342.004.186.062.367.166.52.008.106.04.208.094.298.055.09.13.167.22.222z" fill="#0066b1"/><path d="m139.187 104.52c.313.073.642.03.926-.12l.047-.04c.077.006.155-.012.222-.05.068-.037.123-.095.158-.164.039-.17.032-.349-.022-.515-.054-.167-.153-.316-.285-.431-.06-.03-.126-.046-.193-.049s-.134.008-.197.033c-.063.024-.12.061-.167.109-.048.047-.085.104-.109.167-.146.003-.288.049-.407.134-.118.084-.209.202-.26.339-.073.213.087.573.287.587z" fill="#0066b1"/><path d="m138.666 103.333c0-.053-.04-.167-.093-.187-.157-.089-.281-.227-.353-.393-.154.18-.3.367-.46.547.17.092.346.175.526.246.154.1.274.014.38-.213z" fill="#0066b1"/><path d="m137.373 103.713c-.067.08-.134.153-.207.227.037-.01.073-.023.107-.04.029-.023.052-.051.07-.083.017-.032.027-.068.03-.104z" fill="#0066b1"/><path d="m137 107.7c.011.062.041.12.084.167.044.046.101.078.163.093.106 0 .193-.154.186-.26-.006-.107-.113-.234-.226-.214-.055.005-.106.029-.143.069-.038.039-.061.09-.064.145z" fill="#0066b1"/><path d="m137.653 112.04c.066-.167.106-.354-.1-.467-.117-.045-.247-.043-.362.006-.116.048-.208.139-.258.254.08.107.153.293.293.38s.353.02.427-.173z" fill="#0066b1"/><path d="m135.693 110.733c.16.105.35.154.54.14.111.032.225.05.34.053.06-.1.12-.193.167-.286.057-.039.11-.081.16-.127-.031-.192-.083-.379-.153-.56-.061-.138-.166-.251-.299-.321-.134-.071-.287-.094-.435-.066-.168.038-.317.133-.422.269-.105.137-.158.306-.151.478.012.083.04.164.083.236.044.072.102.135.17.184z" fill="#0066b1"/><path d="m140.786 99.9467-.26-.2533-.193.28c.151.0316.307.022.453-.0267z" fill="#0066b1"/><path d="m130.133 110.227.106.113c.032-.035.057-.076.074-.12.003-.044.003-.089 0-.133z" fill="#0066b1"/><path d="m141.639 105.426c.071-.028.135-.072.185-.129.051-.056.088-.124.109-.197.013-.055.015-.112.005-.167-.009-.056-.029-.109-.059-.157-.029-.047-.068-.089-.114-.121-.046-.033-.097-.056-.152-.069-.32-.093-.54.22-.6.4s.28.534.626.44z" fill="#0066b1"/><path d="m130.354 110.42.32.32c-.014-.08-.053-.153-.11-.211-.057-.057-.131-.095-.21-.109z" fill="#0066b1"/><path d="m138.453 110.1c-.028-.154-.092-.3-.185-.426-.094-.126-.215-.229-.355-.3-.064-.017-.13-.017-.194 0h-.04c-.076.044-.14.106-.188.18-.047.074-.077.159-.085.246-.087.394 0 .607.287.667.386.113.706-.053.76-.367z" fill="#0066b1"/><path d="m136.626 112.347c.147-.033.407-.16.393-.287-.018-.071-.052-.138-.101-.194-.049-.055-.11-.098-.179-.126-.106 0-.433.114-.453.24-.02.127.273.38.34.367z" fill="#0066b1"/><path d="m143.66 111.333h-.08c-.067-.137-.184-.242-.327-.293-.236-.039-.479 0-.692.111-.212.11-.383.286-.488.502-.037.209.003.425.114.607.11.181.283.316.486.38.206.05.423.023.61-.076.187-.1.331-.265.403-.464.034-.147.034-.3 0-.447.023-.012.041-.031.054-.053.017-.021.03-.047.035-.074.006-.027.004-.055-.003-.081-.008-.027-.023-.051-.042-.07-.02-.02-.044-.034-.07-.042z" fill="#0066b1"/><path d="m142.993 108.993c.011-.074.005-.149-.018-.219-.024-.071-.063-.135-.116-.188-.05-.039-.109-.064-.172-.075-.063-.01-.127-.005-.188.015-.253.147-.253.38-.113.667.233.02.493.093.607-.2z" fill="#0066b1"/><path d="m141.713 112.893c.047.088.124.156.217.192.093.035.196.036.289.002.207-.1.214-.254 0-.667-.067-.021-.138-.023-.207-.007-.068.015-.132.049-.183.097s-.089.109-.11.176c-.02.067-.022.139-.006.207z" fill="#0066b1"/><path d="m144.666 104.886c-.078-.036-.163-.055-.25-.055-.086 0-.171.019-.25.055-.088-.075-.197-.121-.313-.133-.287 0-.367.153-.387.393-.009.126-.029.251-.06.374-.005-.031-.018-.059-.038-.082-.02-.024-.046-.042-.075-.052-.021-.008-.044-.012-.067-.011s-.046.007-.066.017c-.021.01-.039.024-.054.041-.015.018-.026.038-.033.06 0 .093-.053.28.087.353h.06c-.167.24-.36.48-.554.727-.9-.253-1.173-.093-1.186.747-.014.104 0 .21.038.308.039.097.102.184.184.25.081.067.178.112.281.131.104.019.21.011.31-.023.161-.053.315-.124.46-.213.247.187.473.48.86.467l.327-.314c.42.067.806-.046.873-.28.023-.064.029-.134.017-.202-.011-.068-.04-.131-.084-.184.12-.232.161-.496.118-.754-.043-.257-.169-.493-.358-.673-.053-.051-.096-.112-.126-.18.098.077.222.113.346.1.22-.1.174-.733-.06-.867z" fill="#0066b1"/><path d="m147.507 106.726h.08l-.4-.4c-.002.094.029.185.087.258.059.073.141.123.233.142z" fill="#0066b1"/><path d="m146.846 106-.94-.934-.066.094c-.029.053-.053.109-.074.166-.153.387-.046.614.354.727.116.051.243.073.369.063.127-.009.25-.049.357-.116z" fill="#0066b1"/><path d="m146.866 107.747c.017-.076.018-.153.005-.229-.014-.076-.042-.149-.083-.214-.042-.065-.096-.121-.159-.165s-.134-.076-.21-.092c-.048-.014-.099-.018-.149-.012-.051.006-.099.023-.143.048-.043.026-.081.06-.111.101s-.052.087-.063.136c-.049.101-.06.215-.034.323.027.108.091.204.18.27.061.041.13.069.202.082.071.014.145.013.217-.003.071-.015.139-.045.199-.087s.11-.096.149-.158z" fill="#0066b1"/><path d="m140.547 109.333c.17.022.342-.013.489-.1.148-.087.262-.221.324-.38.031-.159.003-.324-.08-.464-.082-.14-.212-.245-.366-.296-.083-.02-.17-.021-.253-.002-.083.018-.161.056-.227.109.048-.092.081-.191.1-.294l.12-.053c.42-.207.56-.467.446-.813-.059-.182-.188-.332-.358-.419-.169-.088-.366-.105-.548-.048-.437.125-.883.214-1.334.267-.36 0-.773.3-.746.553.026.253.42.407.533.367.287-.1.393.08.56.2-.003.031-.003.062 0 .093.035.128.106.243.204.333.098.089.219.15.349.174.089.015.181.01.267-.015.087-.026.167-.071.233-.132-.126.467 0 .867.287.92z" fill="#0066b1"/><path d="m141.72 103.253c-.374-.147-.494.213-.7.453.193.32.366.567.733.447.05-.01.097-.03.138-.059.042-.029.077-.066.104-.11.027-.043.045-.091.052-.141.008-.05.005-.101-.007-.15-.045-.183-.16-.341-.32-.44z" fill="#0066b1"/><path d="m141.693 101.02c.043.233.157.447.327.613.065.061.151.094.24.094s.174-.033.24-.094l-.794-.793c-.017.058-.022.12-.013.18z" fill="#0066b1"/><path d="m143.113 103.567c-.139-.017-.28.017-.395.097-.116.08-.198.2-.231.336-.017.077-.016.157.001.234s.05.15.097.213c.048.063.108.115.177.153s.146.061.225.067c.125.009.249-.031.345-.112s.156-.197.168-.322c.053-.306-.167-.66-.387-.666z" fill="#0066b1"/><path d="m143.899 103.227c.047.006.094.006.14 0l-.533-.534c-.007.047-.007.094 0 .14.003.104.046.202.119.275s.171.115.274.119z" fill="#0066b1"/><path d="m134.973 107.933c-.16.367-.086.667.18.78.173.032.351.014.514-.053.052.244.195.458.4.6.4.207.92.153.973-.247.023-.361-.081-.72-.293-1.013-.14-.26-.507-.167-.374-.487.114-.255.144-.54.087-.813.133-.017.26-.066.37-.143s.2-.178.263-.297c.024-.117.008-.239-.045-.347-.053-.107-.14-.194-.248-.246-.44-.154-.8-.074-.893.206-.032.16-.003.326.08.467-.157-.007-.312.032-.446.113-.134.08-.241.199-.308.34-.094-.188-.252-.337-.446-.42-.347.334-.7.66-1.06.98.028.123.091.235.181.324.089.088.202.149.325.176.193.001.382-.047.551-.139s.312-.226.416-.387c.019.072.053.14.1.2-.079.042-.149.1-.205.17s-.097.15-.122.236z" fill="#0066b1"/><path d="m138.393 102.54c.313.666.613.766 1.186.466.434-.22.874-.426 1.334-.633.533.84.666.867 1.18.327-.007-.142-.058-.277-.147-.388-.089-.11-.21-.189-.347-.226.048-.035.085-.084.107-.14.02-.046.03-.096.029-.146s-.012-.1-.034-.145c-.021-.045-.052-.086-.09-.118-.039-.033-.083-.057-.132-.071-.04-.02-.083-.031-.128-.033-.045-.003-.089.004-.131.02s-.08.04-.112.071c-.033.031-.058.068-.075.109-.44-.747-1.034-.72-1.687.067-.075-.016-.149-.039-.22-.067-.233.3-.473.593-.713.887z" fill="#0066b1"/><path d="m144.16 116.447c.064-.116.088-.25.069-.382-.019-.131-.081-.252-.176-.345-.128-.131-.268-.25-.42-.353-.01-.033-.024-.064-.04-.094 0-.073 0-.153 0-.233-.003-.181-.06-.356-.163-.505-.103-.148-.248-.262-.417-.328-.177-.039-.36-.033-.534.019-.174.051-.332.145-.459.274-.092.105-.142.24-.14.38.001.131.033.261.095.377.061.116.15.215.258.29 0 .326.2.573.607.633.047.003.093.003.14 0v.107c0 .346.127.473.46.513.142.027.289.007.419-.056.13-.064.236-.168.301-.297z" fill="#0066b1"/><path d="m146.373 114c-.167 0-.587.073-.614.24-.026.167.314.393.46.473.147.08.394-.113.414-.326.02-.214-.047-.387-.26-.387z" fill="#0066b1"/><path d="m147.52 109.5c-.094.093-.294.207-.367.373-.073.167.127.514.407.554.054.006.11.002.163-.014.053-.015.103-.041.145-.076.043-.035.079-.078.105-.126.026-.049.042-.103.047-.158 0-.138-.051-.271-.143-.373-.093-.103-.22-.167-.357-.18z" fill="#0066b1"/><path d="m145.393 118.54c-.085.032-.154.096-.193.178s-.044.176-.013.262c.086.34.353.38.666.394.147-.26.36-.48.127-.74-.073-.081-.17-.134-.277-.151s-.216.003-.31.057z" fill="#0066b1"/><path d="m146.86 116.807c-.087 0-.28-.053-.347.087-.066.14.12.26.167.26.05 0 .1-.01.147-.031.046-.021.087-.051.12-.089 0 0-.04-.214-.087-.227z" fill="#0066b1"/><path d="m145.006 112c.153.06.347 0 .327-.22s-.06-.52-.227-.553c-.167-.034-.36.333-.38.466-.02.134.16.307.28.307z" fill="#0066b1"/><path d="m145.333 114.707c.058-.034.107-.083.14-.141.034-.059.051-.125.051-.192 0-.068-.017-.134-.051-.192-.033-.059-.082-.108-.14-.142-.353-.12-.573.287-.5.487.05.083.127.146.218.179s.191.033.282.001z" fill="#0066b1"/><path d="m148.833 113.646c-.108-.015-.218.006-.312.061-.094.054-.167.139-.208.239-.019.119 0 .241.055.348s.144.193.252.246c.109.024.224.005.32-.053.095-.059.165-.152.193-.261.031-.116.017-.24-.038-.347-.056-.107-.149-.19-.262-.233z" fill="#0066b1"/><path d="m152.626 111.953c.01-.058.01-.116 0-.174l-.513-.52c-.32-.066-.527.04-.593.32-.1.4.119.88.433.94.16-.004.313-.062.435-.165.123-.103.207-.245.238-.401z" fill="#0066b1"/><path d="m152.666 114.726c-.052-.017-.107-.024-.161-.02-.055.005-.108.02-.157.046-.048.025-.091.06-.126.103s-.06.092-.076.144c-.022.109-.005.222.049.319.054.096.141.17.245.208.051.021.106.03.162.028.055-.003.109-.017.159-.042.049-.026.092-.061.127-.105.034-.043.059-.094.072-.148.021-.109.004-.222-.05-.32-.053-.097-.14-.173-.244-.213z" fill="#0066b1"/><path d="m150.667 116.367c-.069-.071-.151-.128-.242-.167s-.189-.059-.288-.059c-.1 0-.198.02-.289.059s-.173.096-.241.167c-.076.12-.112.261-.103.402.01.142.065.276.156.385.074.111.187.19.318.22.13.03.267.008.382-.06.213-.1.667-.187.707-.527s-.274-.307-.4-.42z" fill="#0066b1"/><path d="m149.866 111.087c.008-.113-.028-.225-.1-.313s-.174-.146-.287-.161c-.154-.003-.305.046-.426.141-.122.095-.207.229-.241.379.048.144.144.268.271.35.127.083.279.119.429.104.111-.024.209-.089.274-.182.066-.092.094-.206.08-.318z" fill="#0066b1"/><path d="m145.12 110.667c.18.016.36-.028.513-.124.153-.097.27-.24.334-.41.066-.26-.214-.606-.547-.666-.433-.094-.667 0-.767.346-.03.174-.001.354.084.509s.22.276.383.345z" fill="#0066b1"/><path d="m148.666 109.333c.118.024.24.001.341-.064.101-.064.172-.166.199-.283.018-.128-.016-.259-.093-.363-.077-.105-.192-.175-.32-.197-.118-.012-.237.02-.333.09s-.163.174-.187.29c-.005.12.031.238.103.334.071.096.174.164.29.193z" fill="#0066b1"/><path d="m138.886 117.133c-.101-.039-.21-.056-.318-.049s-.214.037-.309.089c-.024-.079-.07-.149-.132-.202-.063-.053-.14-.087-.221-.098-.314-.06-.447.2-.594.453.06.087.121.187.181.267l.093.087c.05.044.112.073.178.084.066.01.134.002.195-.024l.087-.054c.025.081.064.158.113.227.006.031.018.06.037.086.018.025.042.046.07.061.083.111.196.197.326.246.057.019.117.025.177.019.059-.005.117-.023.169-.052.053-.028.099-.067.136-.114.036-.048.063-.102.078-.159.074-.152.087-.325.037-.486-.049-.161-.158-.297-.303-.381z" fill="#0066b1"/><path d="m137.793 115.454c.007-.056.007-.112 0-.167.25-.061.468-.216.606-.433.174-.267 0-.567-.04-.88.05-.061.086-.131.107-.207.019-.125-.013-.251-.087-.353-.033-.667-.613-.86-1.173-.86-.215.002-.424.074-.593.206-.059.051-.112.107-.16.167-.132-.135-.302-.226-.487-.26-.353-.067-.593.147-.667.593-.009.142.027.284.104.404s.19.212.323.263c.164.007.328-.029.473-.107-.055.088-.093.185-.11.287s-.014.206.01.307c.071.203.186.388.337.542.151.153.334.271.537.344v.04c-.04.174.346.374.506.427s.3-.08.314-.313z" fill="#0066b1"/><path d="m135.86 112.5c.097-.212.121-.452.067-.679-.053-.228-.18-.432-.361-.581-.169-.104-.371-.141-.567-.106-.195.036-.371.143-.493.3-.08.08-.141.176-.179.283-.038.106-.051.22-.04.332.012.112.048.221.107.317.058.097.138.179.232.241.18.145.409.215.638.195.23-.02.444-.128.596-.302z" fill="#0066b1"/><path d="m134.793 110.153c.175-.116.3-.294.351-.498s.025-.419-.074-.604c-.099-.186-.263-.328-.461-.399s-.415-.066-.609.015c-.313.113-.367.666-.227 1.093.093.178.248.317.436.389.188.073.396.074.584.004z" fill="#0066b1"/><path d="m134.326 114.133c-.072.017-.14.049-.2.093l.973.974c.035-.129.053-.261.054-.394-.035-.192-.138-.366-.289-.489-.152-.123-.343-.189-.538-.184z" fill="#0066b1"/><path d="m133.02 109.14c-.094-.035-.193-.052-.293-.048s-.199.029-.289.072-.171.103-.237.179c-.066.075-.117.162-.148.257-.14.36.187.88.667 1.06.085.029.174.041.264.034.089-.007.176-.031.256-.072s.15-.098.207-.167c.058-.069.1-.149.126-.235.173-.64.013-.78-.553-1.08z" fill="#0066b1"/><path d="m144 120.36c-.247-.14-.627.067-.813.44-.042.114-.044.239-.003.353.04.115.119.212.223.274.136.061.289.075.434.039.145-.037.274-.121.366-.239.063-.147.077-.311.04-.467-.037-.157-.124-.297-.247-.4z" fill="#0066b1"/><path d="m132.666 110.96c-.099-.031-.205-.041-.309-.029-.103.011-.204.045-.294.097-.09.053-.169.124-.23.209-.061.084-.105.181-.127.283-.013.088-.013.178 0 .266l1.054 1.047c.226-.033.32-.207.413-.387.066-.106.118-.22.153-.34.034-.052.061-.108.08-.166.1-.427-.2-.84-.74-.98z" fill="#0066b1"/><path d="m141.093 116.706c.059-.193.045-.401-.038-.585-.084-.184-.231-.331-.415-.415-.07-.026-.145-.038-.221-.036-.075.003-.149.021-.217.052-.068.032-.13.077-.18.133-.051.055-.09.12-.115.191-.078.162-.102.343-.07.52.033.176.12.337.25.46.178.075.377.085.562.026.184-.059.342-.181.444-.346z" fill="#0066b1"/><path d="m131.286 109.38c-.05.045-.091.099-.12.16-.028.06-.044.126-.046.194 0 .133-.074.253 0 .386.073.134.293.094.406-.073.097-.162.128-.356.087-.54-.008-.034-.024-.065-.047-.09-.023-.026-.051-.046-.083-.059-.032-.012-.067-.017-.101-.013-.035.004-.067.016-.096.035z" fill="#0066b1"/><path d="m141.553 118.753c-.136-.062-.289-.078-.435-.047-.147.031-.279.108-.378.22-.061.171-.062.357-.003.528.06.171.176.316.329.412.163.051.339.042.496-.024.157-.065.286-.184.364-.336.154-.306.027-.56-.373-.753z" fill="#0066b1"/><path d="m141.38 113.16c-.168-.035-.344-.01-.496.068-.153.079-.274.208-.344.365-.034.127-.018.261.044.376.062.116.165.203.289.244.159.029.322 0 .461-.082.138-.082.242-.212.293-.365.025-.055.038-.116.039-.177s-.01-.122-.033-.179c-.023-.056-.057-.108-.101-.151-.043-.043-.095-.077-.152-.099z" fill="#0066b1"/><path d="m140.36 111.62c.054-.008.106-.026.153-.054.054-.029.101-.07.137-.12.037-.049.063-.106.076-.166l.1-.114c.247.18.48.394.747.094.083-.075.136-.178.151-.289s-.011-.224-.071-.318c-.053-.073-.16-.173-.233-.167l-.24.04c.039-.048.069-.103.087-.163s.024-.123.017-.185c-.007-.063-.026-.123-.057-.177-.03-.055-.071-.103-.121-.141-.07-.061-.152-.107-.24-.135-.089-.027-.183-.036-.275-.025-.092.01-.181.04-.261.087s-.15.111-.204.186c-.088.108-.147.236-.173.373-.06 0-.12.013-.175.037s-.104.059-.145.103c-.093.178-.127.38-.097.578s.122.381.264.522c.07.078.168.126.273.132.104.006.207-.029.287-.098z" fill="#0066b1"/><path d="m139.193 114.48c-.193.174-.393.367-.26.667.019.053.05.101.089.141s.086.072.138.093c.053.02.109.03.165.028.056-.003.111-.017.161-.042.075-.037.139-.091.19-.156.051-.066.086-.143.104-.224 0-.32-.267-.467-.587-.507z" fill="#0066b1"/><path d="m175.172 25.7409c1.935-2.0964 2.189-5.0108.566-6.5095s-4.508-1.0142-6.444 1.0821c-1.936 2.0964-2.189 5.0108-.566 6.5095 1.623 1.4988 4.508 1.0143 6.444-1.0821z" fill="#294492"/><path d="m155.779 18.3999c.8 2.2066 6.88 2.6333 9.067 2.72.237.0093.472-.0414.685-.1475.212-.106.394-.264.528-.4592l.267-.3867c.132-.1934.213-.4167.236-.6497.024-.2329-.012-.4679-.103-.6836-.853-2-3.426-7.54-5.766-7.5-2.134.04-3.827 2.62-3.827 2.62s-1.813 2.4867-1.087 4.4867z" fill="#7de2d1"/><path d="m159.213 12.0533c-.246 2.3267 5.034 5.38 6.96 6.4067.206.1086.435.1653.667.1653s.461-.0567.667-.1653l.406-.2334c.216-.1126.399-.2793.531-.4838s.209-.4398.223-.6828c.106-2.1867.22-8.28002-1.907-9.27335-1.933-.9-4.587.66666-4.587.66666s-2.74 1.48-2.96 3.59999z" fill="#7de2d1"/><path d="m160.666 11.2737c-.491.0173-.973.1473-1.406.38-.035.1312-.059.265-.074.4-.26 2.4133 5.42 5.5933 7.154 6.5133-.907-2.1667-3.38-7.3333-5.674-7.2933z" fill="#42d4c6"/><path d="m188.206 27.78c-.8-2.2-6.88-2.6667-9.066-2.7133-.237-.01-.473.0404-.685.1465-.212.1062-.394.2645-.528.4601l-.261.3867c-.133.1925-.216.4157-.24.6487-.025.2331.01.4686.1.6846.86 2 3.427 7.5467 5.774 7.5067 2.133-.04 3.826-2.62 3.826-2.62s1.807-2.4933 1.08-4.5z" fill="#7de2d1"/><path d="m184.78 34.1331c.247-2.3333-5.04-5.38-6.967-6.4133-.205-.1103-.434-.168-.666-.168-.233 0-.462.0577-.667.168l-.407.2266c-.215.1139-.396.2822-.526.4881-.13.2058-.204.4421-.214.6853-.113 2.1866-.22 8.2866 1.907 9.2733 1.933.9 4.587-.6667 4.587-.6667s2.726-1.4733 2.953-3.5933z" fill="#7de2d1"/><path d="m177.619 27.6201c.933 2.16 3.413 7.3333 5.68 7.2933.492-.0195.974-.1518 1.407-.3866.031-.1297.056-.261.073-.3934.253-2.4133-5.447-5.5999-7.16-6.5133z" fill="#42d4c6"/><path d="m57.1063 44.1738h-56.773292v7.4334h56.773292z" fill="#00bfb3"/><path d="m85.1598 61.3262h-60.0133v7.4333h60.0133z" fill="#ff957d"/><path d="m63.333 68.7597h21.8333v-7.4267h-19.96c-.8493 2.4133-1.4763 4.8992-1.8733 7.4267z" fill="#fa744e"/><path d="m153.753 43.6996c-.332.0022-.656-.0968-.929-.2838-.274-.187-.484-.4531-.602-.7627-.118-.3095-.139-.6478-.059-.9695.079-.3217.254-.6115.503-.8306.9-.7867 1.833-1.6267 2.767-2.4867.323-.2616.733-.3902 1.147-.3598.415.0304.802.2176 1.083.5234.281.3059.435.7075.431 1.1229-.004.4155-.167.8137-.455 1.1135-.96.88-1.906 1.7333-2.826 2.5333-.293.2577-.67.3998-1.06.4zm8.353-7.82c-.322-.0001-.637-.0957-.904-.2749-.268-.1792-.477-.4337-.599-.7315-.123-.2977-.155-.6252-.091-.9409.063-.3158.219-.6055.447-.8327 1.6-1.5933 2.594-2.6666 2.6-2.6666.302-.2883.703-.4496 1.12-.4506s.819.1584 1.122.4452.484.6791.506 1.0957c.022.4167-.116.8259-.388 1.143-.04.04-1.033 1.0867-2.666 2.7133-.301.3117-.714.4914-1.147.5z" fill="#294492"/><path d="m54.22 21.241-12.7138 12.7138c-1.4866 1.4866-1.4866 3.8968 0 5.3834l12.7138 12.7138c1.4865 1.4866 3.8968 1.4866 5.3834 0l12.7138-12.7138c1.4866-1.4866 1.4866-3.8968 0-5.3834l-12.7138-12.7138c-1.4866-1.4866-3.8968-1.4866-5.3834 0z" fill="#f04e98"/><path d="m31.2467 47.473c.0298-.077.0439-.1591.0416-.2416-.0024-.0825-.0212-.1637-.0553-.2388-.0342-.0751-.083-.1427-.1436-.1987s-.1318-.0994-.2094-.1276c-.26-.1266-.5733.0534-.74.42-.0367.055-.0611.1174-.0712.1827-.0101.0654-.0058.1322.0126.1957s.0505.1223.0941.1721c.0435.0498.0974.0894.1579.1162.1634.0358.3334.0288.4934-.0202.1599-.0491.3046-.1385.4199-.2598z" fill="#01ada1"/><path d="m21.22 51.2334c-.0534.1066.12.2533.2.3066.041.017.0868.0182.1286.0034.0418-.0147.0768-.0444.098-.0834.0143-.05.0151-.1029.0022-.1532-.0129-.0504-.039-.0964-.0755-.1334-.0533-.04-.3-.0467-.3533.06z" fill="#01ada1"/><path d="m23.58 46.3801c.12.0533.2467-.1333.2934-.2133.0097-.0448.006-.0914-.0106-.1341s-.0454-.0795-.0828-.1059c-.08 0-.2133.0733-.2733.1466-.06.0734-.04.2534.0733.3067z" fill="#01ada1"/><path d="m26.0334 50.26c-.26-.04-.52-.12-.7734-.18-.0436-.0417-.0964-.0724-.1542-.0896s-.1189-.0204-.1782-.0093c-.0592.011-.115.0361-.1627.073s-.0859.0846-.1115.1392c-.0604.1145-.074.248-.0379.3723.036.1244.1189.2299.2312.2944.1431.0888.2658.2069.36.3466.0428.0932.1047.1763.1816.244.077.0678.1672.1187.2651.1494h.2866c.1352-.0798.249-.1913.3315-.3249.0824-.1335.1311-.2852.1419-.4418-.02-.2467-.0267-.52-.38-.5733z" fill="#01ada1"/><path d="m27.2131 47.5664c-.0424-.0258-.0905-.0408-.1401-.0435s-.0991.007-.144.0281c-.045.0212-.0839.0531-.1135.0931-.0295.0399-.0487.0865-.0557.1357.006.1437.0353.2856.0866.42.0573.0211.1183.0306.1793.0279s.1209-.0175.1761-.0435c.0552-.0261.1047-.0629.1456-.1083.0408-.0454.0722-.0985.0924-.1561.06-.2067-.0734-.2934-.2267-.3534z" fill="#01ada1"/><path d="m32.9259 47.2002c.1079.0564.2337.0677.35.0315.1162-.0363.2133-.1171.27-.2248.0031-.0399.0031-.0801 0-.12.0629-.0213.1199-.0571.1662-.1046.0464-.0475.0808-.1054.1005-.1687.005-.0637-.0051-.1277-.0294-.1868-.0243-.059-.0622-.1115-.1106-.1532-.065-.0291-.1355-.0441-.2067-.0441s-.1416.015-.2066.0441c-.0385.0311-.0702.0696-.0934.1133-.1037-.0148-.2096.0021-.3035.0485-.094.0464-.1718.1201-.2232.2115-.0303.1114-.0177.2301.0354.3326s.1428.1813.2513.2207z" fill="#01ada1"/><path d="m29.386 50.9335c-.1003-.0441-.2137-.0479-.3167-.0106-.103.0372-.1877.1126-.2367.2106-.0428.0734-.0619.1583-.0548.243.0072.0847.0403.1651.0948.2303h.7467c.0304-.0311.0552-.0671.0733-.1066.0174-.0574.0233-.1176.0172-.1772-.006-.0596-.0238-.1174-.0523-.1701s-.0672-.0992-.1138-.1369-.1002-.0657-.1577-.0825z" fill="#01ada1"/><path d="m29.1995 49.0197c.06-.2066-.0733-.2866-.2266-.3533-.1534-.0667-.4334 0-.4534.2133.0048.1439.0341.286.0867.42.0571.0231.1184.0341.18.0324.0616-.0018.1222-.0163.1779-.0426s.1054-.0638.1459-.1103c.0406-.0464.071-.1007.0895-.1595z" fill="#01ada1"/><path d="m27.1864 45.9996c-.0193.0534-.0206.1116-.0038.1657.0169.0542.051.1013.0971.1343.1.0467.24-.0533.28-.12.04-.0666.0467-.3266-.0533-.3666s-.2933.0933-.32.1866z" fill="#01ada1"/><path d="m23.2465 47.5599c-.3733-.04-.48.4467-.3533.6667s.0534.1733-.0933.4133-.22.6667.26.7734c.2238.0329.4519-.0165.642-.1391.19-.1226.3291-.3101.3913-.5276.0311-.2675-.0384-.5371-.1948-.7563-.1565-.2193-.3888-.3727-.6519-.4304z" fill="#01ada1"/><path d="m43.5731 46.7c-.2866-.6666-.8266-.2733-.9733-.4466-.1467-.1734-.18-.6334-.3733-.9134-.0483-.0973-.1176-.1827-.2029-.2499-.0853-.0673-.1845-.1148-.2904-.139s-.2159-.0246-.322-.0012c-.106.0235-.2056.0702-.2914.1368-.0901.0659-.1656.1497-.2216.2462-.0561.0965-.0915.2036-.104.3145-.0126.111-.0019.2233.0312.3299.0331.1065.0879.2051.1611.2894-.0159.023-.0293.0476-.04.0733.0004.178.0548.3516.156.498s.2443.2587.4106.322c.1311.0345.2689.0345.4 0-.0432.0775-.0658.1647-.0658.2534s.0226.1759.0658.2533c.2267.5734.86.7267 1.1134.3667.2533-.36.0733-.6667.1533-.7534.08-.0866.52-.2599.3933-.58z" fill="#01ada1"/><path d="m45.0998 47.4797c-.0596-.0098-.1204-.0098-.18 0-.0141-.0845-.0506-.1637-.1057-.2293-.0551-.0657-.1268-.1154-.2076-.144-.161-.0145-.3222.0256-.4577.1139-.1354.0883-.2372.2196-.289.3728-.0147.0535-.018.1096-.0095.1645s.0285.1074.0587.154c.0303.0466.07.0863.1167.1164.0467.0302.0992.0501.1541.0584.1001.03.2067.03.3067 0-.0153.0946-.0048.1916.0304.2808s.0938.1672.1696.2259c.4267.2333.7867-.1267.9667-.32s-.1467-.7067-.5534-.7934z" fill="#01ada1"/><path d="m45.7068 44.6205c-.0669-.1356-.1779-.2444-.3148-.3086s-.2915-.08-.4386-.0447c-.12 0-.2333.04-.36.06l-.12-.1534h-1.7c0 .04.06.08.0934.1134.0322.0896.0796.173.14.2466-.1334.46.1333.7067.5.9067-.0934.24-.32.4667 0 .7067.0765.067.1749.104.2766.104.1018 0 .2001-.037.2767-.104.3-.2267.1267-.4867 0-.74l.3533-.3267.4467.44c.1645-.0297.3253-.0767.48-.14.0923-.0574.1681-.1378.22-.2333.0864-.0604.1572-.1404.2067-.2334.0165-.0498.0197-.1032.0092-.1547-.0106-.0514-.0344-.0992-.0692-.1386z" fill="#01ada1"/><path d="m34.7133 46.9728c.0647-.0417.1178-.0989.1547-.1665.0368-.0675.0561-.1432.0561-.2202 0-.0769-.0193-.1526-.0561-.2202-.0369-.0675-.09-.1247-.1547-.1664-.0852-.0413-.1787-.0628-.2734-.0628-.0946 0-.1881.0215-.2733.0628-.0662.053-.1184.1214-.1521.1993-.0337.0778-.0479.1628-.0412.2473.0223.0735.0602.1414.1111.1989s.1136.1033.1839.1343c.0703.0311.1464.0465.2232.0454s.1525-.0188.2218-.0519z" fill="#01ada1"/><path d="m40.98 44.7672c.0867-.14-.0533-.4867-.24-.5934h-.22c-.0765.0331-.1414.0881-.1865.1582-.0451.07-.0684.1519-.0668.2352.04.2466.6066.3666.7133.2z" fill="#01ada1"/><path d="m38.2197 47.5797c-.1266.36 0 .6666.2467.7666.1953.0463.4003.0269.5835-.055.1831-.0819.3342-.2219.4298-.3983.0076-.1454-.0326-.2892-.1144-.4096-.0819-.1204-.2009-.2107-.3389-.2571-.0752-.0375-.1577-.058-.2417-.0601s-.1674.0143-.2443.048c-.077.0337-.1456.0839-.201.1471-.0554.0631-.0963.1377-.1197.2184z" fill="#01ada1"/><path d="m35.4 44.1738h-.5533c.0466.1334.1.24.16.2667s.3266-.0667.3933-.2667z" fill="#01ada1"/><path d="m38.5202 47.0069c.44-.5667.7067-.1333 1.1533-.4333.0621-.0542.116-.1171.16-.1867.0628-.091.0982-.198.1022-.3084.004-.1105-.0236-.2198-.0797-.315-.056-.0953-.1381-.1726-.2366-.2227-.0984-.0502-.2092-.0712-.3192-.0606-.3233.0076-.644.0592-.9533.1534-.1713.0841-.3114.2205-.4001.3895-.0886.169-.1213.3617-.0933.5505.0334.2066.2734.6066.6667.4333z" fill="#01ada1"/><path d="m39.4998 45.3331c.0448.0226.0943.0344.1445.0344.0502-.0001.0997-.0119.1445-.0347.0448-.0227.0836-.0556.1133-.0961s.0494-.0874.0577-.137c.0124-.0778.0093-.1573-.009-.2339s-.0515-.1489-.0977-.2127c-.0933-.0867-.5333-.0467-.6067.14-.0367.1052-.0307.2207.0167.3216.0473.1009.1323.1793.2367.2184z" fill="#01ada1"/><path d="m31.5731 45.8396c.26-.08.2933-.2933.18-.7866-.2534-.0467-.54-.1934-.7267.14-.0594.0944-.08.2081-.0576.3174.0223.1092.0859.2057.1776.2692.0623.0408.1329.0673.2066.0777.0738.0103.1489.0043.2201-.0177z" fill="#01ada1"/><path d="m48.153 50.2532c-.0553-.0249-.1152-.0383-.1759-.0393s-.121.0104-.1771.0335c-.0562.0231-.107.0574-.1495.1008s-.0756.095-.0975.1517c-.0171.0524-.0233.1079-.0179.1629.0053.055.0219.1083.0489.1565.0269.0482.0635.0903.1075.1237.0441.0334.0945.0573.1482.0702.1158.0379.2419.0283.3507-.0267.1087-.055.1912-.1509.2293-.2666.0161-.0482.0219-.0992.017-.1497-.005-.0505-.0206-.0994-.0457-.1434-.0252-.0441-.0594-.0824-.1004-.1123s-.0879-.0508-.1376-.0613z" fill="#01ada1"/><path d="m45.0527 49.6804c-.033-.0068-.067-.0068-.1 0-.0908-.206-.2582-.3686-.4667-.4534-.1719-.0213-.3456.0213-.4881.1196-.1426.0983-.2441.2456-.2852.4138-.01.0529-.01.1071 0 .16-.068.1786-.0997.369-.0934.56.0467.1267.2867.4.0667.5533-.22.1534-.56.14-.6667.4067l-.04.0933c-.0478-.0482-.1076-.0827-.1733-.1-.1752-.0173-.3502.0355-.4867.1467h1.9134c-.0299-.1069-.0299-.2198 0-.3267.0733-.1533.2133-.3.4333-.1666.22.1333.62.0533.8667-.42.2466-.4734-.0934-1.0401-.48-.9867z" fill="#01ada1"/><path d="m47.1528 50.7266c-.2266-.06-.58.2334-.6266.52-.0151.0693-.0077.1415.0211.2062s.0774.1186.1389.1538h.8733c.0358-.0345.0612-.0784.0733-.1266.013-.1607-.0268-.3213-.1135-.4573-.0866-.136-.2153-.2399-.3665-.2961z" fill="#01ada1"/><path d="m45.46 51.6064h1.1333c-.0941-.0882-.2053-.1563-.3267-.2-.1372-.063-.2917-.0774-.4383-.0411-.1465.0363-.2764.1213-.3683.2411z" fill="#01ada1"/><path d="m47.7127 49.3931c.12-.4533-.1133-.7866-.6666-.9133-.1193-.0186-.2407-.0186-.36 0-.0881-.007-.1765.0104-.2553.0504s-.145.101-.1914.1763c-.0799.1005-.1389.2162-.1733.34-.0189.1118-.0143.2263.0134.3363s.0779.2131.1474.3027c.0696.0896.157.1638.2566.2179.0997.0541.2096.0869.3226.0964.1988.0247.3999-.023.5664-.1344s.2873-.2791.3402-.4723z" fill="#01ada1"/><path d="m51.6133 49.7136c.0393.0088.0802.0086.1194-.0006.0393-.0093.076-.0273.1072-.0527l-1.0733-1.0734c-.117.1033-.2103.2306-.2733.3734-.0376.0771-.0582.1613-.0605.2471-.0022.0857.0139.171.0474.25.0335.0789.0835.1498.1467.2078s.1382.1018.2197.1284c.122.0615.2592.0866.3951.0725.1359-.0142.2649-.0671.3716-.1525z" fill="#01ada1"/><path d="m49.0793 51.1938c-.1123.0039-.2196.0476-.3027.1233-.083.0757-.1364.1786-.1506.2901h.8933c.0089-.0588.0034-.1188-.016-.1749s-.0522-.1067-.0955-.1473c-.0433-.0407-.0958-.0702-.153-.0861s-.1174-.0176-.1755-.0051z" fill="#01ada1"/><path d="m52.573 50.4c-.4-.0534-.8933.0333-1.04.2666-.025.0326-.039.0723-.04.1134.1134.38-.1866.52-.3933.7266-.0287.03-.0533.0637-.0733.1h1.2466c.0303-.0509.0708-.095.119-.1295.0482-.0344.103-.0584.161-.0705.0667.06.1334.1467.2.2h.58c.0388-.0103.0767-.0237.1134-.04.0336-.0254.0604-.0589.0779-.0973.0174-.0384.025-.0806.0221-.1227z" fill="#01ada1"/><path d="m49.1794 47.4132c-.0775-.0394-.1607-.0664-.2466-.08.0728.0122.1471.0122.22 0 .0832-.02.1607-.0587.2266-.1133l-1.5333-1.5334c-.0867.1867-.16.3467-.2333.36-.0734.0134-.6667-.4866-1.1867-.28-.2215.0959-.3976.2732-.492.4954-.0943.2221-.0996.472-.0147.698.1427.2641.3577.4822.6198.6286s.5605.2151.8602.198c.4267-.1133.44-.6666.56-.7133s.4734.2533.8867.2867c-.1399.0015-.2766.0422-.3945.1177-.1179.0754-.2122.1825-.2722.3089-.0806.1702-.1062.3613-.0733.5467-.0522.0724-.0906.1537-.1133.24-.0258.1295-.025.2628.0023.392.0274.1291.0807.2513.1568.3592s.1733.1992.2858.2683c.1124.0691.2378.1147.3684.1338.1222.0306.2493.0362.3738.0167.1244-.0196.2437-.0639.3506-.1305.107-.0665.1995-.1539.272-.2569.0726-.103.1237-.2195.1503-.3426.0358-.1117.0448-.2303.0263-.3461s-.0641-.2256-.133-.3206c0-.2056-.0642-.4061-.1838-.5735-.1195-.1673-.2883-.2931-.4829-.3598z" fill="#01ada1"/><path d="m42.1392 50c-.0031-.0131-.0031-.0268 0-.04.093-.0206.1781-.0673.2454-.1346s.114-.1525.1346-.2454c.0093-.121-.0297-.2407-.1084-.3331-.0786-.0925-.1906-.15-.3116-.1602-.0804-.0239-.1661-.0239-.2466 0-.1706-.0495-.3524-.0431-.5191.018-.1667.0612-.3095.174-.4076.322-.096-.0666-.2051-.112-.32-.1334-.0627-.0276-.1304-.042-.199-.042-.0685-.0001-.1363.0142-.199.0418s-.119.0679-.1652.1185c-.0463.0505-.0815.1102-.1035.1751-.0134.1776.0232.3555.1057.5134.0825.1578.2075.2895.361.3799.0736.0145.1493.0142.2228-.0008s.1432-.0444.2052-.0866.1151-.0962.156-.1591c.041-.0628.0691-.1331.0827-.2068.0663.0586.1403.108.22.1466.0661.0467.1412.0793.2204.0958.0793.0166.161.0167.2404.0005.0793-.0162.1544-.0485.2208-.0949.0663-.0464.1225-.1058.165-.1747z" fill="#01ada1"/><path d="m36.0801 51.6061h.7c-.0587-.0589-.1262-.1084-.2-.1467-.086-.0455-.1864-.0557-.2798-.0283s-.1724.0902-.2202.175z" fill="#01ada1"/><path d="m36.4398 49.227c.1134-.2934 0-.7067-.2133-.7934-.1983-.0593-.4113-.0451-.6.04-.0633-.0856-.1558-.1449-.26-.1666-.1022-.0191-.2079-.004-.3007.043s-.1675.1232-.2126.217c-.2677-.119-.5633-.1606-.8534-.12-.126.013-.2532-.0101-.3666-.0667-.0747-.069-.1661-.1174-.2651-.1404-.099-.0231-.2023-.02-.2998.0089-.0974.0289-.1857.0827-.2562.156-.0704.0733-.1206.1636-.1456.2622-.0373-.0448-.0855-.0793-.14-.1-.122-.011-.2441.021-.3451.0904-.101.0693-.1746.1717-.2082.2896-.0623.1282-.0713.2759-.0251.4108s.1439.246.2717.3092c.0578.0184.1187.025.179.0195.0604-.0056.119-.0231.1725-.0517.0534-.0286.1006-.0676.1387-.1148.0381-.0471.0664-.1014.0832-.1597.1199.096.262.1602.4133.1867.219.0113.4258.1041.58.26.1172.1107.2611.1891.4177.2277.1565.0385.3204.0359.4756-.0077.1581-.0367.3016-.1197.412-.2385.1105-.1188.183-.2679.208-.4282 0 0 0-.0533 0-.0867.0771.1836.2231.3296.4067.4067.2933.1133.5733-.0733.7333-.4533z" fill="#01ada1"/><path d="m37.6666 44.6667c-.0513-.0986-.1298-.1803-.2262-.2355s-.2066-.0816-.3176-.076c-.1109.0057-.2179.043-.3082.1077-.0904.0646-.1602.1539-.2013.2571-.1173.2395-.2046.4925-.26.7533-.0039-.0233-.015-.0449-.0317-.0616-.0167-.0168-.0383-.0278-.0617-.0317-.034-.0022-.0677.008-.0947.0289s-.0455.0509-.0519.0844c0 .04.0733.12.1067.1267.0364.0023.0722-.0096.0999-.0333.0022.0154.0022.0311 0 .0466-.0031.1916.0537.3794.1625.5372.1087.1577.264.2776.4442.3428.0827.0408.1779.0484.2659.0211.0881-.0273.1623-.0873.2074-.1677.2692-.4424.3971-.9564.3667-1.4734-.0239-.0794-.0574-.1555-.1-.2266z" fill="#01ada1"/><path d="m35.6132 51.2064c-.0625-.0258-.1295-.0389-.1971-.0384-.0677.0005-.1345.0145-.1966.0412-.0622.0267-.1183.0656-.1652.1143-.0469.0488-.0835.1065-.1077.1696-.0069.0375-.0069.0759 0 .1133h.94c-.0031-.0857-.0304-.1687-.0788-.2395s-.1158-.1265-.1946-.1605z" fill="#01ada1"/><path d="m39.0461 49.8604c-.1643-.0983-.358-.1354-.547-.1049s-.3611.1267-.4862.2717c-.125.145-.1949.3294-.1974.5208s.0627.3776.184.5257c-.0454.0515-.0774.1133-.0934.18-.0407.1143-.0407.2391 0 .3533h.76v-.04c.0133-.0637.0133-.1295 0-.1933.1451-.0305.2811-.0946.3969-.1872.1158-.0927.2082-.2112.2698-.3461.0824-.1698.0987-.3642.0457-.5453-.0529-.1812-.1714-.3361-.3324-.4347z" fill="#01ada1"/><path d="m42.4527 51.3731c.08-.1867-.06-.4-.1667-.5334-.1066-.1333-.3866 0-.4733.16s0 .42.1533.4667c.1534.0467.4067.0867.4867-.0933z" fill="#01ada1"/><path d="m31.3863 50.8071c-.3533-.1333-.7466.0001-.84.2201-.041.1998-.0027.4078.1067.58h1.1267c.0359-.0776.054-.1622.053-.2476-.001-.0855-.0211-.1696-.0588-.2463s-.0921-.144-.1591-.197c-.0671-.0529-.1451-.0902-.2285-.1092z" fill="#01ada1"/><path d="m39.9131 51.6068h.5333c-.0597-.0442-.1277-.076-.2-.0934-.059-.0099-.1195-.0067-.1771.0095-.0576.0161-.1109.0448-.1562.0839z" fill="#01ada1"/><path d="m39.9999 48.827c-.0166-.0695-.0494-.1342-.0958-.1887-.0463-.0544-.1049-.0971-.1709-.1246-.1133 0-.4333 0-.4867.1466-.0533.1467.2.3667.3134.4334.1133.0666.44-.08.44-.2667z" fill="#01ada1"/><path d="m58.5392 39.7h-3.66l-1.22-11.3934h6.1z" fill="#fff"/><path d="m58.946 44.7835c0-1.2352-1.0014-2.2366-2.2367-2.2366s-2.2366 1.0014-2.2366 2.2366c0 1.2353 1.0013 2.2367 2.2366 2.2367s2.2367-1.0014 2.2367-2.2367z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
index c3c83f6be72c8..cdfca4e09eb10 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
@@ -8,19 +8,12 @@
 import type { AlertConsumers as AlertConsumersTyped } from '@kbn/rule-data-utils';
 // @ts-expect-error
 import { AlertConsumers as AlertConsumersNonTyped } from '@kbn/rule-data-utils/target_node/alerts_as_data_rbac';
-import {
-  EuiEmptyPrompt,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPanel,
-  EuiLoadingContent,
-} from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
 import { isEmpty } from 'lodash/fp';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import styled from 'styled-components';
 import { useDispatch } from 'react-redux';
 
-import { FormattedMessage } from '@kbn/i18n/react';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { Direction, EntityType } from '../../../../common/search_strategy';
 import type { DocValueFields } from '../../../../common/search_strategy';
@@ -53,6 +46,7 @@ import { SELECTOR_TIMELINE_GLOBAL_CONTAINER, UpdatedFlexGroup, UpdatedFlexItem }
 import { Sort } from '../body/sort';
 import { InspectButton, InspectButtonContainer } from '../../inspect';
 import { SummaryViewSelector, ViewSelection } from '../event_rendered_view/selector';
+import { TGridLoading, TGridEmpty } from '../shared';
 
 const AlertConsumers: typeof AlertConsumersTyped = AlertConsumersNonTyped;
 
@@ -269,6 +263,8 @@ const TGridIntegratedComponent: React.FC<TGridIntegratedProps> = ({
     [deletedEventIds.length, totalCount]
   );
 
+  const hasAlerts = totalCountMinusDeleted > 0;
+
   const nonDeletedEvents = useMemo(() => events.filter((e) => !deletedEventIds.includes(e._id)), [
     deletedEventIds,
     events,
@@ -300,7 +296,7 @@ const TGridIntegratedComponent: React.FC<TGridIntegratedProps> = ({
         data-test-subj="events-viewer-panel"
         $isFullScreen={globalFullScreen}
       >
-        {isFirstUpdate.current && <EuiLoadingContent data-test-subj="loading-alerts-panel" />}
+        {isFirstUpdate.current && <TGridLoading height="short" />}
 
         {graphOverlay}
 
@@ -325,61 +321,43 @@ const TGridIntegratedComponent: React.FC<TGridIntegratedProps> = ({
             </UpdatedFlexGroup>
 
             {!graphEventId && graphOverlay == null && (
-              <FullWidthFlexGroup
-                $visible={!graphEventId && graphOverlay == null}
-                gutterSize="none"
-              >
-                <ScrollableFlexItem grow={1}>
-                  {totalCountMinusDeleted === 0 && loading === false && (
-                    <EuiEmptyPrompt
-                      title={
-                        <h2>
-                          <FormattedMessage
-                            id="xpack.timelines.tGrid.noResultsMatchSearchCriteriaTitle"
-                            defaultMessage="No results match your search criteria"
-                          />
-                        </h2>
-                      }
-                      titleSize="s"
-                      body={
-                        <p>
-                          <FormattedMessage
-                            id="xpack.timelines.tGrid.noResultsMatchSearchCriteriaDescription"
-                            defaultMessage="Try searching over a longer period of time or modifying your search."
-                          />
-                        </p>
-                      }
-                    />
-                  )}
-                  {totalCountMinusDeleted > 0 && (
-                    <StatefulBody
-                      hasAlertsCrud={hasAlertsCrud}
-                      activePage={pageInfo.activePage}
-                      browserFields={browserFields}
-                      filterQuery={filterQuery}
-                      data={nonDeletedEvents}
-                      defaultCellActions={defaultCellActions}
-                      id={id}
-                      isEventViewer={true}
-                      itemsPerPageOptions={itemsPerPageOptions}
-                      loadPage={loadPage}
-                      onRuleChange={onRuleChange}
-                      pageSize={itemsPerPage}
-                      renderCellValue={renderCellValue}
-                      rowRenderers={rowRenderers}
-                      tabType={TimelineTabs.query}
-                      tableView={tableView}
-                      totalItems={totalCountMinusDeleted}
-                      unit={unit}
-                      filterStatus={filterStatus}
-                      leadingControlColumns={leadingControlColumns}
-                      trailingControlColumns={trailingControlColumns}
-                      refetch={refetch}
-                      indexNames={indexNames}
-                    />
-                  )}
-                </ScrollableFlexItem>
-              </FullWidthFlexGroup>
+              <>
+                {!hasAlerts && !loading && <TGridEmpty height="short" />}
+                {hasAlerts && (
+                  <FullWidthFlexGroup
+                    $visible={!graphEventId && graphOverlay == null}
+                    gutterSize="none"
+                  >
+                    <ScrollableFlexItem grow={1}>
+                      <StatefulBody
+                        hasAlertsCrud={hasAlertsCrud}
+                        activePage={pageInfo.activePage}
+                        browserFields={browserFields}
+                        filterQuery={filterQuery}
+                        data={nonDeletedEvents}
+                        defaultCellActions={defaultCellActions}
+                        id={id}
+                        isEventViewer={true}
+                        itemsPerPageOptions={itemsPerPageOptions}
+                        loadPage={loadPage}
+                        onRuleChange={onRuleChange}
+                        pageSize={itemsPerPage}
+                        renderCellValue={renderCellValue}
+                        rowRenderers={rowRenderers}
+                        tabType={TimelineTabs.query}
+                        tableView={tableView}
+                        totalItems={totalCountMinusDeleted}
+                        unit={unit}
+                        filterStatus={filterStatus}
+                        leadingControlColumns={leadingControlColumns}
+                        trailingControlColumns={trailingControlColumns}
+                        refetch={refetch}
+                        indexNames={indexNames}
+                      />
+                    </ScrollableFlexItem>
+                  </FullWidthFlexGroup>
+                )}
+              </>
             )}
           </EventsContainerLoading>
         )}
diff --git a/x-pack/plugins/timelines/public/components/t_grid/shared/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/shared/index.tsx
new file mode 100644
index 0000000000000..563e8224058c0
--- /dev/null
+++ b/x-pack/plugins/timelines/public/components/t_grid/shared/index.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import {
+  EuiPanel,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLoadingSpinner,
+  EuiImage,
+  EuiText,
+  EuiTitle,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import type { CoreStart } from '../../../../../../../src/core/public';
+
+const heights = {
+  tall: 490,
+  short: 250,
+};
+
+export const TGridLoading: React.FC<{ height?: keyof typeof heights }> = ({ height = 'tall' }) => {
+  return (
+    <EuiPanel color="subdued">
+      <EuiFlexGroup
+        style={{ height: heights[height] }}
+        alignItems="center"
+        justifyContent="center"
+        data-test-subj="loading-alerts-panel"
+      >
+        <EuiFlexItem grow={false}>
+          <EuiLoadingSpinner size="xl" />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
+  );
+};
+
+const panelStyle = {
+  maxWidth: 500,
+};
+
+export const TGridEmpty: React.FC<{ height?: keyof typeof heights }> = ({ height = 'tall' }) => {
+  const { http } = useKibana<CoreStart>().services;
+
+  return (
+    <EuiPanel color="subdued">
+      <EuiFlexGroup style={{ height: heights[height] }} alignItems="center" justifyContent="center">
+        <EuiFlexItem grow={false}>
+          <EuiPanel hasBorder={true} style={panelStyle}>
+            <EuiFlexGroup>
+              <EuiFlexItem>
+                <EuiText size="s">
+                  <EuiTitle>
+                    <h3>
+                      <FormattedMessage
+                        id="xpack.timelines.tgrid.empty.title"
+                        defaultMessage="No results match your search criteria"
+                      />
+                    </h3>
+                  </EuiTitle>
+                  <p>
+                    <FormattedMessage
+                      id="xpack.timelines.tgrid.empty.description"
+                      defaultMessage="Try searching over a longer period of time or modifying your search"
+                    />
+                  </p>
+                </EuiText>
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <EuiImage
+                  size="200"
+                  alt=""
+                  url={http.basePath.prepend(
+                    '/plugins/timelines/assets/illustration_product_no_results_magnifying_glass.svg'
+                  )}
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiPanel>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
+  );
+};
diff --git a/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
index ee9b7be48df63..74dd8c01295be 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx
@@ -4,8 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiLoadingContent } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiFlexItem } from '@elastic/eui';
 import { isEmpty } from 'lodash/fp';
 import React, { useEffect, useMemo, useState, useRef } from 'react';
 import styled from 'styled-components';
@@ -39,10 +38,16 @@ import type { State } from '../../../store/t_grid';
 import { useTimelineEvents } from '../../../container';
 import { StatefulBody } from '../body';
 import { LastUpdatedAt } from '../..';
-import { SELECTOR_TIMELINE_GLOBAL_CONTAINER, UpdatedFlexItem, UpdatedFlexGroup } from '../styles';
+import {
+  SELECTOR_TIMELINE_GLOBAL_CONTAINER,
+  UpdatedFlexItem,
+  UpdatedFlexGroup,
+  FullWidthFlexGroup,
+} from '../styles';
 import { InspectButton, InspectButtonContainer } from '../../inspect';
 import { useFetchIndex } from '../../../container/source';
 import { AddToCaseAction } from '../../actions/timeline/cases/add_to_case_action';
+import { TGridLoading, TGridEmpty } from '../shared';
 
 export const EVENTS_VIEWER_HEADER_HEIGHT = 90; // px
 const STANDALONE_ID = 'standalone-t-grid';
@@ -68,12 +73,6 @@ const EventsContainerLoading = styled.div.attrs(({ className = '' }) => ({
   flex-direction: column;
 `;
 
-const FullWidthFlexGroup = styled(EuiFlexGroup)<{ $visible: boolean }>`
-  overflow: hidden;
-  margin: 0;
-  display: ${({ $visible }) => ($visible ? 'flex' : 'none')};
-`;
-
 const ScrollableFlexItem = styled(EuiFlexItem)`
   overflow: auto;
 `;
@@ -255,6 +254,8 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
     () => (totalCount > 0 ? totalCount - deletedEventIds.length : 0),
     [deletedEventIds.length, totalCount]
   );
+  const hasAlerts = totalCountMinusDeleted > 0;
+
   const activeCaseFlowId = useSelector((state: State) => tGridSelectors.activeCaseFlowId(state));
   const selectedEvent = useMemo(() => {
     const matchedEvent = events.find((event) => event.ecs._id === activeCaseFlowId);
@@ -338,14 +339,14 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
   return (
     <InspectButtonContainer data-test-subj="events-viewer-panel">
       <AlertsTableWrapper>
-        {isFirstUpdate.current && <EuiLoadingContent data-test-subj="loading-alerts-panel" />}
+        {isFirstUpdate.current && <TGridLoading />}
         {canQueryTimeline ? (
           <>
             <EventsContainerLoading
               data-timeline-id={STANDALONE_ID}
               data-test-subj={`events-container-loading-${loading}`}
             >
-              <UpdatedFlexGroup gutterSize="s" justifyContent="flexEnd" alignItems="baseline">
+              <UpdatedFlexGroup gutterSize="s" justifyContent="flexEnd" alignItems="center">
                 <UpdatedFlexItem grow={false} $show={!loading}>
                   <InspectButton title={justTitle} inspect={inspect} loading={loading} />
                 </UpdatedFlexItem>
@@ -354,28 +355,9 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
                 </UpdatedFlexItem>
               </UpdatedFlexGroup>
 
-              {totalCountMinusDeleted === 0 && loading === false && (
-                <EuiEmptyPrompt
-                  title={
-                    <h2>
-                      <FormattedMessage
-                        id="xpack.timelines.tGrid.noResultsMatchSearchCriteriaTitle"
-                        defaultMessage="No results match your search criteria"
-                      />
-                    </h2>
-                  }
-                  titleSize="s"
-                  body={
-                    <p>
-                      <FormattedMessage
-                        id="xpack.timelines.tGrid.noResultsMatchSearchCriteriaDescription"
-                        defaultMessage="Try searching over a longer period of time or modifying your search."
-                      />
-                    </p>
-                  }
-                />
-              )}
-              {totalCountMinusDeleted > 0 && (
+              {!hasAlerts && !loading && <TGridEmpty />}
+
+              {hasAlerts && (
                 <FullWidthFlexGroup direction="row" $visible={!graphEventId} gutterSize="none">
                   <ScrollableFlexItem grow={1}>
                     <StatefulBody
diff --git a/x-pack/plugins/timelines/public/components/t_grid/styles.tsx b/x-pack/plugins/timelines/public/components/t_grid/styles.tsx
index e15e76c787a3f..28e425f53824b 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/styles.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/styles.tsx
@@ -459,6 +459,13 @@ export const HideShowContainer = styled.div.attrs<{ $isVisible: boolean }>(
   })
 )<{ $isVisible: boolean }>``;
 
+export const FullWidthFlexGroup = styled(EuiFlexGroup)<{ $visible?: boolean }>`
+  overflow: hidden;
+  margin: 0;
+  min-height: 490px;
+  display: ${({ $visible = true }) => ($visible ? 'flex' : 'none')};
+`;
+
 export const UpdatedFlexGroup = styled(EuiFlexGroup)`
   position: absolute;
   z-index: ${({ theme }) => theme.eui.euiZLevel1};
diff --git a/x-pack/plugins/timelines/public/methods/index.tsx b/x-pack/plugins/timelines/public/methods/index.tsx
index 91802c4eb10e1..06bb1ae443216 100644
--- a/x-pack/plugins/timelines/public/methods/index.tsx
+++ b/x-pack/plugins/timelines/public/methods/index.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { lazy, Suspense } from 'react';
-import { EuiLoadingContent, EuiLoadingSpinner, EuiPanel } from '@elastic/eui';
+import { EuiLoadingSpinner } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n/react';
 import type { Store } from 'redux';
 import { Provider } from 'react-redux';
@@ -17,6 +17,7 @@ import type { LastUpdatedAtProps, LoadingPanelProps, FieldBrowserProps } from '.
 import type { AddToCaseActionProps } from '../components/actions/timeline/cases/add_to_case_action';
 import { initialTGridState } from '../store/t_grid/reducer';
 import { createStore } from '../store/t_grid';
+import { TGridLoading } from '../components/t_grid/shared';
 
 const initializeStore = ({
   store,
@@ -51,13 +52,7 @@ export const getTGridLazy = (
 ) => {
   initializeStore({ store, storage, setStore });
   return (
-    <Suspense
-      fallback={
-        <EuiPanel hasBorder={false} hasShadow={false} paddingSize="none">
-          <EuiLoadingContent />
-        </EuiPanel>
-      }
-    >
+    <Suspense fallback={<TGridLoading height={props.type === 'standalone' ? 'tall' : 'short'} />}>
       <TimelineLazy {...props} store={store} storage={storage} data={data} setStore={setStore} />
     </Suspense>
   );
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 209b763686f7e..fd445f34317e0 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -20849,7 +20849,6 @@
     "xpack.securitySolution.detectionEngine.ruleDescription.mlJobStoppedDescription": "停止",
     "xpack.securitySolution.detectionEngine.ruleDescription.thresholdResultsAggregatedByDescription": "結果集約条件",
     "xpack.securitySolution.detectionEngine.ruleDescription.thresholdResultsAllDescription": "すべての結果",
-    "xpack.securitySolution.detectionEngine.ruleDetails.activatedRuleLabel": "有効化",
     "xpack.securitySolution.detectionEngine.ruleDetails.deletedRule": "削除されたルール",
     "xpack.securitySolution.detectionEngine.ruleDetails.errorCalloutTitle": "ルール失敗",
     "xpack.securitySolution.detectionEngine.ruleDetails.exceptionsTab": "例外",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 2ba41ff25b510..beb4f3d0c2860 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -21318,7 +21318,6 @@
     "xpack.securitySolution.detectionEngine.ruleDescription.mlJobStoppedDescription": "已停止",
     "xpack.securitySolution.detectionEngine.ruleDescription.thresholdResultsAggregatedByDescription": "结果聚合依据",
     "xpack.securitySolution.detectionEngine.ruleDescription.thresholdResultsAllDescription": "所有结果",
-    "xpack.securitySolution.detectionEngine.ruleDetails.activatedRuleLabel": "已激活",
     "xpack.securitySolution.detectionEngine.ruleDetails.deletedRule": "已删除规则",
     "xpack.securitySolution.detectionEngine.ruleDetails.errorCalloutTitle": "规则错误位置",
     "xpack.securitySolution.detectionEngine.ruleDetails.exceptionsTab": "例外",
diff --git a/x-pack/plugins/triggers_actions_ui/kibana.json b/x-pack/plugins/triggers_actions_ui/kibana.json
index 4033889d9811e..b72a7fe96817d 100644
--- a/x-pack/plugins/triggers_actions_ui/kibana.json
+++ b/x-pack/plugins/triggers_actions_ui/kibana.json
@@ -7,7 +7,7 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "optionalPlugins": ["alerting", "features", "home", "spaces"],
+  "optionalPlugins": ["alerting", "cloud", "features", "home", "spaces"],
   "requiredPlugins": ["management", "charts", "data", "kibanaReact", "kibanaUtils", "savedObjects"],
   "configPath": ["xpack", "trigger_actions_ui"],
   "extraPublicDirs": ["public/common", "public/common/constants"],
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
index 9786f5dcb949d..ac0e6d95393b9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
@@ -37,6 +37,7 @@ export interface TriggersAndActionsUiServices extends CoreStart {
   alerting?: AlertingStart;
   spaces?: SpacesPluginStart;
   storage?: Storage;
+  isCloud: boolean;
   setBreadcrumbs: (crumbs: ChromeBreadcrumb[]) => void;
   actionTypeRegistry: ActionTypeRegistryContract;
   ruleTypeRegistry: RuleTypeRegistryContract;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/api.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/api.ts
new file mode 100644
index 0000000000000..82c787426a38e
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/api.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { HttpSetup } from 'kibana/public';
+import { INTERNAL_BASE_ACTION_API_PATH } from '../../../constants';
+import { EmailConfig } from '../types';
+
+export async function getServiceConfig({
+  http,
+  service,
+}: {
+  http: HttpSetup;
+  service: string;
+}): Promise<Partial<Pick<EmailConfig, 'host' | 'port' | 'secure'>>> {
+  return await http.get(`${INTERNAL_BASE_ACTION_API_PATH}/connector/_email_config/${service}`);
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx
index 4d669ab4c76a1..0e1bf9ef53e15 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx
@@ -9,6 +9,7 @@ import { TypeRegistry } from '../../../type_registry';
 import { registerBuiltInActionTypes } from '../index';
 import { ActionTypeModel } from '../../../../types';
 import { EmailActionConnector } from '../types';
+import { getEmailServices } from './email';
 
 const ACTION_TYPE_ID = '.email';
 let actionTypeModel: ActionTypeModel;
@@ -29,6 +30,18 @@ describe('actionTypeRegistry.get() works', () => {
   });
 });
 
+describe('getEmailServices', () => {
+  test('should return elastic cloud service if isCloudEnabled is true', () => {
+    const services = getEmailServices(true);
+    expect(services.find((service) => service.value === 'elastic_cloud')).toBeTruthy();
+  });
+
+  test('should not return elastic cloud service if isCloudEnabled is false', () => {
+    const services = getEmailServices(false);
+    expect(services.find((service) => service.value === 'elastic_cloud')).toBeFalsy();
+  });
+});
+
 describe('connector validation', () => {
   test('connector validation succeeds when connector config is valid', async () => {
     const actionConnector = {
@@ -46,6 +59,7 @@ describe('connector validation', () => {
         host: 'localhost',
         test: 'test',
         hasAuth: true,
+        service: 'other',
       },
     } as EmailActionConnector;
 
@@ -55,6 +69,7 @@ describe('connector validation', () => {
           from: [],
           port: [],
           host: [],
+          service: [],
         },
       },
       secrets: {
@@ -82,6 +97,7 @@ describe('connector validation', () => {
         host: 'localhost',
         test: 'test',
         hasAuth: false,
+        service: 'other',
       },
     } as EmailActionConnector;
 
@@ -91,6 +107,7 @@ describe('connector validation', () => {
           from: [],
           port: [],
           host: [],
+          service: [],
         },
       },
       secrets: {
@@ -113,6 +130,7 @@ describe('connector validation', () => {
       config: {
         from: 'test@test.com',
         hasAuth: true,
+        service: 'other',
       },
     } as EmailActionConnector;
 
@@ -122,6 +140,7 @@ describe('connector validation', () => {
           from: [],
           port: ['Port is required.'],
           host: ['Host is required.'],
+          service: [],
         },
       },
       secrets: {
@@ -148,6 +167,7 @@ describe('connector validation', () => {
         host: 'localhost',
         test: 'test',
         hasAuth: true,
+        service: 'other',
       },
     } as EmailActionConnector;
 
@@ -157,6 +177,7 @@ describe('connector validation', () => {
           from: [],
           port: [],
           host: [],
+          service: [],
         },
       },
       secrets: {
@@ -183,6 +204,7 @@ describe('connector validation', () => {
         host: 'localhost',
         test: 'test',
         hasAuth: true,
+        service: 'other',
       },
     } as EmailActionConnector;
 
@@ -192,6 +214,7 @@ describe('connector validation', () => {
           from: [],
           port: [],
           host: [],
+          service: [],
         },
       },
       secrets: {
@@ -202,6 +225,44 @@ describe('connector validation', () => {
       },
     });
   });
+  test('connector validation fails when server type is not selected', async () => {
+    const actionConnector = {
+      secrets: {
+        user: 'user',
+        password: 'password',
+      },
+      id: 'test',
+      actionTypeId: '.email',
+      isPreconfigured: false,
+      name: 'email',
+      config: {
+        from: 'test@test.com',
+        port: 2323,
+        host: 'localhost',
+        test: 'test',
+        hasAuth: true,
+      },
+    };
+
+    expect(
+      await actionTypeModel.validateConnector((actionConnector as unknown) as EmailActionConnector)
+    ).toEqual({
+      config: {
+        errors: {
+          from: [],
+          port: [],
+          host: [],
+          service: ['Service is required.'],
+        },
+      },
+      secrets: {
+        errors: {
+          user: [],
+          password: [],
+        },
+      },
+    });
+  });
 });
 
 describe('action params validation', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx
index 5e23754621430..fe0b18b1b2e61 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx
@@ -7,6 +7,7 @@
 
 import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
+import { EuiSelectOption } from '@elastic/eui';
 import {
   ActionTypeModel,
   ConnectorValidationResult,
@@ -14,6 +15,69 @@ import {
 } from '../../../../types';
 import { EmailActionParams, EmailConfig, EmailSecrets, EmailActionConnector } from '../types';
 
+const emailServices: EuiSelectOption[] = [
+  {
+    text: i18n.translate(
+      'xpack.triggersActionsUI.components.builtinActionTypes.emailAction.gmailServerTypeLabel',
+      {
+        defaultMessage: 'Gmail',
+      }
+    ),
+    value: 'gmail',
+  },
+  {
+    text: i18n.translate(
+      'xpack.triggersActionsUI.components.builtinActionTypes.emailAction.outlookServerTypeLabel',
+      {
+        defaultMessage: 'Outlook',
+      }
+    ),
+    value: 'outlook365',
+  },
+  {
+    text: i18n.translate(
+      'xpack.triggersActionsUI.components.builtinActionTypes.emailAction.amazonSesServerTypeLabel',
+      {
+        defaultMessage: 'Amazon SES',
+      }
+    ),
+    value: 'ses',
+  },
+  {
+    text: i18n.translate(
+      'xpack.triggersActionsUI.components.builtinActionTypes.emailAction.elasticCloudServerTypeLabel',
+      {
+        defaultMessage: 'Elastic Cloud',
+      }
+    ),
+    value: 'elastic_cloud',
+  },
+  {
+    text: i18n.translate(
+      'xpack.triggersActionsUI.components.builtinActionTypes.emailAction.exchangeServerTypeLabel',
+      {
+        defaultMessage: 'MS Exchange Server',
+      }
+    ),
+    value: 'exchange_server',
+  },
+  {
+    text: i18n.translate(
+      'xpack.triggersActionsUI.components.builtinActionTypes.emailAction.otherServerTypeLabel',
+      {
+        defaultMessage: 'Other',
+      }
+    ),
+    value: 'other',
+  },
+];
+
+export function getEmailServices(isCloudEnabled: boolean) {
+  return isCloudEnabled
+    ? emailServices
+    : emailServices.filter((service) => service.value !== 'elastic_cloud');
+}
+
 export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, EmailActionParams> {
   const mailformat = /^[^@\s]+@[^@\s]+$/;
   return {
@@ -41,6 +105,7 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         from: new Array<string>(),
         port: new Array<string>(),
         host: new Array<string>(),
+        service: new Array<string>(),
       };
       const secretsErrors = {
         user: new Array<string>(),
@@ -69,6 +134,9 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
       if (action.config.hasAuth && !action.secrets.user && !action.secrets.password) {
         secretsErrors.password.push(translations.PASSWORD_REQUIRED);
       }
+      if (!action.config.service) {
+        configErrors.service.push(translations.SERVICE_REQUIRED);
+      }
       if (action.secrets.user && !action.secrets.password) {
         secretsErrors.password.push(translations.PASSWORD_REQUIRED_FOR_USER_USED);
       }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.test.tsx
index 917e62b58c3f8..0b446b99c93dc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.test.tsx
@@ -9,8 +9,10 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test/jest';
 import { EmailActionConnector } from '../types';
 import EmailActionConnectorFields from './email_connector';
+import * as hooks from './use_email_config';
 
 jest.mock('../../../../common/lib/kibana');
+
 describe('EmailActionConnectorFields renders', () => {
   test('all connector fields is rendered', () => {
     const actionConnector = {
@@ -29,7 +31,7 @@ describe('EmailActionConnectorFields renders', () => {
     const wrapper = mountWithIntl(
       <EmailActionConnectorFields
         action={actionConnector}
-        errors={{ from: [], port: [], host: [], user: [], password: [] }}
+        errors={{ from: [], port: [], host: [], user: [], password: [], service: [] }}
         editActionConfig={() => {}}
         editActionSecrets={() => {}}
         readOnly={false}
@@ -39,6 +41,7 @@ describe('EmailActionConnectorFields renders', () => {
     expect(wrapper.find('[data-test-subj="emailFromInput"]').first().prop('value')).toBe(
       'test@test.com'
     );
+    expect(wrapper.find('[data-test-subj="emailServiceSelectInput"]').length > 0).toBeTruthy();
     expect(wrapper.find('[data-test-subj="emailHostInput"]').length > 0).toBeTruthy();
     expect(wrapper.find('[data-test-subj="emailPortInput"]').length > 0).toBeTruthy();
     expect(wrapper.find('[data-test-subj="emailUserInput"]').length > 0).toBeTruthy();
@@ -59,7 +62,7 @@ describe('EmailActionConnectorFields renders', () => {
     const wrapper = mountWithIntl(
       <EmailActionConnectorFields
         action={actionConnector}
-        errors={{ from: [], port: [], host: [], user: [], password: [] }}
+        errors={{ from: [], port: [], host: [], user: [], password: [], service: [] }}
         editActionConfig={() => {}}
         editActionSecrets={() => {}}
         readOnly={false}
@@ -75,6 +78,136 @@ describe('EmailActionConnectorFields renders', () => {
     expect(wrapper.find('[data-test-subj="emailPasswordInput"]').length > 0).toBeFalsy();
   });
 
+  test('service field defaults to empty when not defined', () => {
+    const actionConnector = {
+      secrets: {
+        user: 'user',
+        password: 'pass',
+      },
+      id: 'test',
+      actionTypeId: '.email',
+      name: 'email',
+      config: {
+        from: 'test@test.com',
+        hasAuth: true,
+      },
+    } as EmailActionConnector;
+    const wrapper = mountWithIntl(
+      <EmailActionConnectorFields
+        action={actionConnector}
+        errors={{ from: [], port: [], host: [], user: [], password: [], service: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        readOnly={false}
+      />
+    );
+    expect(wrapper.find('[data-test-subj="emailFromInput"]').first().prop('value')).toBe(
+      'test@test.com'
+    );
+    expect(wrapper.find('[data-test-subj="emailServiceSelectInput"]').length > 0).toBeTruthy();
+    expect(wrapper.find('select[data-test-subj="emailServiceSelectInput"]').prop('value')).toEqual(
+      ''
+    );
+  });
+
+  test('service field is correctly selected when defined', () => {
+    const actionConnector = {
+      secrets: {
+        user: 'user',
+        password: 'pass',
+      },
+      id: 'test',
+      actionTypeId: '.email',
+      name: 'email',
+      config: {
+        from: 'test@test.com',
+        hasAuth: true,
+        service: 'gmail',
+      },
+    } as EmailActionConnector;
+    const wrapper = mountWithIntl(
+      <EmailActionConnectorFields
+        action={actionConnector}
+        errors={{ from: [], port: [], host: [], user: [], password: [], service: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        readOnly={false}
+      />
+    );
+    expect(wrapper.find('[data-test-subj="emailServiceSelectInput"]').length > 0).toBeTruthy();
+    expect(wrapper.find('select[data-test-subj="emailServiceSelectInput"]').prop('value')).toEqual(
+      'gmail'
+    );
+  });
+
+  test('host, port and secure fields should be disabled when service field is set to well known service', () => {
+    jest
+      .spyOn(hooks, 'useEmailConfig')
+      .mockImplementation(() => ({ emailServiceConfigurable: false, setEmailService: jest.fn() }));
+    const actionConnector = {
+      secrets: {
+        user: 'user',
+        password: 'pass',
+      },
+      id: 'test',
+      actionTypeId: '.email',
+      name: 'email',
+      config: {
+        from: 'test@test.com',
+        hasAuth: true,
+        service: 'gmail',
+      },
+    } as EmailActionConnector;
+    const wrapper = mountWithIntl(
+      <EmailActionConnectorFields
+        action={actionConnector}
+        errors={{ from: [], port: [], host: [], user: [], password: [], service: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        readOnly={false}
+      />
+    );
+    expect(wrapper.find('[data-test-subj="emailHostInput"]').first().prop('disabled')).toBe(true);
+    expect(wrapper.find('[data-test-subj="emailPortInput"]').first().prop('disabled')).toBe(true);
+    expect(wrapper.find('[data-test-subj="emailSecureSwitch"]').first().prop('disabled')).toBe(
+      true
+    );
+  });
+
+  test('host, port and secure fields should not be disabled when service field is set to other', () => {
+    jest
+      .spyOn(hooks, 'useEmailConfig')
+      .mockImplementation(() => ({ emailServiceConfigurable: true, setEmailService: jest.fn() }));
+    const actionConnector = {
+      secrets: {
+        user: 'user',
+        password: 'pass',
+      },
+      id: 'test',
+      actionTypeId: '.email',
+      name: 'email',
+      config: {
+        from: 'test@test.com',
+        hasAuth: true,
+        service: 'other',
+      },
+    } as EmailActionConnector;
+    const wrapper = mountWithIntl(
+      <EmailActionConnectorFields
+        action={actionConnector}
+        errors={{ from: [], port: [], host: [], user: [], password: [], service: [] }}
+        editActionConfig={() => {}}
+        editActionSecrets={() => {}}
+        readOnly={false}
+      />
+    );
+    expect(wrapper.find('[data-test-subj="emailHostInput"]').first().prop('disabled')).toBe(false);
+    expect(wrapper.find('[data-test-subj="emailPortInput"]').first().prop('disabled')).toBe(false);
+    expect(wrapper.find('[data-test-subj="emailSecureSwitch"]').first().prop('disabled')).toBe(
+      false
+    );
+  });
+
   test('should display a message to remember username and password when creating a connector with authentication', () => {
     const actionConnector = {
       actionTypeId: '.email',
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx
index e4d73ced1eb59..c37c3fc8355b1 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx
@@ -12,6 +12,7 @@ import {
   EuiFlexGroup,
   EuiFieldNumber,
   EuiFieldPassword,
+  EuiSelect,
   EuiSwitch,
   EuiFormRow,
   EuiTitle,
@@ -24,13 +25,22 @@ import { ActionConnectorFieldsProps } from '../../../../types';
 import { EmailActionConnector } from '../types';
 import { useKibana } from '../../../../common/lib/kibana';
 import { getEncryptedFieldNotifyLabel } from '../../get_encrypted_field_notify_label';
+import { getEmailServices } from './email';
+import { useEmailConfig } from './use_email_config';
 
 export const EmailActionConnectorFields: React.FunctionComponent<
   ActionConnectorFieldsProps<EmailActionConnector>
 > = ({ action, editActionConfig, editActionSecrets, errors, readOnly }) => {
-  const { docLinks } = useKibana().services;
-  const { from, host, port, secure, hasAuth } = action.config;
+  const { docLinks, http, isCloud } = useKibana().services;
+  const { from, host, port, secure, hasAuth, service } = action.config;
   const { user, password } = action.secrets;
+
+  const { emailServiceConfigurable, setEmailService } = useEmailConfig(
+    http,
+    service,
+    editActionConfig
+  );
+
   useEffect(() => {
     if (!action.id) {
       editActionConfig('hasAuth', true);
@@ -42,6 +52,8 @@ export const EmailActionConnectorFields: React.FunctionComponent<
     from !== undefined && errors.from !== undefined && errors.from.length > 0;
   const isHostInvalid: boolean =
     host !== undefined && errors.host !== undefined && errors.host.length > 0;
+  const isServiceInvalid: boolean =
+    service !== undefined && errors.service !== undefined && errors.service.length > 0;
   const isPortInvalid: boolean =
     port !== undefined && errors.port !== undefined && errors.port.length > 0;
 
@@ -93,6 +105,31 @@ export const EmailActionConnectorFields: React.FunctionComponent<
         </EuiFlexItem>
       </EuiFlexGroup>
       <EuiFlexGroup justifyContent="spaceBetween">
+        <EuiFlexItem>
+          <EuiFormRow
+            label={i18n.translate(
+              'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.serviceTextFieldLabel',
+              {
+                defaultMessage: 'Service',
+              }
+            )}
+            error={errors.serverType}
+            isInvalid={isServiceInvalid}
+          >
+            <EuiSelect
+              name="service"
+              hasNoInitialSelection={true}
+              value={service}
+              disabled={readOnly}
+              isInvalid={isServiceInvalid}
+              data-test-subj="emailServiceSelectInput"
+              options={getEmailServices(isCloud)}
+              onChange={(e) => {
+                setEmailService(e.target.value);
+              }}
+            />
+          </EuiFormRow>
+        </EuiFlexItem>
         <EuiFlexItem>
           <EuiFormRow
             id="emailHost"
@@ -108,6 +145,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
           >
             <EuiFieldText
               fullWidth
+              disabled={!emailServiceConfigurable}
               readOnly={readOnly}
               isInvalid={isHostInvalid}
               name="host"
@@ -144,6 +182,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
                   prepend=":"
                   isInvalid={isPortInvalid}
                   fullWidth
+                  disabled={!emailServiceConfigurable}
                   readOnly={readOnly}
                   name="port"
                   value={port || ''}
@@ -169,7 +208,8 @@ export const EmailActionConnectorFields: React.FunctionComponent<
                         defaultMessage: 'Secure',
                       }
                     )}
-                    disabled={readOnly}
+                    data-test-subj="emailSecureSwitch"
+                    disabled={readOnly || !emailServiceConfigurable}
                     checked={secure || false}
                     onChange={(e) => {
                       editActionConfig('secure', e.target.checked);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/translations.ts
index 5da9145ecec0b..df68d0d1237ed 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/translations.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/translations.ts
@@ -28,6 +28,13 @@ export const PORT_REQUIRED = i18n.translate(
   }
 );
 
+export const SERVICE_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredServiceText',
+  {
+    defaultMessage: 'Service is required.',
+  }
+);
+
 export const HOST_REQUIRED = i18n.translate(
   'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredHostText',
   {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.test.ts
new file mode 100644
index 0000000000000..7d9cf15852748
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.test.ts
@@ -0,0 +1,118 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { renderHook, act } from '@testing-library/react-hooks';
+import { HttpSetup } from 'kibana/public';
+import { useEmailConfig } from './use_email_config';
+
+const http = {
+  get: jest.fn(),
+};
+
+const editActionConfig = jest.fn();
+
+const renderUseEmailConfigHook = (currentService?: string) =>
+  renderHook(() =>
+    useEmailConfig((http as unknown) as HttpSetup, currentService, editActionConfig)
+  );
+
+describe('useEmailConfig', () => {
+  beforeEach(() => jest.clearAllMocks());
+
+  it('should call get email config API when service changes and handle result', async () => {
+    http.get.mockResolvedValueOnce({
+      host: 'smtp.gmail.com',
+      port: 465,
+      secure: true,
+    });
+    const { result, waitForNextUpdate } = renderUseEmailConfigHook();
+    await act(async () => {
+      result.current.setEmailService('gmail');
+      await waitForNextUpdate();
+    });
+
+    expect(http.get).toHaveBeenCalledWith('/internal/actions/connector/_email_config/gmail');
+    expect(editActionConfig).toHaveBeenCalledWith('service', 'gmail');
+
+    expect(editActionConfig).toHaveBeenCalledWith('host', 'smtp.gmail.com');
+    expect(editActionConfig).toHaveBeenCalledWith('port', 465);
+    expect(editActionConfig).toHaveBeenCalledWith('secure', true);
+
+    expect(result.current.emailServiceConfigurable).toEqual(false);
+  });
+
+  it('should call get email config API when service changes and handle partial result', async () => {
+    http.get.mockResolvedValueOnce({
+      host: 'smtp.gmail.com',
+      port: 465,
+    });
+    const { result, waitForNextUpdate } = renderUseEmailConfigHook();
+    await act(async () => {
+      result.current.setEmailService('gmail');
+      await waitForNextUpdate();
+    });
+
+    expect(http.get).toHaveBeenCalledWith('/internal/actions/connector/_email_config/gmail');
+    expect(editActionConfig).toHaveBeenCalledWith('service', 'gmail');
+
+    expect(editActionConfig).toHaveBeenCalledWith('host', 'smtp.gmail.com');
+    expect(editActionConfig).toHaveBeenCalledWith('port', 465);
+    expect(editActionConfig).toHaveBeenCalledWith('secure', false);
+
+    expect(result.current.emailServiceConfigurable).toEqual(false);
+  });
+
+  it('should call get email config API when service changes and handle empty result', async () => {
+    http.get.mockResolvedValueOnce({});
+    const { result, waitForNextUpdate } = renderUseEmailConfigHook();
+    await act(async () => {
+      result.current.setEmailService('foo');
+      await waitForNextUpdate();
+    });
+
+    expect(http.get).toHaveBeenCalledWith('/internal/actions/connector/_email_config/foo');
+    expect(editActionConfig).toHaveBeenCalledWith('service', 'foo');
+
+    expect(editActionConfig).toHaveBeenCalledWith('host', '');
+    expect(editActionConfig).toHaveBeenCalledWith('port', 0);
+    expect(editActionConfig).toHaveBeenCalledWith('secure', false);
+
+    expect(result.current.emailServiceConfigurable).toEqual(true);
+  });
+
+  it('should call get email config API when service changes and handle errors', async () => {
+    http.get.mockImplementationOnce(() => {
+      throw new Error('no!');
+    });
+    const { result, waitForNextUpdate } = renderUseEmailConfigHook();
+    await act(async () => {
+      result.current.setEmailService('foo');
+      await waitForNextUpdate();
+    });
+
+    expect(http.get).toHaveBeenCalledWith('/internal/actions/connector/_email_config/foo');
+    expect(editActionConfig).toHaveBeenCalledWith('service', 'foo');
+
+    expect(editActionConfig).toHaveBeenCalledWith('host', '');
+    expect(editActionConfig).toHaveBeenCalledWith('port', 0);
+    expect(editActionConfig).toHaveBeenCalledWith('secure', false);
+
+    expect(result.current.emailServiceConfigurable).toEqual(true);
+  });
+
+  it('should call get email config API when initial service value is passed and determine if config is editable without overwriting config', async () => {
+    http.get.mockResolvedValueOnce({
+      host: 'smtp.gmail.com',
+      port: 465,
+      secure: true,
+    });
+    const { result } = renderUseEmailConfigHook('gmail');
+    expect(http.get).toHaveBeenCalledWith('/internal/actions/connector/_email_config/gmail');
+    expect(editActionConfig).not.toHaveBeenCalled();
+    expect(result.current.emailServiceConfigurable).toEqual(false);
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.ts
new file mode 100644
index 0000000000000..fad71cf5d6385
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/use_email_config.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useCallback, useEffect, useState } from 'react';
+import { HttpSetup } from 'kibana/public';
+import { isEmpty } from 'lodash';
+import { EmailConfig } from '../types';
+import { getServiceConfig } from './api';
+
+export function useEmailConfig(
+  http: HttpSetup,
+  currentService: string | undefined,
+  editActionConfig: (property: string, value: unknown) => void
+) {
+  const [emailServiceConfigurable, setEmailServiceConfigurable] = useState<boolean>(false);
+  const [emailService, setEmailService] = useState<string | undefined>(undefined);
+
+  const getEmailServiceConfig = useCallback(
+    async (service: string) => {
+      let serviceConfig: Partial<Pick<EmailConfig, 'host' | 'port' | 'secure'>>;
+      try {
+        serviceConfig = await getServiceConfig({ http, service });
+        setEmailServiceConfigurable(isEmpty(serviceConfig));
+      } catch (err) {
+        serviceConfig = {};
+        setEmailServiceConfigurable(true);
+      }
+
+      return serviceConfig;
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [editActionConfig]
+  );
+
+  useEffect(() => {
+    (async () => {
+      if (emailService) {
+        const serviceConfig = await getEmailServiceConfig(emailService);
+
+        editActionConfig('service', emailService);
+        editActionConfig('host', serviceConfig?.host ? serviceConfig.host : '');
+        editActionConfig('port', serviceConfig?.port ? serviceConfig.port : 0);
+        editActionConfig('secure', null != serviceConfig?.secure ? serviceConfig.secure : false);
+      }
+    })();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [emailService]);
+
+  useEffect(() => {
+    (async () => {
+      if (currentService) {
+        await getEmailServiceConfig(currentService);
+      }
+    })();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [currentService]);
+
+  return {
+    emailServiceConfigurable,
+    setEmailService,
+  };
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts
index 50410ba3c153d..60e0a0f14b897 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts
@@ -78,6 +78,7 @@ export interface EmailConfig {
   port: number;
   secure?: boolean;
   hasAuth: boolean;
+  service: string;
 }
 
 export interface EmailSecrets {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts
index cc04b8e7871cd..bed7b09110d87 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/constants/index.ts
@@ -11,7 +11,7 @@ export {
   BASE_ALERTING_API_PATH,
   INTERNAL_BASE_ALERTING_API_PATH,
 } from '../../../../alerting/common';
-export { BASE_ACTION_API_PATH } from '../../../../actions/common';
+export { BASE_ACTION_API_PATH, INTERNAL_BASE_ACTION_API_PATH } from '../../../../actions/common';
 
 export type Section = 'connectors' | 'rules';
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
index 2985a5306ed51..de64906f75de3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/lib/kibana/kibana_react.mock.ts
@@ -40,6 +40,7 @@ export const createStartServicesMock = (): TriggersAndActionsUiServices => {
       list: jest.fn(),
     } as ActionTypeRegistryContract,
     charts: chartPluginMock.createStartContract(),
+    isCloud: false,
     kibanaFeatures: [],
     element: ({
       style: { cursor: 'pointer' },
diff --git a/x-pack/plugins/triggers_actions_ui/public/plugin.ts b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
index 7661eefba7f65..17f0766a826e3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/plugin.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
@@ -66,6 +66,7 @@ export interface TriggersAndActionsUIPublicPluginStart {
 interface PluginsSetup {
   management: ManagementSetup;
   home?: HomePublicPluginSetup;
+  cloud?: { isCloudEnabled: boolean };
 }
 
 interface PluginsStart {
@@ -148,6 +149,7 @@ export class Plugin
           charts: pluginsStart.charts,
           alerting: pluginsStart.alerting,
           spaces: pluginsStart.spaces,
+          isCloud: Boolean(plugins.cloud?.isCloudEnabled),
           element: params.element,
           storage: new Storage(window.localStorage),
           setBreadcrumbs: params.setBreadcrumbs,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/browser/simple_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/browser/simple_fields.tsx
index 34f56a65df3e8..0e2f10b96fe6d 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/browser/simple_fields.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/browser/simple_fields.tsx
@@ -168,7 +168,7 @@ export const BrowserSimpleFields = memo<Props>(({ validate }) => {
         helpText={
           <FormattedMessage
             id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.tags.helpText"
-            defaultMessage="A list of tags that will be sent with the monitor event. Press enter to add a new tab. Displayed in Uptime and enables searching by tag."
+            defaultMessage="A list of tags that will be sent with the monitor event. Press enter to add a new tag. Displayed in Uptime and enables searching by tag."
           />
         }
       >
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/http/simple_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/http/simple_fields.tsx
index 8eb81eb92f7b4..c4de1d53fe998 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/http/simple_fields.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/http/simple_fields.tsx
@@ -186,7 +186,7 @@ export const HTTPSimpleFields = memo<Props>(({ validate }) => {
         helpText={
           <FormattedMessage
             id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.tags.helpText"
-            defaultMessage="A list of tags that will be sent with the monitor event. Press enter to add a new tab. Displayed in Uptime and enables searching by tag."
+            defaultMessage="A list of tags that will be sent with the monitor event. Press enter to add a new tag. Displayed in Uptime and enables searching by tag."
           />
         }
       >
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/icmp/simple_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/icmp/simple_fields.tsx
index 420f218429e40..92afe4c5072e1 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/icmp/simple_fields.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/icmp/simple_fields.tsx
@@ -190,7 +190,7 @@ export const ICMPSimpleFields = memo<Props>(({ validate }) => {
         helpText={
           <FormattedMessage
             id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.tags.helpText"
-            defaultMessage="A list of tags that will be sent with the monitor event. Press enter to add a new tab. Displayed in Uptime and enables searching by tag."
+            defaultMessage="A list of tags that will be sent with the monitor event. Press enter to add a new tag. Displayed in Uptime and enables searching by tag."
           />
         }
       >
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/tcp/simple_fields.tsx b/x-pack/plugins/uptime/public/components/fleet_package/tcp/simple_fields.tsx
index 8bc017a51cfa9..37f0c82595e02 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/tcp/simple_fields.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/tcp/simple_fields.tsx
@@ -157,7 +157,7 @@ export const TCPSimpleFields = memo<Props>(({ validate }) => {
         helpText={
           <FormattedMessage
             id="xpack.uptime.createPackagePolicy.stepConfigure.monitorIntegrationSettingsSection.tags.helpText"
-            defaultMessage="A list of tags that will be sent with the monitor event. Press enter to add a new tab. Displayed in Uptime and enables searching by tag."
+            defaultMessage="A list of tags that will be sent with the monitor event. Press enter to add a new tag. Displayed in Uptime and enables searching by tag."
           />
         }
       >
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 5a9d2a20fee16..dd43606cc79b7 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -149,7 +149,11 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         serverArgs: [
           ...xPackApiIntegrationTestsConfig.get('kbnTestServer.serverArgs'),
           ...(options.publicBaseUrl ? ['--server.publicBaseUrl=https://localhost:5601'] : []),
-          `--xpack.actions.allowedHosts=${JSON.stringify(['localhost', 'some.non.existent.com'])}`,
+          `--xpack.actions.allowedHosts=${JSON.stringify([
+            'localhost',
+            'some.non.existent.com',
+            'smtp.live.com',
+          ])}`,
           '--xpack.encryptedSavedObjects.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"',
           '--xpack.alerting.invalidateApiKeysTask.interval="15s"',
           '--xpack.alerting.healthCheck.interval="1s"',
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts
index 917246f09a99e..b3829824b7971 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts
@@ -319,5 +319,122 @@ export default function emailTest({ getService }: FtrProviderContext) {
           });
         });
     });
+
+    it('should return 200 when creating an email action without defining service', async () => {
+      const { body: createdAction } = await supertest
+        .post('/api/actions/connector')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'An email action',
+          connector_type_id: '.email',
+          config: {
+            from: 'bob@example.com',
+            host: 'some.non.existent.com',
+            port: 25,
+            hasAuth: true,
+          },
+          secrets: {
+            user: 'bob',
+            password: 'supersecret',
+          },
+        })
+        .expect(200);
+
+      expect(createdAction).to.eql({
+        id: createdAction.id,
+        is_preconfigured: false,
+        name: 'An email action',
+        connector_type_id: '.email',
+        is_missing_secrets: false,
+        config: {
+          service: 'other',
+          hasAuth: true,
+          host: 'some.non.existent.com',
+          port: 25,
+          secure: null,
+          from: 'bob@example.com',
+        },
+      });
+
+      expect(typeof createdAction.id).to.be('string');
+
+      const { body: fetchedAction } = await supertest
+        .get(`/api/actions/connector/${createdAction.id}`)
+        .expect(200);
+
+      expect(fetchedAction).to.eql({
+        id: fetchedAction.id,
+        is_preconfigured: false,
+        name: 'An email action',
+        connector_type_id: '.email',
+        is_missing_secrets: false,
+        config: {
+          from: 'bob@example.com',
+          service: 'other',
+          hasAuth: true,
+          host: 'some.non.existent.com',
+          port: 25,
+          secure: null,
+        },
+      });
+    });
+
+    it('should return 200 when creating an email action with nodemailer well-defined service', async () => {
+      const { body: createdAction } = await supertest
+        .post('/api/actions/connector')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'An email action',
+          connector_type_id: '.email',
+          config: {
+            from: 'bob@example.com',
+            service: 'hotmail',
+            hasAuth: true,
+          },
+          secrets: {
+            user: 'bob',
+            password: 'supersecret',
+          },
+        })
+        .expect(200);
+
+      expect(createdAction).to.eql({
+        id: createdAction.id,
+        is_preconfigured: false,
+        name: 'An email action',
+        connector_type_id: '.email',
+        is_missing_secrets: false,
+        config: {
+          service: 'hotmail',
+          hasAuth: true,
+          host: null,
+          port: null,
+          secure: null,
+          from: 'bob@example.com',
+        },
+      });
+
+      expect(typeof createdAction.id).to.be('string');
+
+      const { body: fetchedAction } = await supertest
+        .get(`/api/actions/connector/${createdAction.id}`)
+        .expect(200);
+
+      expect(fetchedAction).to.eql({
+        id: fetchedAction.id,
+        is_preconfigured: false,
+        name: 'An email action',
+        connector_type_id: '.email',
+        is_missing_secrets: false,
+        config: {
+          from: 'bob@example.com',
+          service: 'hotmail',
+          hasAuth: true,
+          host: null,
+          port: null,
+          secure: null,
+        },
+      });
+    });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts
index 811a9470611eb..9b88dace13239 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts
@@ -64,5 +64,23 @@ export default function createGetTests({ getService }: FtrProviderContext) {
       expect(responseWithisMissingSecrets.status).to.eql(200);
       expect(responseWithisMissingSecrets.body.isMissingSecrets).to.eql(false);
     });
+
+    it('7.16.0 migrates email connector configurations to set `service` property if not set', async () => {
+      const connectorWithService = await supertest.get(
+        `${getUrlPrefix(``)}/api/actions/action/0f8f2810-0a59-11ec-9a7c-fd0c2b83ff7c`
+      );
+
+      expect(connectorWithService.status).to.eql(200);
+      expect(connectorWithService.body.config).key('service');
+      expect(connectorWithService.body.config.service).to.eql('someservice');
+
+      const connectorWithoutService = await supertest.get(
+        `${getUrlPrefix(``)}/api/actions/action/1e0824a0-0a59-11ec-9a7c-fd0c2b83ff7c`
+      );
+
+      expect(connectorWithoutService.status).to.eql(200);
+      expect(connectorWithoutService.body.config).key('service');
+      expect(connectorWithoutService.body.config.service).to.eql('other');
+    });
   });
 }
diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts b/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts
new file mode 100644
index 0000000000000..d7a563e8c355f
--- /dev/null
+++ b/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts
@@ -0,0 +1,314 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { Job, Datafeed } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
+import type { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
+
+const testADJobs: Array<{ job: Job; datafeed: Datafeed }> = [
+  {
+    // @ts-expect-error not full interface
+    job: {
+      job_id: 'fq_single_1_smv',
+      groups: ['farequote', 'automated', 'single-metric'],
+      description: 'mean(responsetime) on farequote dataset with 15m bucket span',
+      analysis_config: {
+        bucket_span: '15m',
+        detectors: [
+          {
+            detector_description: 'mean(responsetime)',
+            function: 'mean',
+            field_name: 'responsetime',
+          },
+        ],
+        influencers: [],
+      },
+      analysis_limits: {
+        model_memory_limit: '10mb',
+        categorization_examples_limit: 4,
+      },
+      data_description: {
+        time_field: '@timestamp',
+        time_format: 'epoch_ms',
+      },
+      model_plot_config: {
+        enabled: true,
+        annotations_enabled: true,
+      },
+      model_snapshot_retention_days: 10,
+      daily_model_snapshot_retention_after_days: 1,
+      results_index_name: 'shared',
+      allow_lazy_open: false,
+    },
+    datafeed: {
+      datafeed_id: 'datafeed-fq_single_1_smv',
+      job_id: 'fq_single_1_smv',
+      query: {
+        bool: {
+          must: [
+            {
+              match_all: {},
+            },
+          ],
+        },
+      },
+      indices: ['ft_farequote'],
+      scroll_size: 1000,
+      delayed_data_check_config: {
+        enabled: true,
+      },
+    },
+  },
+  {
+    // @ts-expect-error not full interface
+    job: {
+      job_id: 'fq_single_2_smv',
+      groups: ['farequote', 'automated', 'single-metric'],
+      description: 'low_mean(responsetime) on farequote dataset with 15m bucket span',
+      analysis_config: {
+        bucket_span: '15m',
+        detectors: [
+          {
+            detector_description: 'low_mean(responsetime)',
+            function: 'low_mean',
+            field_name: 'responsetime',
+          },
+        ],
+        influencers: ['responsetime'],
+      },
+      analysis_limits: {
+        model_memory_limit: '11mb',
+        categorization_examples_limit: 4,
+      },
+      data_description: {
+        time_field: '@timestamp',
+        time_format: 'epoch_ms',
+      },
+      model_plot_config: {
+        enabled: true,
+        annotations_enabled: true,
+      },
+      model_snapshot_retention_days: 10,
+      daily_model_snapshot_retention_after_days: 1,
+      results_index_name: 'shared',
+      allow_lazy_open: false,
+    },
+    datafeed: {
+      datafeed_id: 'datafeed-fq_single_2_smv',
+      job_id: 'fq_single_2_smv',
+      query: {
+        bool: {
+          must: [
+            {
+              match_all: {},
+            },
+          ],
+        },
+      },
+      indices: ['ft_farequote'],
+      scroll_size: 1000,
+      delayed_data_check_config: {
+        enabled: true,
+      },
+    },
+  },
+  {
+    // @ts-expect-error not full interface
+    job: {
+      job_id: 'fq_single_3_smv',
+      groups: ['farequote', 'automated', 'single-metric'],
+      description: 'high_mean(responsetime) on farequote dataset with 15m bucket span',
+      analysis_config: {
+        bucket_span: '15m',
+        detectors: [
+          {
+            detector_description: 'high_mean(responsetime)',
+            function: 'high_mean',
+            field_name: 'responsetime',
+          },
+        ],
+        influencers: ['responsetime'],
+      },
+      analysis_limits: {
+        model_memory_limit: '11mb',
+        categorization_examples_limit: 4,
+      },
+      data_description: {
+        time_field: '@timestamp',
+        time_format: 'epoch_ms',
+      },
+      model_plot_config: {
+        enabled: true,
+        annotations_enabled: true,
+      },
+      model_snapshot_retention_days: 10,
+      daily_model_snapshot_retention_after_days: 1,
+      results_index_name: 'shared',
+      allow_lazy_open: false,
+    },
+    datafeed: {
+      datafeed_id: 'datafeed-fq_single_3_smv',
+      job_id: 'fq_single_3_smv',
+      query: {
+        bool: {
+          must: [
+            {
+              match_all: {},
+            },
+          ],
+        },
+      },
+      indices: ['ft_farequote'],
+      scroll_size: 1000,
+      delayed_data_check_config: {
+        enabled: true,
+      },
+    },
+  },
+];
+
+const testDFAJobs: DataFrameAnalyticsConfig[] = [
+  // @ts-expect-error not full interface
+  {
+    id: `bm_1_1`,
+    description:
+      "Classification job based on 'ft_bank_marketing' dataset with dependentVariable 'y' and trainingPercent '20'",
+    source: {
+      index: ['ft_bank_marketing'],
+      query: {
+        match_all: {},
+      },
+    },
+    dest: {
+      index: 'user-bm_1_1',
+      results_field: 'ml',
+    },
+    analysis: {
+      classification: {
+        prediction_field_name: 'test',
+        dependent_variable: 'y',
+        training_percent: 20,
+      },
+    },
+    analyzed_fields: {
+      includes: [],
+      excludes: [],
+    },
+    model_memory_limit: '60mb',
+    allow_lazy_start: false,
+  },
+  // @ts-expect-error not full interface
+  {
+    id: `ihp_1_2`,
+    description: 'This is the job description',
+    source: {
+      index: ['ft_ihp_outlier'],
+      query: {
+        match_all: {},
+      },
+    },
+    dest: {
+      index: 'user-ihp_1_2',
+      results_field: 'ml',
+    },
+    analysis: {
+      outlier_detection: {},
+    },
+    analyzed_fields: {
+      includes: [],
+      excludes: [],
+    },
+    model_memory_limit: '5mb',
+  },
+  // @ts-expect-error not full interface
+  {
+    id: `egs_1_3`,
+    description: 'This is the job description',
+    source: {
+      index: ['ft_egs_regression'],
+      query: {
+        match_all: {},
+      },
+    },
+    dest: {
+      index: 'user-egs_1_3',
+      results_field: 'ml',
+    },
+    analysis: {
+      regression: {
+        prediction_field_name: 'test',
+        dependent_variable: 'stab',
+        training_percent: 20,
+      },
+    },
+    analyzed_fields: {
+      includes: [],
+      excludes: [],
+    },
+    model_memory_limit: '20mb',
+  },
+];
+
+export default function ({ getService }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const ml = getService('ml');
+
+  describe('export jobs', function () {
+    this.tags(['mlqa']);
+    before(async () => {
+      await ml.api.cleanMlIndices();
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+      await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
+
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
+      await ml.testResources.createIndexPatternIfNeeded('ft_bank_marketing', '@timestamp');
+
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier');
+      await ml.testResources.createIndexPatternIfNeeded('ft_ihp_outlier', '@timestamp');
+
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/egs_regression');
+      await ml.testResources.createIndexPatternIfNeeded('ft_egs_regression', '@timestamp');
+
+      await ml.testResources.setKibanaTimeZoneToUTC();
+
+      for (const { job, datafeed } of testADJobs) {
+        await ml.api.createAnomalyDetectionJob(job);
+        await ml.api.createDatafeed(datafeed);
+      }
+      for (const job of testDFAJobs) {
+        await ml.api.createDataFrameAnalyticsJob(job);
+      }
+
+      await ml.securityUI.loginAsMlPowerUser();
+      await ml.navigation.navigateToStackManagement();
+      await ml.navigation.navigateToStackManagementJobsListPage();
+    });
+    after(async () => {
+      await ml.api.cleanMlIndices();
+      ml.stackManagementJobs.deleteExportedFiles([
+        'anomaly_detection_jobs',
+        'data_frame_analytics_jobs',
+      ]);
+    });
+
+    it('opens export flyout and exports anomaly detector jobs', async () => {
+      await ml.stackManagementJobs.openExportFlyout();
+      await ml.stackManagementJobs.selectExportJobType('anomaly-detector');
+      await ml.stackManagementJobs.selectExportJobSelectAll('anomaly-detector');
+      await ml.stackManagementJobs.selectExportJobs();
+      await ml.stackManagementJobs.assertExportedADJobsAreCorrect(testADJobs);
+    });
+
+    it('opens export flyout and exports data frame analytics jobs', async () => {
+      await ml.stackManagementJobs.openExportFlyout();
+      await ml.stackManagementJobs.selectExportJobType('data-frame-analytics');
+      await ml.stackManagementJobs.selectExportJobSelectAll('data-frame-analytics');
+      await ml.stackManagementJobs.selectExportJobs();
+      await ml.stackManagementJobs.assertExportedDFAJobsAreCorrect(testDFAJobs);
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/files_to_import/anomaly_detection_jobs_7.16.json b/x-pack/test/functional/apps/ml/stack_management_jobs/files_to_import/anomaly_detection_jobs_7.16.json
new file mode 100644
index 0000000000000..1bc51d433858e
--- /dev/null
+++ b/x-pack/test/functional/apps/ml/stack_management_jobs/files_to_import/anomaly_detection_jobs_7.16.json
@@ -0,0 +1,213 @@
+[
+  {
+    "job": {
+      "job_id": "ad-test1",
+      "description": "",
+      "analysis_config": {
+        "bucket_span": "15m",
+        "summary_count_field_name": "doc_count",
+        "detectors": [
+          {
+            "detector_description": "mean(responsetime)",
+            "function": "mean",
+            "field_name": "responsetime",
+            "detector_index": 0
+          }
+        ],
+        "influencers": []
+      },
+      "analysis_limits": {
+        "model_memory_limit": "11mb",
+        "categorization_examples_limit": 4
+      },
+      "data_description": {
+        "time_field": "@timestamp",
+        "time_format": "epoch_ms"
+      },
+      "model_plot_config": {
+        "enabled": true,
+        "annotations_enabled": true
+      },
+      "model_snapshot_retention_days": 10,
+      "daily_model_snapshot_retention_after_days": 1,
+      "results_index_name": "shared",
+      "allow_lazy_open": false
+    },
+    "datafeed": {
+      "datafeed_id": "datafeed-ad-test1",
+      "job_id": "ad-test1",
+      "query": {
+        "bool": {
+          "must": [
+            {
+              "match_all": {}
+            }
+          ]
+        }
+      },
+      "indices": [
+        "ft_farequote"
+      ],
+      "aggregations": {
+        "buckets": {
+          "date_histogram": {
+            "field": "@timestamp",
+            "fixed_interval": "90000ms"
+          },
+          "aggregations": {
+            "responsetime": {
+              "avg": {
+                "field": "responsetime"
+              }
+            },
+            "@timestamp": {
+              "max": {
+                "field": "@timestamp"
+              }
+            }
+          }
+        }
+      },
+      "scroll_size": 1000,
+      "delayed_data_check_config": {
+        "enabled": true
+      }
+    }
+  },
+  {
+    "job": {
+      "job_id": "ad-test2",
+      "groups": [
+        "newgroup"
+      ],
+      "description": "",
+      "analysis_config": {
+        "bucket_span": "15m",
+        "summary_count_field_name": "doc_count",
+        "detectors": [
+          {
+            "detector_description": "mean(responsetime)",
+            "function": "mean",
+            "field_name": "responsetime",
+            "detector_index": 0
+          }
+        ],
+        "influencers": []
+      },
+      "analysis_limits": {
+        "model_memory_limit": "11mb",
+        "categorization_examples_limit": 4
+      },
+      "data_description": {
+        "time_field": "@timestamp",
+        "time_format": "epoch_ms"
+      },
+      "model_plot_config": {
+        "enabled": true,
+        "annotations_enabled": true
+      },
+      "model_snapshot_retention_days": 10,
+      "daily_model_snapshot_retention_after_days": 1,
+      "results_index_name": "shared",
+      "allow_lazy_open": false
+    },
+    "datafeed": {
+      "datafeed_id": "datafeed-ad-test2",
+      "job_id": "ad-test2",
+      "query": {
+        "bool": {
+          "must": [
+            {
+              "match_all": {}
+            }
+          ]
+        }
+      },
+      "indices": [
+        "missing"
+      ],
+      "aggregations": {
+        "buckets": {
+          "date_histogram": {
+            "field": "@timestamp",
+            "fixed_interval": "90000ms"
+          },
+          "aggregations": {
+            "responsetime": {
+              "avg": {
+                "field": "responsetime"
+              }
+            },
+            "@timestamp": {
+              "max": {
+                "field": "@timestamp"
+              }
+            }
+          }
+        }
+      },
+      "scroll_size": 1000,
+      "delayed_data_check_config": {
+        "enabled": true
+      }
+    }
+  },
+  {
+    "job": {
+      "job_id": "ad-test3",
+      "custom_settings": {},
+      "description": "",
+      "analysis_config": {
+        "bucket_span": "15m",
+        "detectors": [
+          {
+            "detector_description": "mean(responsetime) partitionfield=airline",
+            "function": "mean",
+            "field_name": "responsetime",
+            "partition_field_name": "airline",
+            "detector_index": 0
+          }
+        ],
+        "influencers": [
+          "airline"
+        ]
+      },
+      "analysis_limits": {
+        "model_memory_limit": "11mb",
+        "categorization_examples_limit": 4
+      },
+      "data_description": {
+        "time_field": "@timestamp",
+        "time_format": "epoch_ms"
+      },
+      "model_plot_config": {
+        "enabled": false,
+        "annotations_enabled": false
+      },
+      "model_snapshot_retention_days": 10,
+      "daily_model_snapshot_retention_after_days": 1,
+      "results_index_name": "shared",
+      "allow_lazy_open": false
+    },
+    "datafeed": {
+      "datafeed_id": "datafeed-ad-test3",
+      "job_id": "ad-test3",
+      "query": {
+        "bool": {
+          "must": [
+            {
+              "match_all": {}
+            }
+          ]
+        }
+      },
+      "indices": [
+        "ft_farequote"
+      ],
+      "scroll_size": 1000,
+      "delayed_data_check_config": {
+        "enabled": true
+      }
+    }
+  }
+]
diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/files_to_import/bad_data.json b/x-pack/test/functional/apps/ml/stack_management_jobs/files_to_import/bad_data.json
new file mode 100644
index 0000000000000..5c40480832c00
--- /dev/null
+++ b/x-pack/test/functional/apps/ml/stack_management_jobs/files_to_import/bad_data.json
@@ -0,0 +1 @@
+Hey! this isn't JSON.
diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/files_to_import/data_frame_analytics_jobs_7.16.json b/x-pack/test/functional/apps/ml/stack_management_jobs/files_to_import/data_frame_analytics_jobs_7.16.json
new file mode 100644
index 0000000000000..cb93aa9e24c5f
--- /dev/null
+++ b/x-pack/test/functional/apps/ml/stack_management_jobs/files_to_import/data_frame_analytics_jobs_7.16.json
@@ -0,0 +1,60 @@
+[
+  {
+    "id": "dfa-test1",
+    "description": "Classification job based on 'ft_bank_marketing' dataset with dependentVariable 'y' and trainingPercent '20'",
+    "source": {
+      "index": [
+        "ft_bank_marketing"
+      ],
+      "query": {
+        "match_all": {}
+      }
+    },
+    "dest": {
+      "index": "user-dfa-test1",
+      "results_field": "ml"
+    },
+    "analysis": {
+      "classification": {
+        "prediction_field_name": "user-test",
+        "dependent_variable": "y",
+        "training_percent": 20
+      }
+    },
+    "analyzed_fields": {
+      "includes": [],
+      "excludes": []
+    },
+    "model_memory_limit": "60mb",
+    "allow_lazy_start": false
+  },
+  {
+    "id": "dfa-test2",
+    "description": "Classification job based on 'ft_bank_marketing' dataset with dependentVariable 'y' and trainingPercent '20'",
+    "source": {
+      "index": [
+        "missing-index"
+      ],
+      "query": {
+        "match_all": {}
+      }
+    },
+    "dest": {
+      "index": "user-dfa-test2",
+      "results_field": "ml"
+    },
+    "analysis": {
+      "classification": {
+        "prediction_field_name": "test",
+        "dependent_variable": "y",
+        "training_percent": 20
+      }
+    },
+    "analyzed_fields": {
+      "includes": [],
+      "excludes": []
+    },
+    "model_memory_limit": "60mb",
+    "allow_lazy_start": false
+  }
+]
diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/import_jobs.ts b/x-pack/test/functional/apps/ml/stack_management_jobs/import_jobs.ts
new file mode 100644
index 0000000000000..6211885af0a2a
--- /dev/null
+++ b/x-pack/test/functional/apps/ml/stack_management_jobs/import_jobs.ts
@@ -0,0 +1,107 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import path from 'path';
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { JobType } from '../../../../../plugins/ml/common/types/saved_objects';
+
+export default function ({ getService }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const ml = getService('ml');
+  const testDataListPositive = [
+    {
+      filePath: path.join(__dirname, 'files_to_import', 'anomaly_detection_jobs_7.16.json'),
+      expected: {
+        jobType: 'anomaly-detector' as JobType,
+        jobIds: ['ad-test1', 'ad-test3'],
+        skippedJobIds: ['ad-test2'],
+      },
+    },
+    {
+      filePath: path.join(__dirname, 'files_to_import', 'data_frame_analytics_jobs_7.16.json'),
+      expected: {
+        jobType: 'data-frame-analytics' as JobType,
+        jobIds: ['dfa-test1'],
+        skippedJobIds: ['dfa-test2'],
+      },
+    },
+  ];
+
+  describe('import jobs', function () {
+    this.tags(['mlqa']);
+    before(async () => {
+      await ml.api.cleanMlIndices();
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
+      await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
+      await ml.testResources.createIndexPatternIfNeeded('ft_bank_marketing', '@timestamp');
+      await ml.testResources.setKibanaTimeZoneToUTC();
+
+      await ml.securityUI.loginAsMlPowerUser();
+      await ml.navigation.navigateToStackManagement();
+      await ml.navigation.navigateToStackManagementJobsListPage();
+    });
+
+    after(async () => {
+      await ml.api.cleanMlIndices();
+    });
+
+    for (const testData of testDataListPositive) {
+      it('selects and reads file', async () => {
+        await ml.testExecution.logTestStep('selects job import');
+        await ml.stackManagementJobs.openImportFlyout();
+        await ml.stackManagementJobs.selectFileToImport(testData.filePath);
+      });
+      it('has the correct importable jobs', async () => {
+        await ml.stackManagementJobs.assertCorrectTitle(
+          [...testData.expected.jobIds, ...testData.expected.skippedJobIds].length,
+          testData.expected.jobType
+        );
+        await ml.stackManagementJobs.assertJobIdsExist(testData.expected.jobIds);
+        await ml.stackManagementJobs.assertJobIdsSkipped(testData.expected.skippedJobIds);
+      });
+
+      it('imports jobs', async () => {
+        await ml.stackManagementJobs.importJobs();
+      });
+
+      it('ensures jobs have been imported', async () => {
+        if (testData.expected.jobType === 'anomaly-detector') {
+          await ml.navigation.navigateToStackManagementJobsListPageAnomalyDetectionTab();
+          await ml.jobTable.refreshJobList();
+          for (const id of testData.expected.jobIds) {
+            await ml.jobTable.filterWithSearchString(id);
+          }
+          for (const id of testData.expected.skippedJobIds) {
+            await ml.jobTable.filterWithSearchString(id, 0);
+          }
+        } else {
+          await ml.navigation.navigateToStackManagementJobsListPageAnalyticsTab();
+          await ml.dataFrameAnalyticsTable.refreshAnalyticsTable();
+          for (const id of testData.expected.jobIds) {
+            await ml.dataFrameAnalyticsTable.assertAnalyticsJobDisplayedInTable(id, true);
+          }
+          for (const id of testData.expected.skippedJobIds) {
+            await ml.dataFrameAnalyticsTable.assertAnalyticsJobDisplayedInTable(id, false);
+          }
+        }
+      });
+    }
+
+    describe('correctly fails to import bad data', async () => {
+      it('selects and reads file', async () => {
+        await ml.testExecution.logTestStep('selects job import');
+        await ml.stackManagementJobs.openImportFlyout();
+        await ml.stackManagementJobs.selectFileToImport(
+          path.join(__dirname, 'files_to_import', 'bad_data.json'),
+          true
+        );
+      });
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/index.ts b/x-pack/test/functional/apps/ml/stack_management_jobs/index.ts
index f120ab0b450dc..c5e0728266bab 100644
--- a/x-pack/test/functional/apps/ml/stack_management_jobs/index.ts
+++ b/x-pack/test/functional/apps/ml/stack_management_jobs/index.ts
@@ -13,5 +13,7 @@ export default function ({ loadTestFile }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./synchronize'));
     loadTestFile(require.resolve('./manage_spaces'));
+    loadTestFile(require.resolve('./import_jobs'));
+    loadTestFile(require.resolve('./export_jobs'));
   });
 }
diff --git a/x-pack/test/functional/es_archives/actions/data.json b/x-pack/test/functional/es_archives/actions/data.json
index 18d67da1752bc..31d10005c0939 100644
--- a/x-pack/test/functional/es_archives/actions/data.json
+++ b/x-pack/test/functional/es_archives/actions/data.json
@@ -110,3 +110,67 @@
     }
   }
 }
+
+{
+  "type": "doc",
+  "value": {
+    "id": "action:0f8f2810-0a59-11ec-9a7c-fd0c2b83ff7c",
+    "index": ".kibana_1",
+    "source": {
+      "action": {
+        "actionTypeId" : ".email",
+        "name" : "test email connector with auth",
+        "isMissingSecrets" : false,
+        "config" : {
+          "hasAuth" : true,
+          "from" : "me@me.com",
+          "host" : "smtp.myhost.com",
+          "port" : 25,
+          "service" : "someservice",
+          "secure" : null
+        },
+        "secrets" : "V2EJEtTv3yTFi1kdglhNahnKYWCS+J7aWCJQU+eEqGPZEz6n7G1NsBWoh7IY0FteLTilTteQXyY/Eg3k/7bb0G8Mz+WBZ1mRvUggGTFqgoOptyUsvHoBhv0R/1bCTCabN3Pe88AfnC+VDXqwuMifpmgKEEsKF3H8VONv7TYO02FW"
+      },
+      "migrationVersion": {
+        "action": "7.14.0"
+      },
+      "coreMigrationVersion" : "7.15.0",
+      "references": [
+      ],
+      "type": "action",
+      "updated_at": "2021-08-31T12:43:37.117Z"
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "action:1e0824a0-0a59-11ec-9a7c-fd0c2b83ff7c",
+    "index": ".kibana_1",
+    "source": {
+      "action": {
+        "actionTypeId" : ".email",
+        "name" : "test email connector no auth",
+        "isMissingSecrets" : false,
+        "config" : {
+          "hasAuth" : false,
+          "from" : "you@you.com",
+          "host" : "smtp.you.com",
+          "port" : 485,
+          "secure" : true,
+          "service" : null
+        },
+        "secrets" : "iw/bRTXZQXOV0ODocb6FQnHR6AyeVyD91We03llNStyTNFwuHVWdFl6ZdiEEeDOadBMeJomvp/dAfQevGpbwWdclcu9F87x3CfeGqV9DtBy0dXRbx9PzKBwgJdK3ucHQDFAs8ZXQbefvCOFjCHGAsJDPhTKj5rTUyg=="
+      },
+      "migrationVersion": {
+        "action": "7.14.0"
+      },
+      "coreMigrationVersion" : "7.15.0",
+      "references": [
+      ],
+      "type": "action",
+      "updated_at": "2021-08-31T12:44:01.396Z"
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/actions/mappings.json b/x-pack/test/functional/es_archives/actions/mappings.json
index 737e0df57552e..8289174ffd57d 100644
--- a/x-pack/test/functional/es_archives/actions/mappings.json
+++ b/x-pack/test/functional/es_archives/actions/mappings.json
@@ -572,6 +572,9 @@
             }
           }
         },
+        "coreMigrationVersion": {
+          "type": "keyword"
+        },
         "dashboard": {
           "properties": {
             "description": {
diff --git a/x-pack/test/functional/es_archives/event_log_legacy_ids/data.json b/x-pack/test/functional/es_archives/event_log_legacy_ids/data.json
new file mode 100644
index 0000000000000..54b0c3f48189a
--- /dev/null
+++ b/x-pack/test/functional/es_archives/event_log_legacy_ids/data.json
@@ -0,0 +1,164 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "X6bLb3UBt6Z_MVvSTfYk",
+    "index": ".kibana-event-log-8.0.0-000001",
+    "source": {
+      "@timestamp": "2020-10-28T15:19:55.933Z",
+      "ecs": {
+        "version": "1.5.0"
+      },
+      "event": {
+        "action": "test",
+        "duration": 0,
+        "end": "2020-10-28T15:19:55.933Z",
+        "provider": "event_log_fixture",
+        "start": "2020-10-28T15:19:55.933Z"
+      },
+      "kibana": {
+        "saved_objects": [
+          {
+            "id": "621f2511-5cd1-44fd-95df-e0df83e354d5",
+            "rel": "primary",
+            "type": "event_log_test"
+          }
+        ],
+        "server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d",
+        "version": "8.0.0"
+      },
+      "message": "test 2020-10-28T15:19:55.913Z"
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "X6bLb3UBt6Z_MVvSTfYk0000",
+    "index": ".kibana-event-log-8.0.0-000001",
+    "source": {
+      "@timestamp": "2020-10-28T15:19:55.933Z",
+      "ecs": {
+        "version": "1.5.0"
+      },
+      "event": {
+        "action": "test legacy",
+        "duration": 0,
+        "end": "2020-10-28T15:19:55.933Z",
+        "provider": "event_log_fixture",
+        "start": "2020-10-28T15:19:55.933Z"
+      },
+      "kibana": {
+        "saved_objects": [
+          {
+            "id": "521f2511-5cd1-44fd-95df-e0df83e354d5",
+            "rel": "primary",
+            "type": "event_log_test"
+          }
+        ],
+        "server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d",
+        "version": "7.14.0"
+      },
+      "message": "test legacy 2020-10-28T15:19:55.913Z"
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "YKbLb3UBt6Z_MVvSTfY8",
+    "index": ".kibana-event-log-8.0.0-000001",
+    "source": {
+      "@timestamp": "2020-10-28T15:19:55.957Z",
+      "ecs": {
+        "version": "1.5.0"
+      },
+      "event": {
+        "action": "test",
+        "duration": 0,
+        "end": "2020-10-28T15:19:55.957Z",
+        "provider": "event_log_fixture",
+        "start": "2020-10-28T15:19:55.957Z"
+      },
+      "kibana": {
+        "saved_objects": [
+          {
+            "id": "621f2511-5cd1-44fd-95df-e0df83e354d5",
+            "rel": "primary",
+            "type": "event_log_test"
+          }
+        ],
+        "server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d",
+        "version": "8.0.0"
+      },
+      "message": "test 2020-10-28T15:19:55.938Z"
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "YabLb3UBt6Z_MVvSTfZc0000",
+    "index": ".kibana-event-log-8.0.0-000001",
+    "source": {
+      "@timestamp": "2020-10-28T15:19:55.991Z",
+      "ecs": {
+        "version": "1.5.0"
+      },
+      "event": {
+        "action": "test",
+        "duration": 0,
+        "end": "2020-10-28T15:19:55.991Z",
+        "provider": "event_log_fixture",
+        "start": "2020-10-28T15:19:55.991Z"
+      },
+      "kibana": {
+        "saved_objects": [
+          {
+            "id": "521f2511-5cd1-44fd-95df-e0df83e354d5",
+            "rel": "primary",
+            "type": "event_log_test"
+          }
+        ],
+        "server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d",
+        "version": "7.0.0"
+      },
+      "message": "test legacy 2020-10-28T15:19:55.962Z"
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "YabLb3UBt6Z_MVvSTfZc",
+    "index": ".kibana-event-log-8.0.0-000001",
+    "source": {
+      "@timestamp": "2020-10-28T15:19:55.991Z",
+      "ecs": {
+        "version": "1.5.0"
+      },
+      "event": {
+        "action": "test",
+        "duration": 0,
+        "end": "2020-10-28T15:19:55.991Z",
+        "provider": "event_log_fixture",
+        "start": "2020-10-28T15:19:55.991Z"
+      },
+      "kibana": {
+        "saved_objects": [
+          {
+            "id": "621f2511-5cd1-44fd-95df-e0df83e354d5",
+            "rel": "primary",
+            "type": "event_log_test"
+          }
+        ],
+        "server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d",
+        "version": "8.0.0"
+      },
+      "message": "test 2020-10-28T15:19:55.962Z"
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/functional/es_archives/event_log_legacy_ids/mappings.json b/x-pack/test/functional/es_archives/event_log_legacy_ids/mappings.json
new file mode 100644
index 0000000000000..564a9e56a7853
--- /dev/null
+++ b/x-pack/test/functional/es_archives/event_log_legacy_ids/mappings.json
@@ -0,0 +1,579 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".kibana": {
+      }
+    },
+    "index": ".kibana_1",
+    "mappings": {
+      "_meta": {
+        "migrationMappingPropertyHashes": {
+          "action": "6e96ac5e648f57523879661ea72525b7",
+          "action_task_params": "a9d49f184ee89641044be0ca2950fa3a",
+          "alert": "eaf6f5841dbf4cb5e3045860f75f53ca",
+          "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd",
+          "apm-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
+          "app_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724",
+          "application_usage_daily": "43b8830d5d0df85a6823d290885fc9fd",
+          "application_usage_totals": "3d1b76c39bfb2cc8296b024d73854724",
+          "application_usage_transactional": "3d1b76c39bfb2cc8296b024d73854724",
+          "canvas-element": "7390014e1091044523666d97247392fc",
+          "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
+          "canvas-workpad-template": "ae2673f678281e2c055d764b153e9715",
+          "cases": "477f214ff61acc3af26a7b7818e380c1",
+          "cases-comments": "c2061fb929f585df57425102fa928b4b",
+          "cases-configure": "387c5f3a3bda7e0ae0dd4e106f914a69",
+          "cases-user-actions": "32277330ec6b721abe3b846cfd939a71",
+          "config": "c63748b75f39d0c54de12d12c1ccbc20",
+          "dashboard": "40554caf09725935e2c02e02563a2d07",
+          "endpoint:user-artifact": "4a11183eee21e6fbad864f7a30b39ad0",
+          "endpoint:user-artifact-manifest": "a0d7b04ad405eed54d76e279c3727862",
+          "enterprise_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724",
+          "epm-packages": "2b83397e3eaaaa8ef15e38813f3721c3",
+          "event_log_test": "bef808d4a9c27f204ffbda3359233931",
+          "exception-list": "67f055ab8c10abd7b2ebfd969b836788",
+          "exception-list-agnostic": "67f055ab8c10abd7b2ebfd969b836788",
+          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
+          "fleet-agent-actions": "9511b565b1cc6441a42033db3d5de8e9",
+          "fleet-agent-events": "e20a508b6e805189356be381dbfac8db",
+          "fleet-agents": "cb661e8ede2b640c42c8e5ef99db0683",
+          "fleet-enrollment-api-keys": "a69ef7ae661dab31561d6c6f052ef2a7",
+          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
+          "index-pattern": "45915a1ad866812242df474eb0479052",
+          "infrastructure-ui-source": "3d1b76c39bfb2cc8296b024d73854724",
+          "ingest-agent-policies": "8b0733cce189659593659dad8db426f0",
+          "ingest-outputs": "8854f34453a47e26f86a29f8f3b80b4e",
+          "ingest-package-policies": "f74dfe498e1849267cda41580b2be110",
+          "ingest_manager_settings": "02a03095f0e05b7a538fa801b88a217f",
+          "inventory-view": "3d1b76c39bfb2cc8296b024d73854724",
+          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
+          "lens": "52346cfec69ff7b47d5f0c12361a2797",
+          "lens-ui-telemetry": "509bfa5978586998e05f9e303c07a327",
+          "map": "4a05b35c3a3a58fbc72dd0202dc3487f",
+          "maps-telemetry": "5ef305b18111b77789afefbd36b66171",
+          "metrics-explorer-view": "3d1b76c39bfb2cc8296b024d73854724",
+          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
+          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
+          "monitoring-telemetry": "2669d5ec15e82391cf58df4294ee9c68",
+          "namespace": "2f4316de49999235636386fe51dc06c1",
+          "namespaces": "2f4316de49999235636386fe51dc06c1",
+          "originId": "2f4316de49999235636386fe51dc06c1",
+          "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
+          "references": "7997cf5a56cc02bdc9c93361bde732b0",
+          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
+          "search": "43012c7ebc4cb57054e0a490e4b43023",
+          "search-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
+          "siem-detection-engine-rule-actions": "6569b288c169539db10cb262bf79de18",
+          "siem-detection-engine-rule-status": "ae783f41c6937db6b7a2ef5c93a9e9b0",
+          "siem-ui-timeline": "d12c5474364d737d17252acf1dc4585c",
+          "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
+          "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
+          "space": "c5ca8acafa0beaa4d08d014a97b6bc6b",
+          "telemetry": "36a616f7026dfa617d6655df850fe16d",
+          "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
+          "tsvb-validation-telemetry": "3a37ef6c8700ae6fc97d5c7da00e9215",
+          "type": "2f4316de49999235636386fe51dc06c1",
+          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
+          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
+          "upgrade-assistant-reindex-operation": "215107c281839ea9b3ad5f6419819763",
+          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
+          "uptime-dynamic-settings": "3d1b76c39bfb2cc8296b024d73854724",
+          "url": "c7f66a0df8b1b52f17c28c4adb111105",
+          "visualization": "f819cf6636b75c9e76ba733a0c6ef355",
+          "workplace_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724"
+        }
+      },
+      "dynamic": "strict",
+      "properties": {
+        "config": {
+          "dynamic": "false",
+          "properties": {
+            "buildNum": {
+              "type": "keyword"
+            }
+          }
+        },
+        "event_log_test": {
+          "type": "object"
+        },
+        "migrationVersion": {
+          "dynamic": "true",
+          "properties": {
+            "config": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "space": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "ml-telemetry": {
+          "properties": {
+            "file_data_visualizer": {
+              "properties": {
+                "index_creation_count": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "monitoring-telemetry": {
+          "properties": {
+            "reportedClusterUuids": {
+              "type": "keyword"
+            }
+          }
+        },
+        "namespace": {
+          "type": "keyword"
+        },
+        "namespaces": {
+          "type": "keyword"
+        },
+        "originId": {
+          "type": "keyword"
+        },
+        "query": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "filters": {
+              "enabled": false,
+              "type": "object"
+            },
+            "query": {
+              "properties": {
+                "language": {
+                  "type": "keyword"
+                },
+                "query": {
+                  "index": false,
+                  "type": "keyword"
+                }
+              }
+            },
+            "timefilter": {
+              "enabled": false,
+              "type": "object"
+            },
+            "title": {
+              "type": "text"
+            }
+          }
+        },
+        "references": {
+          "properties": {
+            "id": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          },
+          "type": "nested"
+        },
+        "type": {
+          "type": "keyword"
+        },
+        "space": {
+          "properties": {
+            "_reserved": {
+              "type": "boolean"
+            },
+            "color": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "disabledFeatures": {
+              "type": "keyword"
+            },
+            "imageUrl": {
+              "index": false,
+              "type": "text"
+            },
+            "initials": {
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "ui-metric": {
+          "properties": {
+            "count": {
+              "type": "integer"
+            }
+          }
+        },
+        "updated_at": {
+          "type": "date"
+        },
+        "url": {
+          "properties": {
+            "accessCount": {
+              "type": "long"
+            },
+            "accessDate": {
+              "type": "date"
+            },
+            "createDate": {
+              "type": "date"
+            },
+            "url": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "visualization": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "index": false,
+                  "type": "text"
+                }
+              }
+            },
+            "savedSearchRefName": {
+              "doc_values": false,
+              "index": false,
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "index": false,
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "visState": {
+              "index": false,
+              "type": "text"
+            }
+          }
+        },
+        "workplace_search_telemetry": {
+          "dynamic": "false",
+          "type": "object"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
+
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".kibana-event-log-7.9.0": {
+        "is_write_index": true
+      }
+    },
+    "index": ".kibana-event-log-7.9.0-000001",
+    "mappings": {
+      "dynamic": "false",
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "ecs": {
+          "properties": {
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "error": {
+          "properties": {
+            "message": {
+              "norms": false,
+              "type": "text"
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "action": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "duration": {
+              "type": "long"
+            },
+            "end": {
+              "type": "date"
+            },
+            "outcome": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "start": {
+              "type": "date"
+            }
+          }
+        },
+        "kibana": {
+          "properties": {
+            "alerting": {
+              "properties": {
+                "instance_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "saved_objects": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "namespace": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "rel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "server_uuid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "message": {
+          "norms": false,
+          "type": "text"
+        },
+        "tags": {
+          "ignore_above": 1024,
+          "meta": {
+            "isArray": "true"
+          },
+          "type": "keyword"
+        },
+        "user": {
+          "properties": {
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "lifecycle": {
+          "name": "kibana-event-log-policy",
+          "rollover_alias": ".kibana-event-log-7.9.0"
+        },
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
+
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".kibana-event-log-8.0.0": {
+        "is_write_index": true
+      }
+    },
+    "index": ".kibana-event-log-8.0.0-000001",
+    "mappings": {
+      "dynamic": "false",
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "ecs": {
+          "properties": {
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "error": {
+          "properties": {
+            "message": {
+              "norms": false,
+              "type": "text"
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "action": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "duration": {
+              "type": "long"
+            },
+            "end": {
+              "type": "date"
+            },
+            "outcome": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "start": {
+              "type": "date"
+            }
+          }
+        },
+        "kibana": {
+          "properties": {
+            "alerting": {
+              "properties": {
+                "instance_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "saved_objects": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "namespace": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "rel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "server_uuid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "type": "version"
+            }
+          }
+        },
+        "message": {
+          "norms": false,
+          "type": "text"
+        },
+        "tags": {
+          "ignore_above": 1024,
+          "meta": {
+            "isArray": "true"
+          },
+          "type": "keyword"
+        },
+        "user": {
+          "properties": {
+            "name": {
+              "fields": {
+                "text": {
+                  "norms": false,
+                  "type": "text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "lifecycle": {
+          "name": "kibana-event-log-policy",
+          "rollover_alias": ".kibana-event-log-8.0.0"
+        },
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/event_log_multiple_indicies/data.json b/x-pack/test/functional/es_archives/event_log_multiple_indicies/data.json
index 4e871f6308b77..70bb1d8551a10 100644
--- a/x-pack/test/functional/es_archives/event_log_multiple_indicies/data.json
+++ b/x-pack/test/functional/es_archives/event_log_multiple_indicies/data.json
@@ -202,7 +202,8 @@
             "type": "event_log_test"
           }
         ],
-        "server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d"
+        "server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d",
+        "version": "8.0.0"
       },
       "message": "test 2020-10-28T15:19:55.913Z"
     }
@@ -234,7 +235,8 @@
             "type": "event_log_test"
           }
         ],
-        "server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d"
+        "server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d",
+        "version": "8.0.0"
       },
       "message": "test 2020-10-28T15:19:55.938Z"
     }
@@ -266,7 +268,8 @@
             "type": "event_log_test"
           }
         ],
-        "server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d"
+        "server_uuid": "5b2de169-2785-441b-ae8c-186a1936b17d",
+        "version": "8.0.0"
       },
       "message": "test 2020-10-28T15:19:55.962Z"
     }
diff --git a/x-pack/test/functional/es_archives/event_log_multiple_indicies/mappings.json b/x-pack/test/functional/es_archives/event_log_multiple_indicies/mappings.json
index e9a709138256a..15382fb2524fe 100644
--- a/x-pack/test/functional/es_archives/event_log_multiple_indicies/mappings.json
+++ b/x-pack/test/functional/es_archives/event_log_multiple_indicies/mappings.json
@@ -397,7 +397,7 @@
             "server_uuid": {
               "ignore_above": 1024,
               "type": "keyword"
-            }
+            }     
           }
         },
         "message": {
@@ -531,6 +531,9 @@
             "server_uuid": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "version": {
+              "type": "version"
             }
           }
         },
diff --git a/x-pack/test/functional/services/ml/stack_management_jobs.ts b/x-pack/test/functional/services/ml/stack_management_jobs.ts
index 48fb89e51ff11..45b9fa2f29ccd 100644
--- a/x-pack/test/functional/services/ml/stack_management_jobs.ts
+++ b/x-pack/test/functional/services/ml/stack_management_jobs.ts
@@ -6,10 +6,16 @@
  */
 
 import expect from '@kbn/expect';
+import { REPO_ROOT } from '@kbn/utils';
+import fs from 'fs';
+import path from 'path';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { MlADJobTable } from './job_table';
-import { MlDFAJobTable } from './data_frame_analytics_table';
+import type { FtrProviderContext } from '../../ftr_provider_context';
+import type { MlADJobTable } from './job_table';
+import type { MlDFAJobTable } from './data_frame_analytics_table';
+import type { JobType } from '../../../../plugins/ml/common/types/saved_objects';
+import type { Job, Datafeed } from '../../../../plugins/ml/common/types/anomaly_detection_jobs';
+import type { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common';
 
 type SyncFlyoutObjectType =
   | 'MissingObjects'
@@ -18,7 +24,7 @@ type SyncFlyoutObjectType =
   | 'ObjectsUnmatchedDatafeed';
 
 export function MachineLearningStackManagementJobsProvider(
-  { getService }: FtrProviderContext,
+  { getService, getPageObjects }: FtrProviderContext,
   mlADJobTable: MlADJobTable,
   mlDFAJobTable: MlDFAJobTable
 ) {
@@ -26,6 +32,9 @@ export function MachineLearningStackManagementJobsProvider(
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
   const toasts = getService('toasts');
+  const log = getService('log');
+
+  const PageObjects = getPageObjects(['common']);
 
   return {
     async openSyncFlyout() {
@@ -194,5 +203,212 @@ export function MachineLearningStackManagementJobsProvider(
       }
       await this.assertSpaceSelectionRowSelected(spaceId, shouldSelect);
     },
+
+    async openImportFlyout() {
+      await retry.tryForTime(5000, async () => {
+        await testSubjects.click('mlJobsImportButton', 1000);
+        await testSubjects.existOrFail('mlJobMgmtImportJobsFlyout');
+      });
+    },
+
+    async openExportFlyout() {
+      await retry.tryForTime(5000, async () => {
+        await testSubjects.click('mlJobsExportButton', 1000);
+        await testSubjects.existOrFail('mlJobMgmtExportJobsFlyout');
+      });
+    },
+
+    async selectFileToImport(filePath: string, expectError: boolean = false) {
+      log.debug(`Importing file '${filePath}' ...`);
+      await PageObjects.common.setFileInputPath(filePath);
+
+      if (expectError) {
+        await testSubjects.existOrFail('~mlJobMgmtImportJobsFileReadErrorCallout');
+      } else {
+        await testSubjects.missingOrFail('~mlJobMgmtImportJobsFileReadErrorCallout');
+        await testSubjects.existOrFail('mlJobMgmtImportJobsFileRead');
+      }
+    },
+
+    async assertJobIdsExist(expectedJobIds: string[]) {
+      const inputs = await testSubjects.findAll('mlJobMgmtImportJobIdInput');
+      const actualJobIds = await Promise.all(inputs.map((i) => i.getAttribute('value')));
+
+      expect(actualJobIds.sort()).to.eql(
+        expectedJobIds.sort(),
+        `Expected job ids to be '${JSON.stringify(expectedJobIds)}' (got '${JSON.stringify(
+          actualJobIds
+        )}')`
+      );
+    },
+
+    async assertCorrectTitle(jobCount: number, jobType: JobType) {
+      const dataTestSubj =
+        jobType === 'anomaly-detector'
+          ? 'mlJobMgmtImportJobsADTitle'
+          : 'mlJobMgmtImportJobsDFATitle';
+      const subj = await testSubjects.find(dataTestSubj);
+      const title = (await subj.parseDomContent()).html();
+
+      const jobTypeString =
+        jobType === 'anomaly-detector' ? 'anomaly detection' : 'data frame analytics';
+
+      const results = title.match(
+        /(\d) (anomaly detection|data frame analytics) job[s]? read from file$/
+      );
+      expect(results).to.not.eql(null, `Expected regex results to not be null`);
+      const foundCount = results![1];
+      const foundJobTypeString = results![2];
+      expect(foundCount).to.eql(
+        jobCount,
+        `Expected job count to be '${jobCount}' (got '${foundCount}')`
+      );
+      expect(foundJobTypeString).to.eql(
+        jobTypeString,
+        `Expected job count to be '${jobTypeString}' (got '${foundJobTypeString}')`
+      );
+    },
+
+    async assertJobIdsSkipped(expectedJobIds: string[]) {
+      const subj = await testSubjects.find('mlJobMgmtImportJobsCannotBeImportedCallout');
+      const skippedJobTitles = await subj.findAllByTagName('h5');
+      const actualJobIds = (
+        await Promise.all(skippedJobTitles.map((i) => i.parseDomContent()))
+      ).map((t) => t.html());
+
+      expect(actualJobIds.sort()).to.eql(
+        expectedJobIds.sort(),
+        `Expected job ids to be '${JSON.stringify(expectedJobIds)}' (got '${JSON.stringify(
+          actualJobIds
+        )}')`
+      );
+    },
+
+    async importJobs() {
+      await testSubjects.click('mlJobMgmtImportImportButton', 1000);
+      await testSubjects.missingOrFail('mlJobMgmtImportJobsFlyout', { timeout: 60 * 1000 });
+    },
+
+    async assertReadErrorCalloutExists() {
+      await testSubjects.existOrFail('~mlJobMgmtImportJobsFileReadErrorCallout');
+    },
+
+    async selectExportJobType(jobType: JobType) {
+      if (jobType === 'anomaly-detector') {
+        await testSubjects.click('mlJobMgmtExportJobsADTab');
+        await testSubjects.existOrFail('mlJobMgmtExportJobsADJobList');
+      } else {
+        await testSubjects.click('mlJobMgmtExportJobsDFATab');
+        await testSubjects.existOrFail('mlJobMgmtExportJobsDFAJobList');
+      }
+    },
+
+    async selectExportJobSelectAll(jobType: JobType) {
+      await testSubjects.click('mlJobMgmtExportJobsSelectAllButton');
+      const subjLabel =
+        jobType === 'anomaly-detector'
+          ? 'mlJobMgmtExportJobsADJobList'
+          : 'mlJobMgmtExportJobsDFAJobList';
+      const subj = await testSubjects.find(subjLabel);
+      const inputs = await subj.findAllByTagName('input');
+      const allInputValues = await Promise.all(inputs.map((input) => input.getAttribute('value')));
+      expect(allInputValues.every((i) => i === 'on')).to.eql(
+        true,
+        `Expected all inputs to be checked`
+      );
+    },
+
+    async getDownload(filePath: string) {
+      return retry.tryForTime(5000, async () => {
+        expect(fs.existsSync(filePath)).to.be(true);
+        return fs.readFileSync(filePath).toString();
+      });
+    },
+
+    getExportedFile(fileName: string) {
+      return path.resolve(REPO_ROOT, `target/functional-tests/downloads/${fileName}.json`);
+    },
+
+    deleteExportedFiles(fileNames: string[]) {
+      fileNames.forEach((file) => {
+        try {
+          fs.unlinkSync(this.getExportedFile(file));
+        } catch (e) {
+          // it might not have been there to begin with
+        }
+      });
+    },
+
+    async selectExportJobs() {
+      await testSubjects.click('mlJobMgmtExportExportButton');
+      await testSubjects.missingOrFail('mlJobMgmtExportJobsFlyout', { timeout: 60 * 1000 });
+    },
+
+    async assertExportedADJobsAreCorrect(expectedJobs: Array<{ job: Job; datafeed: Datafeed }>) {
+      const file = JSON.parse(
+        await this.getDownload(this.getExportedFile('anomaly_detection_jobs'))
+      );
+      const loadedFile = Array.isArray(file) ? file : [file];
+      const sortedActualJobs = loadedFile.sort((a, b) => a.job.job_id.localeCompare(b.job.job_id));
+
+      const sortedExpectedJobs = expectedJobs.sort((a, b) =>
+        a.job.job_id.localeCompare(b.job.job_id)
+      );
+      expect(sortedActualJobs.length).to.eql(
+        sortedExpectedJobs.length,
+        `Expected length of exported jobs to be '${sortedExpectedJobs.length}' (got '${sortedActualJobs.length}')`
+      );
+
+      sortedExpectedJobs.forEach((expectedJob, i) => {
+        expect(sortedActualJobs[i].job.job_id).to.eql(
+          expectedJob.job.job_id,
+          `Expected job id to be '${expectedJob.job.job_id}' (got '${sortedActualJobs[i].job.job_id}')`
+        );
+        expect(sortedActualJobs[i].job.analysis_config.detectors.length).to.eql(
+          expectedJob.job.analysis_config.detectors.length,
+          `Expected detectors length to be '${expectedJob.job.analysis_config.detectors.length}' (got '${sortedActualJobs[i].job.analysis_config.detectors.length}')`
+        );
+        expect(sortedActualJobs[i].job.analysis_config.detectors[0].function).to.eql(
+          expectedJob.job.analysis_config.detectors[0].function,
+          `Expected first detector function to be '${expectedJob.job.analysis_config.detectors[0].function}' (got '${sortedActualJobs[i].job.analysis_config.detectors[0].function}')`
+        );
+        expect(sortedActualJobs[i].datafeed.datafeed_id).to.eql(
+          expectedJob.datafeed.datafeed_id,
+          `Expected job id to be '${expectedJob.datafeed.datafeed_id}' (got '${sortedActualJobs[i].datafeed.datafeed_id}')`
+        );
+      });
+    },
+
+    async assertExportedDFAJobsAreCorrect(expectedJobs: DataFrameAnalyticsConfig[]) {
+      const file = JSON.parse(
+        await this.getDownload(this.getExportedFile('data_frame_analytics_jobs'))
+      );
+      const loadedFile = Array.isArray(file) ? file : [file];
+      const sortedActualJobs = loadedFile.sort((a, b) => a.id.localeCompare(b.id));
+
+      const sortedExpectedJobs = expectedJobs.sort((a, b) => a.id.localeCompare(b.id));
+
+      expect(sortedActualJobs.length).to.eql(
+        sortedExpectedJobs.length,
+        `Expected length of exported jobs to be '${sortedExpectedJobs.length}' (got '${sortedActualJobs.length}')`
+      );
+
+      sortedExpectedJobs.forEach((expectedJob, i) => {
+        expect(sortedActualJobs[i].id).to.eql(
+          expectedJob.id,
+          `Expected job id to be '${expectedJob.id}' (got '${sortedActualJobs[i].id}')`
+        );
+        const expectedType = Object.keys(expectedJob.analysis)[0];
+        const actualType = Object.keys(sortedActualJobs[i].analysis)[0];
+        expect(actualType).to.eql(
+          expectedType,
+          `Expected job type to be '${expectedType}' (got '${actualType}')`
+        );
+        expect(sortedActualJobs[i].dest.index).to.eql(
+          expectedJob.dest.index,
+          `Expected destination index to be '${expectedJob.dest.index}' (got '${sortedActualJobs[i].dest.index}')`
+        );
+      });
+    },
   };
 }
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
index 27da58972556d..5424d7068529e 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
@@ -167,7 +167,7 @@ export default function ({ getService }: FtrProviderContext) {
 
         const {
           body: { data, total },
-        } = await findEvents(undefined, id, {});
+        } = await findEventsByIds(undefined, [id], {}, [id]);
 
         expect(data.length).to.be(6);
         expect(total).to.be(6);
@@ -184,6 +184,51 @@ export default function ({ getService }: FtrProviderContext) {
         await esArchiver.unload('x-pack/test/functional/es_archives/event_log_multiple_indicies');
       });
     });
+
+    describe(`Legacy Ids`, () => {
+      before(async () => {
+        await esArchiver.load('x-pack/test/functional/es_archives/event_log_legacy_ids');
+      });
+      after(async () => {
+        await esArchiver.unload('x-pack/test/functional/es_archives/event_log_legacy_ids');
+      });
+      it('should support search event by ids and legacyIds', async () => {
+        const legacyId = `521f2511-5cd1-44fd-95df-e0df83e354d5`;
+        const id = `621f2511-5cd1-44fd-95df-e0df83e354d5`;
+
+        const {
+          body: { data, total },
+        } = await findEventsByIds(undefined, [id], {}, [legacyId]);
+
+        expect(data.length).to.be(5);
+        expect(total).to.be(5);
+
+        expect(data.map((foundEvent: IEvent) => foundEvent?.message)).to.eql([
+          'test 2020-10-28T15:19:55.913Z',
+          'test legacy 2020-10-28T15:19:55.913Z',
+          'test 2020-10-28T15:19:55.938Z',
+          'test legacy 2020-10-28T15:19:55.962Z',
+          'test 2020-10-28T15:19:55.962Z',
+        ]);
+      });
+
+      it('should search event only by ids if no legacyIds are provided', async () => {
+        const id = `621f2511-5cd1-44fd-95df-e0df83e354d5`;
+
+        const {
+          body: { data, total },
+        } = await findEventsByIds(undefined, [id], {});
+
+        expect(data.length).to.be(3);
+        expect(total).to.be(3);
+
+        expect(data.map((foundEvent: IEvent) => foundEvent?.message)).to.eql([
+          'test 2020-10-28T15:19:55.913Z',
+          'test 2020-10-28T15:19:55.938Z',
+          'test 2020-10-28T15:19:55.962Z',
+        ]);
+      });
+    });
   });
 
   async function findEvents(
@@ -204,6 +249,32 @@ export default function ({ getService }: FtrProviderContext) {
     return await supertest.get(url).set('kbn-xsrf', 'foo').expect(200);
   }
 
+  async function findEventsByIds(
+    namespace: string | undefined,
+    ids: string[],
+    query: Record<string, any> = {},
+    legacyIds: string[] = []
+  ) {
+    const urlPrefix = urlPrefixFromNamespace(namespace);
+    const url = `${urlPrefix}/api/event_log/event_log_test/_find${
+      isEmpty(query)
+        ? ''
+        : `?${Object.entries(query)
+            .map(([key, val]) => `${key}=${val}`)
+            .join('&')}`
+    }`;
+    await delay(1000); // wait for buffer to be written
+    log.debug(`Finding Events for Saved Object with ${url}`);
+    return await supertest
+      .post(url)
+      .set('kbn-xsrf', 'foo')
+      .send({
+        ids,
+        legacyIds,
+      })
+      .expect(200);
+  }
+
   function assertEventsFromApiMatchCreatedEvents(
     foundEvents: IValidatedEvent[],
     expectedEvents: IEvent[]
diff --git a/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx b/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx
index adc10ae0a4161..a37c00144504d 100644
--- a/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx
+++ b/x-pack/test/plugin_functional/plugins/timelines_test/public/applications/timelines_test/index.tsx
@@ -11,6 +11,7 @@ import ReactDOM from 'react-dom';
 import { AppMountParameters, CoreStart } from 'kibana/public';
 import { I18nProvider } from '@kbn/i18n/react';
 import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
 import { TimelinesUIStart } from '../../../../../../../plugins/timelines/public';
 import { DataPublicPluginStart } from '../../../../../../../../src/plugins/data/public';
 
@@ -60,39 +61,41 @@ const AppRoot = React.memo(
       <I18nProvider>
         <Router history={parameters.history}>
           <KibanaContextProvider services={coreStart}>
-            {(timelinesPluginSetup &&
-              timelinesPluginSetup.getTGrid &&
-              timelinesPluginSetup.getTGrid<'standalone'>({
-                appId: 'securitySolution',
-                type: 'standalone',
-                casePermissions: {
-                  read: true,
-                  crud: true,
-                },
-                columns: [],
-                indexNames: [],
-                deletedEventIds: [],
-                end: '',
-                footerText: 'Events',
-                filters: [],
-                hasAlertsCrudPermissions,
-                itemsPerPageOptions: [1, 2, 3],
-                loadingText: 'Loading events',
-                renderCellValue: () => <div data-test-subj="timeline-wrapper">test</div>,
-                sort: [],
-                leadingControlColumns: [],
-                trailingControlColumns: [],
-                query: {
-                  query: '',
-                  language: 'kuery',
-                },
-                setRefetch,
-                start: '',
-                rowRenderers: [],
-                filterStatus: 'open',
-                unit: (n: number) => `${n}`,
-              })) ??
-              null}
+            <EuiThemeProvider>
+              {(timelinesPluginSetup &&
+                timelinesPluginSetup.getTGrid &&
+                timelinesPluginSetup.getTGrid<'standalone'>({
+                  appId: 'securitySolution',
+                  type: 'standalone',
+                  casePermissions: {
+                    read: true,
+                    crud: true,
+                  },
+                  columns: [],
+                  indexNames: [],
+                  deletedEventIds: [],
+                  end: '',
+                  footerText: 'Events',
+                  filters: [],
+                  hasAlertsCrudPermissions,
+                  itemsPerPageOptions: [1, 2, 3],
+                  loadingText: 'Loading events',
+                  renderCellValue: () => <div data-test-subj="timeline-wrapper">test</div>,
+                  sort: [],
+                  leadingControlColumns: [],
+                  trailingControlColumns: [],
+                  query: {
+                    query: '',
+                    language: 'kuery',
+                  },
+                  setRefetch,
+                  start: '',
+                  rowRenderers: [],
+                  filterStatus: 'open',
+                  unit: (n: number) => `${n}`,
+                })) ??
+                null}
+            </EuiThemeProvider>
           </KibanaContextProvider>
         </Router>
       </I18nProvider>
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts b/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
index b312ba6769272..fd49e2b237217 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
@@ -20,8 +20,7 @@ export default function ({ getService }: FtrProviderContext) {
   const reportingAPI = getService('reportingAPI');
   const security = getService('security');
 
-  // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/110483
-  describe.skip('ILM policy migration APIs', () => {
+  describe('ILM policy migration APIs', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs');
       await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
diff --git a/x-pack/test/security_api_integration/oidc.config.ts b/x-pack/test/security_api_integration/oidc.config.ts
index a475d77aa568b..b2822a49b2042 100644
--- a/x-pack/test/security_api_integration/oidc.config.ts
+++ b/x-pack/test/security_api_integration/oidc.config.ts
@@ -50,7 +50,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       serverArgs: [
         ...xPackAPITestsConfig.get('kbnTestServer.serverArgs'),
         `--plugin-path=${plugin}`,
-        `--xpack.security.authc.providers=${JSON.stringify(['oidc', 'basic'])}`,
+        `--xpack.security.authProviders=${JSON.stringify(['oidc', 'basic'])}`,
         '--xpack.security.authc.oidc.realm="oidc1"',
       ],
     },