diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.js b/.buildkite/scripts/pipelines/pull_request/pipeline.js
index 7b5c944d31c1c..02d6fc270ddb0 100644
--- a/.buildkite/scripts/pipelines/pull_request/pipeline.js
+++ b/.buildkite/scripts/pipelines/pull_request/pipeline.js
@@ -66,12 +66,12 @@ const uploadPipeline = (pipelineContent) => {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/security_solution.yml'));
     }
 
-    // if (
-    //   (await doAnyChangesMatch([/^x-pack\/plugins\/apm/])) ||
-    //   process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
-    // ) {
-    //   pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
-    // }
+    if (
+      (await doAnyChangesMatch([/^x-pack\/plugins\/apm/])) ||
+      process.env.GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
+    ) {
+      pipeline.push(getPipeline('.buildkite/pipelines/pull_request/apm_cypress.yml'));
+    }
 
     if (await doAnyChangesMatch([/^x-pack\/plugins\/uptime/])) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/uptime.yml'));
diff --git a/.buildkite/scripts/steps/functional/apm_cypress.sh b/.buildkite/scripts/steps/functional/apm_cypress.sh
index 800f22c78d14c..77b26fafee920 100755
--- a/.buildkite/scripts/steps/functional/apm_cypress.sh
+++ b/.buildkite/scripts/steps/functional/apm_cypress.sh
@@ -2,7 +2,10 @@
 
 set -euo pipefail
 
-source .buildkite/scripts/steps/functional/common.sh
+source .buildkite/scripts/common/util.sh
+
+.buildkite/scripts/bootstrap.sh
+.buildkite/scripts/download_build_artifacts.sh
 
 export JOB=kibana-apm-cypress
 
@@ -11,4 +14,5 @@ echo "--- APM Cypress Tests"
 cd "$XPACK_DIR"
 
 checks-reporter-with-killswitch "APM Cypress Tests" \
-  node plugins/apm/scripts/test/e2e.js
+  node plugins/apm/scripts/test/e2e.js \
+  --kibana-install-dir "$KIBANA_BUILD_LOCATION"
diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
index 01e7beae61ce8..ed6763db69ffe 100644
--- a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
+++ b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
@@ -229,6 +229,7 @@ readonly links: {
         readonly snapshotRestore: Record<string, string>;
         readonly ingest: Record<string, string>;
         readonly fleet: Readonly<{
+            datastreamsILM: string;
             guide: string;
             fleetServer: string;
             fleetServerAddFleetServer: string;
diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
index fdf469f443f28..96c2c0df9d782 100644
--- a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
+++ b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
@@ -17,5 +17,5 @@ export interface DocLinksStart
 |  --- | --- | --- |
 |  [DOC\_LINK\_VERSION](./kibana-plugin-core-public.doclinksstart.doc_link_version.md) | <code>string</code> |  |
 |  [ELASTIC\_WEBSITE\_URL](./kibana-plugin-core-public.doclinksstart.elastic_website_url.md) | <code>string</code> |  |
-|  [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code>        readonly settings: string;</code><br/><code>        readonly elasticStackGetStarted: string;</code><br/><code>        readonly apm: {</code><br/><code>            readonly kibanaSettings: string;</code><br/><code>            readonly supportedServiceMaps: string;</code><br/><code>            readonly customLinks: string;</code><br/><code>            readonly droppedTransactionSpans: string;</code><br/><code>            readonly upgrading: string;</code><br/><code>            readonly metaData: string;</code><br/><code>        };</code><br/><code>        readonly canvas: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly dashboard: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly drilldowns: string;</code><br/><code>            readonly drilldownsTriggerPicker: string;</code><br/><code>            readonly urlDrilldownTemplateSyntax: string;</code><br/><code>            readonly urlDrilldownVariables: string;</code><br/><code>        };</code><br/><code>        readonly discover: Record&lt;string, string&gt;;</code><br/><code>        readonly filebeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly installation: string;</code><br/><code>            readonly configuration: string;</code><br/><code>            readonly elasticsearchOutput: string;</code><br/><code>            readonly elasticsearchModule: string;</code><br/><code>            readonly startup: string;</code><br/><code>            readonly exportedFields: string;</code><br/><code>            readonly suricataModule: string;</code><br/><code>            readonly zeekModule: string;</code><br/><code>        };</code><br/><code>        readonly auditbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly auditdModule: string;</code><br/><code>            readonly systemModule: string;</code><br/><code>        };</code><br/><code>        readonly metricbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly configure: string;</code><br/><code>            readonly httpEndpoint: string;</code><br/><code>            readonly install: string;</code><br/><code>            readonly start: string;</code><br/><code>        };</code><br/><code>        readonly enterpriseSearch: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly appSearchBase: string;</code><br/><code>            readonly workplaceSearchBase: string;</code><br/><code>        };</code><br/><code>        readonly heartbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly libbeat: {</code><br/><code>            readonly getStarted: string;</code><br/><code>        };</code><br/><code>        readonly logstash: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly functionbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly winlogbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly aggs: {</code><br/><code>            readonly composite: string;</code><br/><code>            readonly composite_missing_bucket: string;</code><br/><code>            readonly date_histogram: string;</code><br/><code>            readonly date_range: string;</code><br/><code>            readonly date_format_pattern: string;</code><br/><code>            readonly filter: string;</code><br/><code>            readonly filters: string;</code><br/><code>            readonly geohash_grid: string;</code><br/><code>            readonly histogram: string;</code><br/><code>            readonly ip_range: string;</code><br/><code>            readonly range: string;</code><br/><code>            readonly significant_terms: string;</code><br/><code>            readonly terms: string;</code><br/><code>            readonly avg: string;</code><br/><code>            readonly avg_bucket: string;</code><br/><code>            readonly max_bucket: string;</code><br/><code>            readonly min_bucket: string;</code><br/><code>            readonly sum_bucket: string;</code><br/><code>            readonly cardinality: string;</code><br/><code>            readonly count: string;</code><br/><code>            readonly cumulative_sum: string;</code><br/><code>            readonly derivative: string;</code><br/><code>            readonly geo_bounds: string;</code><br/><code>            readonly geo_centroid: string;</code><br/><code>            readonly max: string;</code><br/><code>            readonly median: string;</code><br/><code>            readonly min: string;</code><br/><code>            readonly moving_avg: string;</code><br/><code>            readonly percentile_ranks: string;</code><br/><code>            readonly serial_diff: string;</code><br/><code>            readonly std_dev: string;</code><br/><code>            readonly sum: string;</code><br/><code>            readonly top_hits: string;</code><br/><code>        };</code><br/><code>        readonly runtimeFields: {</code><br/><code>            readonly overview: string;</code><br/><code>            readonly mapping: string;</code><br/><code>        };</code><br/><code>        readonly scriptedFields: {</code><br/><code>            readonly scriptFields: string;</code><br/><code>            readonly scriptAggs: string;</code><br/><code>            readonly painless: string;</code><br/><code>            readonly painlessApi: string;</code><br/><code>            readonly painlessLangSpec: string;</code><br/><code>            readonly painlessSyntax: string;</code><br/><code>            readonly painlessWalkthrough: string;</code><br/><code>            readonly luceneExpressions: string;</code><br/><code>        };</code><br/><code>        readonly search: {</code><br/><code>            readonly sessions: string;</code><br/><code>            readonly sessionLimits: string;</code><br/><code>        };</code><br/><code>        readonly indexPatterns: {</code><br/><code>            readonly introduction: string;</code><br/><code>            readonly fieldFormattersNumber: string;</code><br/><code>            readonly fieldFormattersString: string;</code><br/><code>            readonly runtimeFields: string;</code><br/><code>        };</code><br/><code>        readonly addData: string;</code><br/><code>        readonly kibana: string;</code><br/><code>        readonly upgradeAssistant: string;</code><br/><code>        readonly rollupJobs: string;</code><br/><code>        readonly elasticsearch: Record&lt;string, string&gt;;</code><br/><code>        readonly siem: {</code><br/><code>            readonly privileges: string;</code><br/><code>            readonly guide: string;</code><br/><code>            readonly gettingStarted: string;</code><br/><code>            readonly ml: string;</code><br/><code>            readonly ruleChangeLog: string;</code><br/><code>            readonly detectionsReq: string;</code><br/><code>            readonly networkMap: string;</code><br/><code>            readonly troubleshootGaps: string;</code><br/><code>        };</code><br/><code>        readonly securitySolution: {</code><br/><code>            readonly trustedApps: string;</code><br/><code>        };</code><br/><code>        readonly query: {</code><br/><code>            readonly eql: string;</code><br/><code>            readonly kueryQuerySyntax: string;</code><br/><code>            readonly luceneQuerySyntax: string;</code><br/><code>            readonly percolate: string;</code><br/><code>            readonly queryDsl: string;</code><br/><code>            readonly autocompleteChanges: string;</code><br/><code>        };</code><br/><code>        readonly date: {</code><br/><code>            readonly dateMath: string;</code><br/><code>            readonly dateMathIndexNames: string;</code><br/><code>        };</code><br/><code>        readonly management: Record&lt;string, string&gt;;</code><br/><code>        readonly ml: Record&lt;string, string&gt;;</code><br/><code>        readonly transforms: Record&lt;string, string&gt;;</code><br/><code>        readonly visualize: Record&lt;string, string&gt;;</code><br/><code>        readonly apis: Readonly&lt;{</code><br/><code>            bulkIndexAlias: string;</code><br/><code>            byteSizeUnits: string;</code><br/><code>            createAutoFollowPattern: string;</code><br/><code>            createFollower: string;</code><br/><code>            createIndex: string;</code><br/><code>            createSnapshotLifecyclePolicy: string;</code><br/><code>            createRoleMapping: string;</code><br/><code>            createRoleMappingTemplates: string;</code><br/><code>            createRollupJobsRequest: string;</code><br/><code>            createApiKey: string;</code><br/><code>            createPipeline: string;</code><br/><code>            createTransformRequest: string;</code><br/><code>            cronExpressions: string;</code><br/><code>            executeWatchActionModes: string;</code><br/><code>            indexExists: string;</code><br/><code>            openIndex: string;</code><br/><code>            putComponentTemplate: string;</code><br/><code>            painlessExecute: string;</code><br/><code>            painlessExecuteAPIContexts: string;</code><br/><code>            putComponentTemplateMetadata: string;</code><br/><code>            putSnapshotLifecyclePolicy: string;</code><br/><code>            putIndexTemplateV1: string;</code><br/><code>            putWatch: string;</code><br/><code>            simulatePipeline: string;</code><br/><code>            timeUnits: string;</code><br/><code>            updateTransform: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly observability: Readonly&lt;{</code><br/><code>            guide: string;</code><br/><code>            infrastructureThreshold: string;</code><br/><code>            logsThreshold: string;</code><br/><code>            metricsThreshold: string;</code><br/><code>            monitorStatus: string;</code><br/><code>            monitorUptime: string;</code><br/><code>            tlsCertificate: string;</code><br/><code>            uptimeDurationAnomaly: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly alerting: Record&lt;string, string&gt;;</code><br/><code>        readonly maps: Record&lt;string, string&gt;;</code><br/><code>        readonly monitoring: Record&lt;string, string&gt;;</code><br/><code>        readonly security: Readonly&lt;{</code><br/><code>            apiKeyServiceSettings: string;</code><br/><code>            clusterPrivileges: string;</code><br/><code>            elasticsearchSettings: string;</code><br/><code>            elasticsearchEnableSecurity: string;</code><br/><code>            indicesPrivileges: string;</code><br/><code>            kibanaTLS: string;</code><br/><code>            kibanaPrivileges: string;</code><br/><code>            mappingRoles: string;</code><br/><code>            mappingRolesFieldRules: string;</code><br/><code>            runAsPrivilege: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly spaces: Readonly&lt;{</code><br/><code>            kibanaLegacyUrlAliases: string;</code><br/><code>            kibanaDisableLegacyUrlAliasesApi: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly watcher: Record&lt;string, string&gt;;</code><br/><code>        readonly ccs: Record&lt;string, string&gt;;</code><br/><code>        readonly plugins: Record&lt;string, string&gt;;</code><br/><code>        readonly snapshotRestore: Record&lt;string, string&gt;;</code><br/><code>        readonly ingest: Record&lt;string, string&gt;;</code><br/><code>        readonly fleet: Readonly&lt;{</code><br/><code>            guide: string;</code><br/><code>            fleetServer: string;</code><br/><code>            fleetServerAddFleetServer: string;</code><br/><code>            settings: string;</code><br/><code>            settingsFleetServerHostSettings: string;</code><br/><code>            troubleshooting: string;</code><br/><code>            elasticAgent: string;</code><br/><code>            datastreams: string;</code><br/><code>            datastreamsNamingScheme: string;</code><br/><code>            installElasticAgent: string;</code><br/><code>            upgradeElasticAgent: string;</code><br/><code>            upgradeElasticAgent712lower: string;</code><br/><code>            learnMoreBlog: string;</code><br/><code>            apiKeysLearnMore: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly ecs: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly clients: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly goOverview: string;</code><br/><code>            readonly javaIndex: string;</code><br/><code>            readonly jsIntro: string;</code><br/><code>            readonly netGuide: string;</code><br/><code>            readonly perlGuide: string;</code><br/><code>            readonly phpGuide: string;</code><br/><code>            readonly pythonGuide: string;</code><br/><code>            readonly rubyOverview: string;</code><br/><code>            readonly rustGuide: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
+|  [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code>        readonly settings: string;</code><br/><code>        readonly elasticStackGetStarted: string;</code><br/><code>        readonly apm: {</code><br/><code>            readonly kibanaSettings: string;</code><br/><code>            readonly supportedServiceMaps: string;</code><br/><code>            readonly customLinks: string;</code><br/><code>            readonly droppedTransactionSpans: string;</code><br/><code>            readonly upgrading: string;</code><br/><code>            readonly metaData: string;</code><br/><code>        };</code><br/><code>        readonly canvas: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly dashboard: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly drilldowns: string;</code><br/><code>            readonly drilldownsTriggerPicker: string;</code><br/><code>            readonly urlDrilldownTemplateSyntax: string;</code><br/><code>            readonly urlDrilldownVariables: string;</code><br/><code>        };</code><br/><code>        readonly discover: Record&lt;string, string&gt;;</code><br/><code>        readonly filebeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly installation: string;</code><br/><code>            readonly configuration: string;</code><br/><code>            readonly elasticsearchOutput: string;</code><br/><code>            readonly elasticsearchModule: string;</code><br/><code>            readonly startup: string;</code><br/><code>            readonly exportedFields: string;</code><br/><code>            readonly suricataModule: string;</code><br/><code>            readonly zeekModule: string;</code><br/><code>        };</code><br/><code>        readonly auditbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly auditdModule: string;</code><br/><code>            readonly systemModule: string;</code><br/><code>        };</code><br/><code>        readonly metricbeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly configure: string;</code><br/><code>            readonly httpEndpoint: string;</code><br/><code>            readonly install: string;</code><br/><code>            readonly start: string;</code><br/><code>        };</code><br/><code>        readonly enterpriseSearch: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly appSearchBase: string;</code><br/><code>            readonly workplaceSearchBase: string;</code><br/><code>        };</code><br/><code>        readonly heartbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly libbeat: {</code><br/><code>            readonly getStarted: string;</code><br/><code>        };</code><br/><code>        readonly logstash: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly functionbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly winlogbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly aggs: {</code><br/><code>            readonly composite: string;</code><br/><code>            readonly composite_missing_bucket: string;</code><br/><code>            readonly date_histogram: string;</code><br/><code>            readonly date_range: string;</code><br/><code>            readonly date_format_pattern: string;</code><br/><code>            readonly filter: string;</code><br/><code>            readonly filters: string;</code><br/><code>            readonly geohash_grid: string;</code><br/><code>            readonly histogram: string;</code><br/><code>            readonly ip_range: string;</code><br/><code>            readonly range: string;</code><br/><code>            readonly significant_terms: string;</code><br/><code>            readonly terms: string;</code><br/><code>            readonly avg: string;</code><br/><code>            readonly avg_bucket: string;</code><br/><code>            readonly max_bucket: string;</code><br/><code>            readonly min_bucket: string;</code><br/><code>            readonly sum_bucket: string;</code><br/><code>            readonly cardinality: string;</code><br/><code>            readonly count: string;</code><br/><code>            readonly cumulative_sum: string;</code><br/><code>            readonly derivative: string;</code><br/><code>            readonly geo_bounds: string;</code><br/><code>            readonly geo_centroid: string;</code><br/><code>            readonly max: string;</code><br/><code>            readonly median: string;</code><br/><code>            readonly min: string;</code><br/><code>            readonly moving_avg: string;</code><br/><code>            readonly percentile_ranks: string;</code><br/><code>            readonly serial_diff: string;</code><br/><code>            readonly std_dev: string;</code><br/><code>            readonly sum: string;</code><br/><code>            readonly top_hits: string;</code><br/><code>        };</code><br/><code>        readonly runtimeFields: {</code><br/><code>            readonly overview: string;</code><br/><code>            readonly mapping: string;</code><br/><code>        };</code><br/><code>        readonly scriptedFields: {</code><br/><code>            readonly scriptFields: string;</code><br/><code>            readonly scriptAggs: string;</code><br/><code>            readonly painless: string;</code><br/><code>            readonly painlessApi: string;</code><br/><code>            readonly painlessLangSpec: string;</code><br/><code>            readonly painlessSyntax: string;</code><br/><code>            readonly painlessWalkthrough: string;</code><br/><code>            readonly luceneExpressions: string;</code><br/><code>        };</code><br/><code>        readonly search: {</code><br/><code>            readonly sessions: string;</code><br/><code>            readonly sessionLimits: string;</code><br/><code>        };</code><br/><code>        readonly indexPatterns: {</code><br/><code>            readonly introduction: string;</code><br/><code>            readonly fieldFormattersNumber: string;</code><br/><code>            readonly fieldFormattersString: string;</code><br/><code>            readonly runtimeFields: string;</code><br/><code>        };</code><br/><code>        readonly addData: string;</code><br/><code>        readonly kibana: string;</code><br/><code>        readonly upgradeAssistant: string;</code><br/><code>        readonly rollupJobs: string;</code><br/><code>        readonly elasticsearch: Record&lt;string, string&gt;;</code><br/><code>        readonly siem: {</code><br/><code>            readonly privileges: string;</code><br/><code>            readonly guide: string;</code><br/><code>            readonly gettingStarted: string;</code><br/><code>            readonly ml: string;</code><br/><code>            readonly ruleChangeLog: string;</code><br/><code>            readonly detectionsReq: string;</code><br/><code>            readonly networkMap: string;</code><br/><code>            readonly troubleshootGaps: string;</code><br/><code>        };</code><br/><code>        readonly securitySolution: {</code><br/><code>            readonly trustedApps: string;</code><br/><code>        };</code><br/><code>        readonly query: {</code><br/><code>            readonly eql: string;</code><br/><code>            readonly kueryQuerySyntax: string;</code><br/><code>            readonly luceneQuerySyntax: string;</code><br/><code>            readonly percolate: string;</code><br/><code>            readonly queryDsl: string;</code><br/><code>            readonly autocompleteChanges: string;</code><br/><code>        };</code><br/><code>        readonly date: {</code><br/><code>            readonly dateMath: string;</code><br/><code>            readonly dateMathIndexNames: string;</code><br/><code>        };</code><br/><code>        readonly management: Record&lt;string, string&gt;;</code><br/><code>        readonly ml: Record&lt;string, string&gt;;</code><br/><code>        readonly transforms: Record&lt;string, string&gt;;</code><br/><code>        readonly visualize: Record&lt;string, string&gt;;</code><br/><code>        readonly apis: Readonly&lt;{</code><br/><code>            bulkIndexAlias: string;</code><br/><code>            byteSizeUnits: string;</code><br/><code>            createAutoFollowPattern: string;</code><br/><code>            createFollower: string;</code><br/><code>            createIndex: string;</code><br/><code>            createSnapshotLifecyclePolicy: string;</code><br/><code>            createRoleMapping: string;</code><br/><code>            createRoleMappingTemplates: string;</code><br/><code>            createRollupJobsRequest: string;</code><br/><code>            createApiKey: string;</code><br/><code>            createPipeline: string;</code><br/><code>            createTransformRequest: string;</code><br/><code>            cronExpressions: string;</code><br/><code>            executeWatchActionModes: string;</code><br/><code>            indexExists: string;</code><br/><code>            openIndex: string;</code><br/><code>            putComponentTemplate: string;</code><br/><code>            painlessExecute: string;</code><br/><code>            painlessExecuteAPIContexts: string;</code><br/><code>            putComponentTemplateMetadata: string;</code><br/><code>            putSnapshotLifecyclePolicy: string;</code><br/><code>            putIndexTemplateV1: string;</code><br/><code>            putWatch: string;</code><br/><code>            simulatePipeline: string;</code><br/><code>            timeUnits: string;</code><br/><code>            updateTransform: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly observability: Readonly&lt;{</code><br/><code>            guide: string;</code><br/><code>            infrastructureThreshold: string;</code><br/><code>            logsThreshold: string;</code><br/><code>            metricsThreshold: string;</code><br/><code>            monitorStatus: string;</code><br/><code>            monitorUptime: string;</code><br/><code>            tlsCertificate: string;</code><br/><code>            uptimeDurationAnomaly: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly alerting: Record&lt;string, string&gt;;</code><br/><code>        readonly maps: Record&lt;string, string&gt;;</code><br/><code>        readonly monitoring: Record&lt;string, string&gt;;</code><br/><code>        readonly security: Readonly&lt;{</code><br/><code>            apiKeyServiceSettings: string;</code><br/><code>            clusterPrivileges: string;</code><br/><code>            elasticsearchSettings: string;</code><br/><code>            elasticsearchEnableSecurity: string;</code><br/><code>            elasticsearchEnableApiKeys: string;</code><br/><code>            indicesPrivileges: string;</code><br/><code>            kibanaTLS: string;</code><br/><code>            kibanaPrivileges: string;</code><br/><code>            mappingRoles: string;</code><br/><code>            mappingRolesFieldRules: string;</code><br/><code>            runAsPrivilege: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly spaces: Readonly&lt;{</code><br/><code>            kibanaLegacyUrlAliases: string;</code><br/><code>            kibanaDisableLegacyUrlAliasesApi: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly watcher: Record&lt;string, string&gt;;</code><br/><code>        readonly ccs: Record&lt;string, string&gt;;</code><br/><code>        readonly plugins: Record&lt;string, string&gt;;</code><br/><code>        readonly snapshotRestore: Record&lt;string, string&gt;;</code><br/><code>        readonly ingest: Record&lt;string, string&gt;;</code><br/><code>        readonly fleet: Readonly&lt;{</code><br/><code>            datastreamsILM: string;</code><br/><code>            guide: string;</code><br/><code>            fleetServer: string;</code><br/><code>            fleetServerAddFleetServer: string;</code><br/><code>            settings: string;</code><br/><code>            settingsFleetServerHostSettings: string;</code><br/><code>            troubleshooting: string;</code><br/><code>            elasticAgent: string;</code><br/><code>            datastreams: string;</code><br/><code>            datastreamsNamingScheme: string;</code><br/><code>            installElasticAgent: string;</code><br/><code>            upgradeElasticAgent: string;</code><br/><code>            upgradeElasticAgent712lower: string;</code><br/><code>            learnMoreBlog: string;</code><br/><code>            apiKeysLearnMore: string;</code><br/><code>        }&gt;;</code><br/><code>        readonly ecs: {</code><br/><code>            readonly guide: string;</code><br/><code>        };</code><br/><code>        readonly clients: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly goOverview: string;</code><br/><code>            readonly javaIndex: string;</code><br/><code>            readonly jsIntro: string;</code><br/><code>            readonly netGuide: string;</code><br/><code>            readonly perlGuide: string;</code><br/><code>            readonly phpGuide: string;</code><br/><code>            readonly pythonGuide: string;</code><br/><code>            readonly rubyOverview: string;</code><br/><code>            readonly rustGuide: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
 
diff --git a/docs/maps/vector-layer.asciidoc b/docs/maps/vector-layer.asciidoc
index 7191197c27dbe..f70e4d59796cc 100644
--- a/docs/maps/vector-layer.asciidoc
+++ b/docs/maps/vector-layer.asciidoc
@@ -27,9 +27,9 @@ Results exceeding `index.max_result_window` are not displayed.
 
 * *Show clusters when results exceed 10,000* When results exceed `index.max_result_window`, the layer uses {ref}/search-aggregations-bucket-geotilegrid-aggregation.html[GeoTile grid aggregation] to group your documents into clusters and displays metrics for each cluster. When results are less then `index.max_result_window`, the layer displays features from individual documents.
 
-* *Use vector tiles.* Vector tiles partition your map into 6 to 8 tiles.
+* *Use vector tiles.* Vector tiles partition your map into tiles.
 Each tile request is limited to the `index.max_result_window` index setting.
-Tiles exceeding `index.max_result_window` have a visual indicator when there are too many features to display.
+When a tile exceeds `index.max_result_window`, results exceeding `index.max_result_window` are not contained in the tile and a dashed rectangle outlining the bounding box containing all geo values within the tile is displayed.
 
 *EMS Boundaries*:: Administrative boundaries from https://www.elastic.co/elastic-maps-service[Elastic Maps Service].
 
diff --git a/docs/settings/security-settings.asciidoc b/docs/settings/security-settings.asciidoc
index c291b65c3c35b..7737745c7cfa8 100644
--- a/docs/settings/security-settings.asciidoc
+++ b/docs/settings/security-settings.asciidoc
@@ -12,20 +12,6 @@ You do not need to configure any additional settings to use the
 [[general-security-settings]]
 ==== General security settings
 
-[cols="2*<"]
-|===
-| `xpack.security.enabled`
-  | deprecated:[7.16.0,"In 8.0 and later, this setting will no longer be supported."]
-  By default, {kib} automatically detects whether to enable the
-  {security-features} based on the license and whether {es} {security-features}
-  are enabled. +
-  +
-  Do not set this to `false`; it disables the login form, user and role management
-  screens, and authorization using <<kibana-privileges>>. To disable
-  {security-features} entirely, see
-  {ref}/security-settings.html[{es} security settings].
-|===
-
 [float]
 [[authentication-security-settings]]
 ==== Authentication security settings
diff --git a/package.json b/package.json
index e6b17783197bc..d9dd4912481b9 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.21",
     "@elastic/ems-client": "7.16.0",
-    "@elastic/eui": "39.1.1",
+    "@elastic/eui": "40.0.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/maki": "6.3.0",
     "@elastic/node-crypto": "1.2.1",
@@ -166,7 +166,6 @@
     "@mapbox/geojson-rewind": "^0.5.0",
     "@mapbox/mapbox-gl-draw": "1.3.0",
     "@mapbox/mapbox-gl-rtl-text": "0.2.3",
-    "@mapbox/vector-tile": "1.3.1",
     "@reduxjs/toolkit": "^1.6.1",
     "@slack/webhook": "^5.0.4",
     "@turf/along": "6.0.1",
@@ -460,6 +459,7 @@
     "@kbn/test": "link:bazel-bin/packages/kbn-test",
     "@kbn/test-subj-selector": "link:bazel-bin/packages/kbn-test-subj-selector",
     "@loaders.gl/polyfills": "^2.3.5",
+    "@mapbox/vector-tile": "1.3.1",
     "@microsoft/api-documenter": "7.7.2",
     "@microsoft/api-extractor": "7.7.0",
     "@octokit/rest": "^16.35.0",
diff --git a/src/cli_setup/utils.ts b/src/cli_setup/utils.ts
index 65a46b8f5b278..21406bf7e57e0 100644
--- a/src/cli_setup/utils.ts
+++ b/src/cli_setup/utils.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { getConfigPath } from '@kbn/utils';
+import { getConfigPath, getDataPath } from '@kbn/utils';
 import inquirer from 'inquirer';
 import { duration } from 'moment';
 import { merge } from 'lodash';
@@ -30,7 +30,7 @@ const logger: Logger = {
   get: () => logger,
 };
 
-export const kibanaConfigWriter = new KibanaConfigWriter(getConfigPath(), logger);
+export const kibanaConfigWriter = new KibanaConfigWriter(getConfigPath(), getDataPath(), logger);
 export const elasticsearch = new ElasticsearchService(logger).setup({
   connectionCheckInterval: duration(Infinity),
   elasticsearch: {
diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index 6987b779d5d45..571b564f90329 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -644,6 +644,11 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
         >
           <EuiAccordion
             arrowDisplay="right"
+            arrowProps={
+              Object {
+                "color": "text",
+              }
+            }
             buttonClassName="euiCollapsibleNavGroup__heading"
             buttonContent={
               <EuiFlexGroup
@@ -665,8 +670,10 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                 </EuiFlexItem>
               </EuiFlexGroup>
             }
+            buttonElement="button"
             className="euiCollapsibleNavGroup euiCollapsibleNavGroup--light euiCollapsibleNavGroup--withHeading"
             data-test-subj="collapsibleNavGroup-recentlyViewed"
+            element="div"
             id="generated-id"
             initialIsOpen={true}
             isLoading={false}
@@ -685,28 +692,13 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                 <button
                   aria-controls="generated-id"
                   aria-expanded={true}
-                  className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                  className="euiAccordion__button euiCollapsibleNavGroup__heading"
                   id="generated-id"
                   onClick={[Function]}
                   type="button"
                 >
                   <span
-                    className="euiAccordion__iconWrapper"
-                  >
-                    <EuiIcon
-                      className="euiAccordion__icon euiAccordion__icon-isOpen"
-                      size="m"
-                      type="arrowRight"
-                    >
-                      <span
-                        className="euiAccordion__icon euiAccordion__icon-isOpen"
-                        data-euiicon-type="arrowRight"
-                        size="m"
-                      />
-                    </EuiIcon>
-                  </span>
-                  <span
-                    className="euiIEFlexWrapFix"
+                    className="euiAccordion__buttonContent"
                   >
                     <EuiFlexGroup
                       alignItems="center"
@@ -736,6 +728,43 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                     </EuiFlexGroup>
                   </span>
                 </button>
+                <EuiButtonIcon
+                  aria-controls="generated-id"
+                  aria-expanded={true}
+                  aria-labelledby="generated-id"
+                  className="euiAccordion__iconButton euiAccordion__iconButton-isOpen euiAccordion__iconButton--right"
+                  color="text"
+                  iconType="arrowRight"
+                  onClick={[Function]}
+                  tabIndex={-1}
+                >
+                  <button
+                    aria-controls="generated-id"
+                    aria-expanded={true}
+                    aria-labelledby="generated-id"
+                    className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiAccordion__iconButton euiAccordion__iconButton-isOpen euiAccordion__iconButton--right"
+                    disabled={false}
+                    onClick={[Function]}
+                    tabIndex={-1}
+                    type="button"
+                  >
+                    <EuiIcon
+                      aria-hidden="true"
+                      className="euiButtonIcon__icon"
+                      color="inherit"
+                      size="m"
+                      type="arrowRight"
+                    >
+                      <span
+                        aria-hidden="true"
+                        className="euiButtonIcon__icon"
+                        color="inherit"
+                        data-euiicon-type="arrowRight"
+                        size="m"
+                      />
+                    </EuiIcon>
+                  </button>
+                </EuiButtonIcon>
               </div>
               <div
                 aria-labelledby="generated-id"
@@ -892,6 +921,11 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
             >
               <EuiAccordion
                 arrowDisplay="right"
+                arrowProps={
+                  Object {
+                    "color": "text",
+                  }
+                }
                 buttonClassName="euiCollapsibleNavGroup__heading"
                 buttonContent={
                   <EuiFlexGroup
@@ -921,8 +955,10 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                     </EuiFlexItem>
                   </EuiFlexGroup>
                 }
+                buttonElement="button"
                 className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                 data-test-subj="collapsibleNavGroup-kibana"
+                element="div"
                 id="generated-id"
                 initialIsOpen={true}
                 isLoading={false}
@@ -941,28 +977,13 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                     <button
                       aria-controls="generated-id"
                       aria-expanded={true}
-                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                      className="euiAccordion__button euiCollapsibleNavGroup__heading"
                       id="generated-id"
                       onClick={[Function]}
                       type="button"
                     >
                       <span
-                        className="euiAccordion__iconWrapper"
-                      >
-                        <EuiIcon
-                          className="euiAccordion__icon euiAccordion__icon-isOpen"
-                          size="m"
-                          type="arrowRight"
-                        >
-                          <span
-                            className="euiAccordion__icon euiAccordion__icon-isOpen"
-                            data-euiicon-type="arrowRight"
-                            size="m"
-                          />
-                        </EuiIcon>
-                      </span>
-                      <span
-                        className="euiIEFlexWrapFix"
+                        className="euiAccordion__buttonContent"
                       >
                         <EuiFlexGroup
                           alignItems="center"
@@ -1009,6 +1030,43 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                         </EuiFlexGroup>
                       </span>
                     </button>
+                    <EuiButtonIcon
+                      aria-controls="generated-id"
+                      aria-expanded={true}
+                      aria-labelledby="generated-id"
+                      className="euiAccordion__iconButton euiAccordion__iconButton-isOpen euiAccordion__iconButton--right"
+                      color="text"
+                      iconType="arrowRight"
+                      onClick={[Function]}
+                      tabIndex={-1}
+                    >
+                      <button
+                        aria-controls="generated-id"
+                        aria-expanded={true}
+                        aria-labelledby="generated-id"
+                        className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiAccordion__iconButton euiAccordion__iconButton-isOpen euiAccordion__iconButton--right"
+                        disabled={false}
+                        onClick={[Function]}
+                        tabIndex={-1}
+                        type="button"
+                      >
+                        <EuiIcon
+                          aria-hidden="true"
+                          className="euiButtonIcon__icon"
+                          color="inherit"
+                          size="m"
+                          type="arrowRight"
+                        >
+                          <span
+                            aria-hidden="true"
+                            className="euiButtonIcon__icon"
+                            color="inherit"
+                            data-euiicon-type="arrowRight"
+                            size="m"
+                          />
+                        </EuiIcon>
+                      </button>
+                    </EuiButtonIcon>
                   </div>
                   <div
                     aria-labelledby="generated-id"
@@ -1184,6 +1242,11 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
             >
               <EuiAccordion
                 arrowDisplay="right"
+                arrowProps={
+                  Object {
+                    "color": "text",
+                  }
+                }
                 buttonClassName="euiCollapsibleNavGroup__heading"
                 buttonContent={
                   <EuiFlexGroup
@@ -1213,8 +1276,10 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                     </EuiFlexItem>
                   </EuiFlexGroup>
                 }
+                buttonElement="button"
                 className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                 data-test-subj="collapsibleNavGroup-observability"
+                element="div"
                 id="generated-id"
                 initialIsOpen={true}
                 isLoading={false}
@@ -1233,28 +1298,13 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                     <button
                       aria-controls="generated-id"
                       aria-expanded={true}
-                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                      className="euiAccordion__button euiCollapsibleNavGroup__heading"
                       id="generated-id"
                       onClick={[Function]}
                       type="button"
                     >
                       <span
-                        className="euiAccordion__iconWrapper"
-                      >
-                        <EuiIcon
-                          className="euiAccordion__icon euiAccordion__icon-isOpen"
-                          size="m"
-                          type="arrowRight"
-                        >
-                          <span
-                            className="euiAccordion__icon euiAccordion__icon-isOpen"
-                            data-euiicon-type="arrowRight"
-                            size="m"
-                          />
-                        </EuiIcon>
-                      </span>
-                      <span
-                        className="euiIEFlexWrapFix"
+                        className="euiAccordion__buttonContent"
                       >
                         <EuiFlexGroup
                           alignItems="center"
@@ -1301,6 +1351,43 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                         </EuiFlexGroup>
                       </span>
                     </button>
+                    <EuiButtonIcon
+                      aria-controls="generated-id"
+                      aria-expanded={true}
+                      aria-labelledby="generated-id"
+                      className="euiAccordion__iconButton euiAccordion__iconButton-isOpen euiAccordion__iconButton--right"
+                      color="text"
+                      iconType="arrowRight"
+                      onClick={[Function]}
+                      tabIndex={-1}
+                    >
+                      <button
+                        aria-controls="generated-id"
+                        aria-expanded={true}
+                        aria-labelledby="generated-id"
+                        className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiAccordion__iconButton euiAccordion__iconButton-isOpen euiAccordion__iconButton--right"
+                        disabled={false}
+                        onClick={[Function]}
+                        tabIndex={-1}
+                        type="button"
+                      >
+                        <EuiIcon
+                          aria-hidden="true"
+                          className="euiButtonIcon__icon"
+                          color="inherit"
+                          size="m"
+                          type="arrowRight"
+                        >
+                          <span
+                            aria-hidden="true"
+                            className="euiButtonIcon__icon"
+                            color="inherit"
+                            data-euiicon-type="arrowRight"
+                            size="m"
+                          />
+                        </EuiIcon>
+                      </button>
+                    </EuiButtonIcon>
                   </div>
                   <div
                     aria-labelledby="generated-id"
@@ -1437,6 +1524,11 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
             >
               <EuiAccordion
                 arrowDisplay="right"
+                arrowProps={
+                  Object {
+                    "color": "text",
+                  }
+                }
                 buttonClassName="euiCollapsibleNavGroup__heading"
                 buttonContent={
                   <EuiFlexGroup
@@ -1466,8 +1558,10 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                     </EuiFlexItem>
                   </EuiFlexGroup>
                 }
+                buttonElement="button"
                 className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                 data-test-subj="collapsibleNavGroup-securitySolution"
+                element="div"
                 id="generated-id"
                 initialIsOpen={true}
                 isLoading={false}
@@ -1486,28 +1580,13 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                     <button
                       aria-controls="generated-id"
                       aria-expanded={true}
-                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                      className="euiAccordion__button euiCollapsibleNavGroup__heading"
                       id="generated-id"
                       onClick={[Function]}
                       type="button"
                     >
                       <span
-                        className="euiAccordion__iconWrapper"
-                      >
-                        <EuiIcon
-                          className="euiAccordion__icon euiAccordion__icon-isOpen"
-                          size="m"
-                          type="arrowRight"
-                        >
-                          <span
-                            className="euiAccordion__icon euiAccordion__icon-isOpen"
-                            data-euiicon-type="arrowRight"
-                            size="m"
-                          />
-                        </EuiIcon>
-                      </span>
-                      <span
-                        className="euiIEFlexWrapFix"
+                        className="euiAccordion__buttonContent"
                       >
                         <EuiFlexGroup
                           alignItems="center"
@@ -1554,6 +1633,43 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                         </EuiFlexGroup>
                       </span>
                     </button>
+                    <EuiButtonIcon
+                      aria-controls="generated-id"
+                      aria-expanded={true}
+                      aria-labelledby="generated-id"
+                      className="euiAccordion__iconButton euiAccordion__iconButton-isOpen euiAccordion__iconButton--right"
+                      color="text"
+                      iconType="arrowRight"
+                      onClick={[Function]}
+                      tabIndex={-1}
+                    >
+                      <button
+                        aria-controls="generated-id"
+                        aria-expanded={true}
+                        aria-labelledby="generated-id"
+                        className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiAccordion__iconButton euiAccordion__iconButton-isOpen euiAccordion__iconButton--right"
+                        disabled={false}
+                        onClick={[Function]}
+                        tabIndex={-1}
+                        type="button"
+                      >
+                        <EuiIcon
+                          aria-hidden="true"
+                          className="euiButtonIcon__icon"
+                          color="inherit"
+                          size="m"
+                          type="arrowRight"
+                        >
+                          <span
+                            aria-hidden="true"
+                            className="euiButtonIcon__icon"
+                            color="inherit"
+                            data-euiicon-type="arrowRight"
+                            size="m"
+                          />
+                        </EuiIcon>
+                      </button>
+                    </EuiButtonIcon>
                   </div>
                   <div
                     aria-labelledby="generated-id"
@@ -1651,6 +1767,11 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
             >
               <EuiAccordion
                 arrowDisplay="right"
+                arrowProps={
+                  Object {
+                    "color": "text",
+                  }
+                }
                 buttonClassName="euiCollapsibleNavGroup__heading"
                 buttonContent={
                   <EuiFlexGroup
@@ -1680,8 +1801,10 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                     </EuiFlexItem>
                   </EuiFlexGroup>
                 }
+                buttonElement="button"
                 className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
                 data-test-subj="collapsibleNavGroup-management"
+                element="div"
                 id="generated-id"
                 initialIsOpen={true}
                 isLoading={false}
@@ -1700,28 +1823,13 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                     <button
                       aria-controls="generated-id"
                       aria-expanded={true}
-                      className="euiAccordion__button euiAccordion__buttonReverse euiCollapsibleNavGroup__heading"
+                      className="euiAccordion__button euiCollapsibleNavGroup__heading"
                       id="generated-id"
                       onClick={[Function]}
                       type="button"
                     >
                       <span
-                        className="euiAccordion__iconWrapper"
-                      >
-                        <EuiIcon
-                          className="euiAccordion__icon euiAccordion__icon-isOpen"
-                          size="m"
-                          type="arrowRight"
-                        >
-                          <span
-                            className="euiAccordion__icon euiAccordion__icon-isOpen"
-                            data-euiicon-type="arrowRight"
-                            size="m"
-                          />
-                        </EuiIcon>
-                      </span>
-                      <span
-                        className="euiIEFlexWrapFix"
+                        className="euiAccordion__buttonContent"
                       >
                         <EuiFlexGroup
                           alignItems="center"
@@ -1768,6 +1876,43 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                         </EuiFlexGroup>
                       </span>
                     </button>
+                    <EuiButtonIcon
+                      aria-controls="generated-id"
+                      aria-expanded={true}
+                      aria-labelledby="generated-id"
+                      className="euiAccordion__iconButton euiAccordion__iconButton-isOpen euiAccordion__iconButton--right"
+                      color="text"
+                      iconType="arrowRight"
+                      onClick={[Function]}
+                      tabIndex={-1}
+                    >
+                      <button
+                        aria-controls="generated-id"
+                        aria-expanded={true}
+                        aria-labelledby="generated-id"
+                        className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiAccordion__iconButton euiAccordion__iconButton-isOpen euiAccordion__iconButton--right"
+                        disabled={false}
+                        onClick={[Function]}
+                        tabIndex={-1}
+                        type="button"
+                      >
+                        <EuiIcon
+                          aria-hidden="true"
+                          className="euiButtonIcon__icon"
+                          color="inherit"
+                          size="m"
+                          type="arrowRight"
+                        >
+                          <span
+                            aria-hidden="true"
+                            className="euiButtonIcon__icon"
+                            color="inherit"
+                            data-euiicon-type="arrowRight"
+                            size="m"
+                          />
+                        </EuiIcon>
+                      </button>
+                    </EuiButtonIcon>
                   </div>
                   <div
                     aria-labelledby="generated-id"
diff --git a/src/core/public/chrome/ui/header/collapsible_nav.test.tsx b/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
index 019a3c7820324..abc2fb5cc3356 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
@@ -71,7 +71,10 @@ function expectNavIsClosed(component: ReactWrapper) {
 }
 
 function clickGroup(component: ReactWrapper, group: string) {
-  component.find(`[data-test-subj="collapsibleNavGroup-${group}"] button`).simulate('click');
+  component
+    .find(`[data-test-subj="collapsibleNavGroup-${group}"] button`)
+    .first()
+    .simulate('click');
 }
 
 describe('CollapsibleNav', () => {
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index 20757463737fc..2bbb4703ecd19 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -480,6 +480,7 @@ export class DocLinksService {
           troubleshooting: `${FLEET_DOCS}fleet-troubleshooting.html`,
           elasticAgent: `${FLEET_DOCS}elastic-agent-installation.html`,
           datastreams: `${FLEET_DOCS}data-streams.html`,
+          datastreamsILM: `${FLEET_DOCS}data-streams.html#data-streams-ilm`,
           datastreamsNamingScheme: `${FLEET_DOCS}data-streams.html#data-streams-naming-scheme`,
           installElasticAgent: `${FLEET_DOCS}install-fleet-managed-elastic-agent.html`,
           upgradeElasticAgent: `${FLEET_DOCS}upgrade-elastic-agent.html`,
@@ -734,6 +735,7 @@ export interface DocLinksStart {
     readonly snapshotRestore: Record<string, string>;
     readonly ingest: Record<string, string>;
     readonly fleet: Readonly<{
+      datastreamsILM: string;
       guide: string;
       fleetServer: string;
       fleetServerAddFleetServer: string;
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 353e5aa4607e4..bd274d7994bfa 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -698,6 +698,7 @@ export interface DocLinksStart {
         readonly snapshotRestore: Record<string, string>;
         readonly ingest: Record<string, string>;
         readonly fleet: Readonly<{
+            datastreamsILM: string;
             guide: string;
             fleetServer: string;
             fleetServerAddFleetServer: string;
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index 235a5fbe1a1a3..3a38789fbcac6 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -343,7 +343,6 @@ kibana_vars=(
     xpack.security.authc.saml.realm
     xpack.security.authc.selector.enabled
     xpack.security.cookieName
-    xpack.security.enabled
     xpack.security.encryptionKey
     xpack.security.loginAssistanceMessage
     xpack.security.loginHelp
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index efa54e74fdf2f..305eeb9a6a358 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -75,6 +75,6 @@ export const LICENSE_OVERRIDES = {
   'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
   '@elastic/ems-client@7.16.0': ['Elastic License 2.0'],
-  '@elastic/eui@39.1.1': ['SSPL-1.0 OR Elastic License 2.0'],
+  '@elastic/eui@40.0.0': ['SSPL-1.0 OR Elastic License 2.0'],
   'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
 };
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx
index c3b4075690261..3237eb106e4ec 100644
--- a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx
+++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx
@@ -206,7 +206,9 @@ describe('Dashboard container lifecycle', () => {
   });
 });
 
-describe('Dashboard initial state', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/116050
+// FLAKY: https://github.com/elastic/kibana/issues/105018
+describe.skip('Dashboard initial state', () => {
   it('Extracts state from Dashboard Saved Object', async () => {
     const { renderHookResult, embeddableFactoryResult } = renderDashboardAppStateHook({});
     const getResult = () => renderHookResult.result.current;
@@ -276,7 +278,8 @@ describe('Dashboard initial state', () => {
   });
 });
 
-describe('Dashboard state sync', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/116043
+describe.skip('Dashboard state sync', () => {
   let defaultDashboardAppStateHookResult: RenderDashboardStateHookReturn;
   const getResult = () => defaultDashboardAppStateHookResult.renderHookResult.result.current;
 
diff --git a/src/plugins/data/common/constants.ts b/src/plugins/data/common/constants.ts
index e141bfbef3c89..1c457fdb64ce2 100644
--- a/src/plugins/data/common/constants.ts
+++ b/src/plugins/data/common/constants.ts
@@ -35,4 +35,5 @@ export const UI_SETTINGS = {
   AUTOCOMPLETE_USE_TIMERANGE: 'autocomplete:useTimeRange',
   AUTOCOMPLETE_VALUE_SUGGESTION_METHOD: 'autocomplete:valueSuggestionMethod',
   DATE_FORMAT: 'dateFormat',
+  DATEFORMAT_TZ: 'dateFormat:tz',
 } as const;
diff --git a/src/plugins/data_views/server/saved_objects/data_views.ts b/src/plugins/data_views/server/saved_objects/data_views.ts
index 5bb85a9bb6e98..ca7592732c3ee 100644
--- a/src/plugins/data_views/server/saved_objects/data_views.ts
+++ b/src/plugins/data_views/server/saved_objects/data_views.ts
@@ -13,7 +13,8 @@ import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../common';
 export const dataViewSavedObjectType: SavedObjectsType = {
   name: DATA_VIEW_SAVED_OBJECT_TYPE,
   hidden: false,
-  namespaceType: 'single',
+  namespaceType: 'multiple-isolated',
+  convertToMultiNamespaceTypeVersion: '8.0.0',
   management: {
     displayName: 'Data view',
     icon: 'indexPatternApp',
diff --git a/src/plugins/discover/public/application/apps/main/components/doc_table/components/_table_header.scss b/src/plugins/discover/public/application/apps/main/components/doc_table/components/_table_header.scss
index 3450084e19269..3ea6fb5502764 100644
--- a/src/plugins/discover/public/application/apps/main/components/doc_table/components/_table_header.scss
+++ b/src/plugins/discover/public/application/apps/main/components/doc_table/components/_table_header.scss
@@ -1,7 +1,8 @@
 .kbnDocTableHeader {
   white-space: nowrap;
 }
-.kbnDocTableHeader button {
+.kbnDocTableHeader button,
+.kbnDocTableHeader svg {
   margin-left: $euiSizeXS * .5;
 }
 .kbnDocTableHeader__move,
diff --git a/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap b/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
index 18b0ae8699e3e..3f72349f3e2a0 100644
--- a/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
+++ b/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
@@ -15,7 +15,16 @@ exports[`TableHeader with time column renders correctly 1`] = `
       class="kbnDocTableHeader__actions"
       data-test-subj="docTableHeader-time"
     >
-      Time
+      time
+      <span
+        class="euiToolTipAnchor"
+      >
+        <span
+          aria-label="Primary time field."
+          data-euiicon-type="clock"
+          tabindex="0"
+        />
+      </span>
       <span
         class="euiToolTipAnchor"
       >
diff --git a/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx b/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx
index d313e95c1ebb1..f04454d33e9f2 100644
--- a/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/helpers.tsx
@@ -28,7 +28,7 @@ export interface ColumnProps {
 export function getTimeColumn(timeFieldName: string): ColumnProps {
   return {
     name: timeFieldName,
-    displayName: 'Time',
+    displayName: timeFieldName,
     isSortable: true,
     isRemoveable: false,
     colLeftIdx: -1,
diff --git a/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/table_header.tsx b/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/table_header.tsx
index f891e809ee702..1877c014ddcbd 100644
--- a/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/table_header.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/table_header.tsx
@@ -45,6 +45,8 @@ export function TableHeader({
           <TableHeaderColumn
             key={col.name}
             {...col}
+            customLabel={indexPattern.getFieldByName(col.name)?.customLabel}
+            isTimeColumn={indexPattern.timeFieldName === col.name}
             sortOrder={
               sortOrder.length ? sortOrder : getDefaultSort(indexPattern, defaultSortOrder)
             }
diff --git a/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/table_header_column.tsx b/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/table_header_column.tsx
index fc7b41c43049b..696d69d39f77e 100644
--- a/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/table_header_column.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/doc_table/components/table_header/table_header_column.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
+import { EuiButtonIcon, EuiToolTip, EuiIconTip } from '@elastic/eui';
 import { SortOrder } from './helpers';
 import { DocViewTableScoreSortWarning } from './score_sort_warning';
 
@@ -18,6 +18,8 @@ interface Props {
   displayName?: string;
   isRemoveable: boolean;
   isSortable: boolean;
+  isTimeColumn: boolean;
+  customLabel?: string;
   name: string;
   onChangeSortOrder?: (sortOrder: SortOrder[]) => void;
   onMoveColumn?: (name: string, idx: number) => void;
@@ -54,6 +56,8 @@ export function TableHeaderColumn({
   displayName,
   isRemoveable,
   isSortable,
+  isTimeColumn,
+  customLabel,
   name,
   onChangeSortOrder,
   onMoveColumn,
@@ -65,6 +69,14 @@ export function TableHeaderColumn({
   const curColSort = sortOrder.find((pair) => pair[0] === name);
   const curColSortDir = (curColSort && curColSort[1]) || '';
 
+  const timeAriaLabel = i18n.translate(
+    'discover.docTable.tableHeader.timeFieldIconTooltipAriaLabel',
+    { defaultMessage: 'Primary time field.' }
+  );
+  const timeTooltip = i18n.translate('discover.docTable.tableHeader.timeFieldIconTooltip', {
+    defaultMessage: 'This field represents the time that events occurred.',
+  });
+
   // If this is the _score column, and _score is not one of the columns inside the sort, show a
   // warning that the _score will not be retrieved from Elasticsearch
   const showScoreSortWarning = name === '_score' && !curColSort;
@@ -183,7 +195,15 @@ export function TableHeaderColumn({
     <th data-test-subj="docTableHeaderField">
       <span data-test-subj={`docTableHeader-${name}`} className="kbnDocTableHeader__actions">
         {showScoreSortWarning && <DocViewTableScoreSortWarning />}
-        {displayName}
+        {customLabel ?? displayName}
+        {isTimeColumn && (
+          <EuiIconTip
+            key="time-icon"
+            type="clock"
+            aria-label={timeAriaLabel}
+            content={timeTooltip}
+          />
+        )}
         {buttons
           .filter((button) => button.active)
           .map((button, idx) => (
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.test.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.test.tsx
index 46e30dd23525b..e5ea657032403 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.test.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.test.tsx
@@ -117,7 +117,15 @@ describe('Discover grid columns ', function () {
             [Function],
             [Function],
           ],
-          "display": "Time (timestamp)",
+          "display": <React.Fragment>
+            timestamp
+             
+            <EuiIconTip
+              aria-label="Primary time field."
+              content="This field represents the time that events occurred."
+              type="clock"
+            />
+          </React.Fragment>,
           "id": "timestamp",
           "initialWidth": 190,
           "isSortable": true,
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx
index 2f4c0b5167df8..5eb55a8e99cde 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
+import React, { Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiDataGridColumn, EuiScreenReaderOnly } from '@elastic/eui';
+import { EuiDataGridColumn, EuiIconTip, EuiScreenReaderOnly } from '@elastic/eui';
 import { ExpandButton } from './discover_grid_expand_button';
 import { DiscoverGridSettings } from './types';
 import type { IndexPattern } from '../../../../../data/common';
@@ -57,9 +57,6 @@ export function buildEuiGridColumn(
   defaultColumns: boolean,
   isSortEnabled: boolean
 ) {
-  const timeString = i18n.translate('discover.timeLabel', {
-    defaultMessage: 'Time',
-  });
   const indexPatternField = indexPattern.getFieldByName(columnName);
   const column: EuiDataGridColumn = {
     id: columnName,
@@ -88,7 +85,23 @@ export function buildEuiGridColumn(
   };
 
   if (column.id === indexPattern.timeFieldName) {
-    column.display = `${timeString} (${indexPattern.timeFieldName})`;
+    const primaryTimeAriaLabel = i18n.translate(
+      'discover.docTable.tableHeader.timeFieldIconTooltipAriaLabel',
+      { defaultMessage: 'Primary time field.' }
+    );
+    const primaryTimeTooltip = i18n.translate(
+      'discover.docTable.tableHeader.timeFieldIconTooltip',
+      {
+        defaultMessage: 'This field represents the time that events occurred.',
+      }
+    );
+
+    column.display = (
+      <Fragment>
+        {indexPatternField?.customLabel ?? indexPattern.timeFieldName}{' '}
+        <EuiIconTip type="clock" aria-label={primaryTimeAriaLabel} content={primaryTimeTooltip} />
+      </Fragment>
+    );
     column.initialWidth = defaultTimeColumnWidth;
   }
   if (columnWidth > 0) {
diff --git a/src/plugins/interactive_setup/server/kibana_config_writer.test.ts b/src/plugins/interactive_setup/server/kibana_config_writer.test.ts
index 4b68451930a3d..0580a35d909ea 100644
--- a/src/plugins/interactive_setup/server/kibana_config_writer.test.ts
+++ b/src/plugins/interactive_setup/server/kibana_config_writer.test.ts
@@ -30,6 +30,7 @@ describe('KibanaConfigWriter', () => {
 
     kibanaConfigWriter = new KibanaConfigWriter(
       '/some/path/kibana.yml',
+      '/data',
       loggingSystemMock.createLogger()
     );
   });
@@ -37,15 +38,15 @@ describe('KibanaConfigWriter', () => {
   afterEach(() => jest.resetAllMocks());
 
   describe('#isConfigWritable()', () => {
-    it('returns `false` if config directory is not writable even if kibana yml is writable', async () => {
+    it('returns `false` if data directory is not writable even if kibana yml is writable', async () => {
       mockFsAccess.mockImplementation((path, modifier) =>
-        path === '/some/path' && modifier === constants.W_OK ? Promise.reject() : Promise.resolve()
+        path === '/data' && modifier === constants.W_OK ? Promise.reject() : Promise.resolve()
       );
 
       await expect(kibanaConfigWriter.isConfigWritable()).resolves.toBe(false);
     });
 
-    it('returns `false` if kibana yml is NOT writable if even config directory is writable', async () => {
+    it('returns `false` if kibana yml is NOT writable if even data directory is writable', async () => {
       mockFsAccess.mockImplementation((path, modifier) =>
         path === '/some/path/kibana.yml' && modifier === constants.W_OK
           ? Promise.reject()
@@ -55,219 +56,208 @@ describe('KibanaConfigWriter', () => {
       await expect(kibanaConfigWriter.isConfigWritable()).resolves.toBe(false);
     });
 
-    it('returns `true` if both kibana yml and config directory are writable', async () => {
+    it('returns `true` if both kibana yml and data directory are writable', async () => {
       mockFsAccess.mockResolvedValue(undefined);
 
       await expect(kibanaConfigWriter.isConfigWritable()).resolves.toBe(true);
     });
 
-    it('returns `true` even if kibana yml does not exist when config directory is writable', async () => {
+    it('returns `true` even if kibana yml does not exist even if data directory is writable', async () => {
       mockFsAccess.mockImplementation((path) =>
         path === '/some/path/kibana.yml' ? Promise.reject() : Promise.resolve()
       );
 
-      await expect(kibanaConfigWriter.isConfigWritable()).resolves.toBe(true);
+      await expect(kibanaConfigWriter.isConfigWritable()).resolves.toBe(false);
     });
   });
 
   describe('#writeConfig()', () => {
-    describe('without existing config', () => {
-      beforeEach(() => {
-        mockReadFile.mockResolvedValue('');
-      });
-
-      it('throws if cannot write CA file', async () => {
-        mockWriteFile.mockRejectedValue(new Error('Oh no!'));
-
-        await expect(
-          kibanaConfigWriter.writeConfig({
-            caCert: 'ca-content',
-            host: '',
-            serviceAccountToken: { name: '', value: '' },
-          })
-        ).rejects.toMatchInlineSnapshot(`[Error: Oh no!]`);
-
-        expect(mockWriteFile).toHaveBeenCalledTimes(1);
-        expect(mockWriteFile).toHaveBeenCalledWith('/some/path/ca_1234.crt', 'ca-content');
-      });
-
-      it('throws if cannot write config to yaml file', async () => {
-        mockWriteFile.mockResolvedValueOnce(undefined).mockRejectedValueOnce(new Error('Oh no!'));
-
-        await expect(
-          kibanaConfigWriter.writeConfig({
-            caCert: 'ca-content',
-            host: 'some-host',
-            serviceAccountToken: { name: 'some-token', value: 'some-value' },
-          })
-        ).rejects.toMatchInlineSnapshot(`[Error: Oh no!]`);
-
-        expect(mockWriteFile).toHaveBeenCalledTimes(2);
-        expect(mockWriteFile).toHaveBeenCalledWith('/some/path/ca_1234.crt', 'ca-content');
-        expect(mockWriteFile).toHaveBeenCalledWith(
-          '/some/path/kibana.yml',
-          `
-
-# This section was automatically generated during setup.
-elasticsearch.hosts: [some-host]
-elasticsearch.serviceAccountToken: some-value
-elasticsearch.ssl.certificateAuthorities: [/some/path/ca_1234.crt]
-
-`
-        );
-      });
-
-      it('throws if cannot read existing config', async () => {
-        mockReadFile.mockRejectedValue(new Error('Oh no!'));
-
-        await expect(
-          kibanaConfigWriter.writeConfig({
-            caCert: 'ca-content',
-            host: 'some-host',
-            serviceAccountToken: { name: 'some-token', value: 'some-value' },
-          })
-        ).rejects.toMatchInlineSnapshot(`[Error: Oh no!]`);
-
-        expect(mockWriteFile).not.toHaveBeenCalled();
-      });
-
-      it('throws if cannot parse existing config', async () => {
-        mockReadFile.mockResolvedValue('foo: bar\nfoo: baz');
-
-        await expect(
-          kibanaConfigWriter.writeConfig({
-            caCert: 'ca-content',
-            host: 'some-host',
-            serviceAccountToken: { name: 'some-token', value: 'some-value' },
-          })
-        ).rejects.toMatchInlineSnapshot(`
-          [YAMLException: duplicated mapping key at line 2, column 1:
-              foo: baz
-              ^]
-        `);
-
-        expect(mockWriteFile).not.toHaveBeenCalled();
-      });
-
-      it('can successfully write CA certificate and elasticsearch config with service token', async () => {
-        await expect(
-          kibanaConfigWriter.writeConfig({
-            caCert: 'ca-content',
-            host: 'some-host',
-            serviceAccountToken: { name: 'some-token', value: 'some-value' },
-          })
-        ).resolves.toBeUndefined();
+    beforeEach(() => {
+      mockReadFile.mockResolvedValue(
+        '# Default Kibana configuration for docker target\nserver.host: "0.0.0.0"\nserver.shutdownTimeout: "5s"'
+      );
+    });
 
-        expect(mockWriteFile).toHaveBeenCalledTimes(2);
-        expect(mockWriteFile).toHaveBeenCalledWith('/some/path/ca_1234.crt', 'ca-content');
-        expect(mockWriteFile).toHaveBeenCalledWith(
-          '/some/path/kibana.yml',
-          `
+    it('throws if cannot write CA file', async () => {
+      mockWriteFile.mockRejectedValue(new Error('Oh no!'));
 
-# This section was automatically generated during setup.
-elasticsearch.hosts: [some-host]
-elasticsearch.serviceAccountToken: some-value
-elasticsearch.ssl.certificateAuthorities: [/some/path/ca_1234.crt]
+      await expect(
+        kibanaConfigWriter.writeConfig({
+          caCert: 'ca-content',
+          host: '',
+          serviceAccountToken: { name: '', value: '' },
+        })
+      ).rejects.toMatchInlineSnapshot(`[Error: Oh no!]`);
 
-`
-        );
-      });
+      expect(mockWriteFile).toHaveBeenCalledTimes(1);
+      expect(mockWriteFile).toHaveBeenCalledWith('/data/ca_1234.crt', 'ca-content');
+    });
 
-      it('can successfully write CA certificate and elasticsearch config with credentials', async () => {
-        await expect(
-          kibanaConfigWriter.writeConfig({
-            caCert: 'ca-content',
-            host: 'some-host',
-            username: 'username',
-            password: 'password',
-          })
-        ).resolves.toBeUndefined();
+    it('throws if cannot write config to yaml file', async () => {
+      mockWriteFile.mockResolvedValueOnce(undefined).mockRejectedValueOnce(new Error('Oh no!'));
 
-        expect(mockWriteFile).toHaveBeenCalledTimes(2);
-        expect(mockWriteFile).toHaveBeenCalledWith('/some/path/ca_1234.crt', 'ca-content');
-        expect(mockWriteFile).toHaveBeenCalledWith(
-          '/some/path/kibana.yml',
-          `
-
-# This section was automatically generated during setup.
-elasticsearch.hosts: [some-host]
-elasticsearch.password: password
-elasticsearch.username: username
-elasticsearch.ssl.certificateAuthorities: [/some/path/ca_1234.crt]
-
-`
-        );
-      });
+      await expect(
+        kibanaConfigWriter.writeConfig({
+          caCert: 'ca-content',
+          host: 'some-host',
+          serviceAccountToken: { name: 'some-token', value: 'some-value' },
+        })
+      ).rejects.toMatchInlineSnapshot(`[Error: Oh no!]`);
 
-      it('can successfully write elasticsearch config without CA certificate', async () => {
-        await expect(
-          kibanaConfigWriter.writeConfig({
-            host: 'some-host',
-            username: 'username',
-            password: 'password',
-          })
-        ).resolves.toBeUndefined();
+      expect(mockWriteFile.mock.calls).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            "/data/ca_1234.crt",
+            "ca-content",
+          ],
+          Array [
+            "/some/path/kibana.yml",
+            "# Default Kibana configuration for docker target
+        server.host: \\"0.0.0.0\\"
+        server.shutdownTimeout: \\"5s\\"
+
+        # This section was automatically generated during setup.
+        elasticsearch.hosts: [some-host]
+        elasticsearch.serviceAccountToken: some-value
+        elasticsearch.ssl.certificateAuthorities: [/data/ca_1234.crt]
+
+        ",
+          ],
+        ]
+      `);
+    });
 
-        expect(mockWriteFile).toHaveBeenCalledTimes(1);
-        expect(mockWriteFile).toHaveBeenCalledWith(
-          '/some/path/kibana.yml',
-          `
+    it('throws if cannot read existing config', async () => {
+      mockReadFile.mockRejectedValue(new Error('Oh no!'));
 
-# This section was automatically generated during setup.
-elasticsearch.hosts: [some-host]
-elasticsearch.password: password
-elasticsearch.username: username
+      await expect(
+        kibanaConfigWriter.writeConfig({
+          caCert: 'ca-content',
+          host: 'some-host',
+          serviceAccountToken: { name: 'some-token', value: 'some-value' },
+        })
+      ).rejects.toMatchInlineSnapshot(`[Error: Oh no!]`);
 
-`
-        );
-      });
+      expect(mockWriteFile).not.toHaveBeenCalled();
     });
 
-    describe('with existing config (no conflicts)', () => {
-      beforeEach(() => {
-        mockReadFile.mockResolvedValue(
-          '# Default Kibana configuration for docker target\nserver.host: "0.0.0.0"\nserver.shutdownTimeout: "5s"'
-        );
-      });
-
-      it('can successfully write CA certificate and elasticsearch config', async () => {
-        await expect(
-          kibanaConfigWriter.writeConfig({
-            caCert: 'ca-content',
-            host: 'some-host',
-            serviceAccountToken: { name: 'some-token', value: 'some-value' },
-          })
-        ).resolves.toBeUndefined();
-
-        expect(mockReadFile).toHaveBeenCalledTimes(1);
-        expect(mockReadFile).toHaveBeenCalledWith('/some/path/kibana.yml', 'utf-8');
+    it('throws if cannot parse existing config', async () => {
+      mockReadFile.mockResolvedValue('foo: bar\nfoo: baz');
+
+      await expect(
+        kibanaConfigWriter.writeConfig({
+          caCert: 'ca-content',
+          host: 'some-host',
+          serviceAccountToken: { name: 'some-token', value: 'some-value' },
+        })
+      ).rejects.toMatchInlineSnapshot(`
+              [YAMLException: duplicated mapping key at line 2, column 1:
+                  foo: baz
+                  ^]
+            `);
+
+      expect(mockWriteFile).not.toHaveBeenCalled();
+    });
 
-        expect(mockWriteFile).toHaveBeenCalledTimes(2);
-        expect(mockWriteFile.mock.calls).toMatchInlineSnapshot(`
+    it('can successfully write CA certificate and elasticsearch config with credentials', async () => {
+      await expect(
+        kibanaConfigWriter.writeConfig({
+          caCert: 'ca-content',
+          host: 'some-host',
+          username: 'username',
+          password: 'password',
+        })
+      ).resolves.toBeUndefined();
+
+      expect(mockWriteFile.mock.calls).toMatchInlineSnapshot(`
+        Array [
           Array [
-            Array [
-              "/some/path/ca_1234.crt",
-              "ca-content",
-            ],
-            Array [
-              "/some/path/kibana.yml",
-              "# Default Kibana configuration for docker target
-          server.host: \\"0.0.0.0\\"
-          server.shutdownTimeout: \\"5s\\"
+            "/data/ca_1234.crt",
+            "ca-content",
+          ],
+          Array [
+            "/some/path/kibana.yml",
+            "# Default Kibana configuration for docker target
+        server.host: \\"0.0.0.0\\"
+        server.shutdownTimeout: \\"5s\\"
+
+        # This section was automatically generated during setup.
+        elasticsearch.hosts: [some-host]
+        elasticsearch.password: password
+        elasticsearch.username: username
+        elasticsearch.ssl.certificateAuthorities: [/data/ca_1234.crt]
+
+        ",
+          ],
+        ]
+      `);
+    });
 
-          # This section was automatically generated during setup.
-          elasticsearch.hosts: [some-host]
-          elasticsearch.serviceAccountToken: some-value
-          elasticsearch.ssl.certificateAuthorities: [/some/path/ca_1234.crt]
+    it('can successfully write elasticsearch config without CA certificate', async () => {
+      await expect(
+        kibanaConfigWriter.writeConfig({
+          host: 'some-host',
+          username: 'username',
+          password: 'password',
+        })
+      ).resolves.toBeUndefined();
+
+      expect(mockWriteFile.mock.calls).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            "/some/path/kibana.yml",
+            "# Default Kibana configuration for docker target
+        server.host: \\"0.0.0.0\\"
+        server.shutdownTimeout: \\"5s\\"
+
+        # This section was automatically generated during setup.
+        elasticsearch.hosts: [some-host]
+        elasticsearch.password: password
+        elasticsearch.username: username
+
+        ",
+          ],
+        ]
+      `);
+    });
 
-          ",
-            ],
-          ]
-        `);
-      });
+    it('can successfully write CA certificate and elasticsearch config with service token', async () => {
+      await expect(
+        kibanaConfigWriter.writeConfig({
+          caCert: 'ca-content',
+          host: 'some-host',
+          serviceAccountToken: { name: 'some-token', value: 'some-value' },
+        })
+      ).resolves.toBeUndefined();
+
+      expect(mockReadFile).toHaveBeenCalledTimes(1);
+      expect(mockReadFile).toHaveBeenCalledWith('/some/path/kibana.yml', 'utf-8');
+
+      expect(mockWriteFile).toHaveBeenCalledTimes(2);
+      expect(mockWriteFile.mock.calls).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            "/data/ca_1234.crt",
+            "ca-content",
+          ],
+          Array [
+            "/some/path/kibana.yml",
+            "# Default Kibana configuration for docker target
+        server.host: \\"0.0.0.0\\"
+        server.shutdownTimeout: \\"5s\\"
+
+        # This section was automatically generated during setup.
+        elasticsearch.hosts: [some-host]
+        elasticsearch.serviceAccountToken: some-value
+        elasticsearch.ssl.certificateAuthorities: [/data/ca_1234.crt]
+
+        ",
+          ],
+        ]
+      `);
     });
 
-    describe('with existing config (with conflicts)', () => {
+    describe('with conflicts', () => {
       beforeEach(() => {
         jest.spyOn(Date.prototype, 'toISOString').mockReturnValue('some date');
         mockReadFile.mockResolvedValue(
@@ -291,7 +281,7 @@ elasticsearch.username: username
         expect(mockWriteFile.mock.calls).toMatchInlineSnapshot(`
           Array [
             Array [
-              "/some/path/ca_1234.crt",
+              "/data/ca_1234.crt",
               "ca-content",
             ],
             Array [
@@ -312,7 +302,7 @@ elasticsearch.username: username
           elasticsearch.hosts: [some-host]
           monitoring.ui.container.elasticsearch.enabled: true
           elasticsearch.serviceAccountToken: some-value
-          elasticsearch.ssl.certificateAuthorities: [/some/path/ca_1234.crt]
+          elasticsearch.ssl.certificateAuthorities: [/data/ca_1234.crt]
 
           ",
             ],
diff --git a/src/plugins/interactive_setup/server/kibana_config_writer.ts b/src/plugins/interactive_setup/server/kibana_config_writer.ts
index ff67e887fab49..ea7f776aad82f 100644
--- a/src/plugins/interactive_setup/server/kibana_config_writer.ts
+++ b/src/plugins/interactive_setup/server/kibana_config_writer.ts
@@ -31,24 +31,23 @@ export type WriteConfigParameters = {
 );
 
 export class KibanaConfigWriter {
-  constructor(private readonly configPath: string, private readonly logger: Logger) {}
+  constructor(
+    private readonly configPath: string,
+    private readonly dataDirectoryPath: string,
+    private readonly logger: Logger
+  ) {}
 
   /**
-   * Checks if we can write to the Kibana configuration file and configuration directory.
+   * Checks if we can write to the Kibana configuration file and data directory.
    */
   public async isConfigWritable() {
     try {
       // We perform two separate checks here:
-      // 1. If we can write to config directory to add a new CA certificate file and potentially Kibana configuration
-      // file if it doesn't exist for some reason.
+      // 1. If we can write to data directory to add a new CA certificate file.
       // 2. If we can write to the Kibana configuration file if it exists.
-      const canWriteToConfigDirectory = fs.access(path.dirname(this.configPath), constants.W_OK);
       await Promise.all([
-        canWriteToConfigDirectory,
-        fs.access(this.configPath, constants.F_OK).then(
-          () => fs.access(this.configPath, constants.W_OK),
-          () => canWriteToConfigDirectory
-        ),
+        fs.access(this.dataDirectoryPath, constants.W_OK),
+        fs.access(this.configPath, constants.W_OK),
       ]);
       return true;
     } catch {
@@ -61,7 +60,7 @@ export class KibanaConfigWriter {
    * @param params
    */
   public async writeConfig(params: WriteConfigParameters) {
-    const caPath = path.join(path.dirname(this.configPath), `ca_${Date.now()}.crt`);
+    const caPath = path.join(this.dataDirectoryPath, `ca_${Date.now()}.crt`);
     const config: Record<string, string | string[]> = { 'elasticsearch.hosts': [params.host] };
     if ('serviceAccountToken' in params) {
       config['elasticsearch.serviceAccountToken'] = params.serviceAccountToken.value;
diff --git a/src/plugins/interactive_setup/server/plugin.ts b/src/plugins/interactive_setup/server/plugin.ts
index 8c1d00a254764..067b8fd044f30 100644
--- a/src/plugins/interactive_setup/server/plugin.ts
+++ b/src/plugins/interactive_setup/server/plugin.ts
@@ -10,6 +10,7 @@ import chalk from 'chalk';
 import type { Subscription } from 'rxjs';
 
 import type { TypeOf } from '@kbn/config-schema';
+import { getDataPath } from '@kbn/utils';
 import type { CorePreboot, Logger, PluginInitializerContext, PrebootPlugin } from 'src/core/server';
 
 import { ElasticsearchConnectionStatus } from '../common';
@@ -146,7 +147,11 @@ Go to ${chalk.cyanBright.underline(url)} to get started.
         basePath: core.http.basePath,
         logger: this.#logger.get('routes'),
         preboot: { ...core.preboot, completeSetup },
-        kibanaConfigWriter: new KibanaConfigWriter(configPath, this.#logger.get('kibana-config')),
+        kibanaConfigWriter: new KibanaConfigWriter(
+          configPath,
+          getDataPath(),
+          this.#logger.get('kibana-config')
+        ),
         elasticsearch,
         verificationCode,
         getConfig: this.#getConfig.bind(this),
diff --git a/src/plugins/telemetry/server/fetcher.ts b/src/plugins/telemetry/server/fetcher.ts
index 02ac428b07667..97180f351986e 100644
--- a/src/plugins/telemetry/server/fetcher.ts
+++ b/src/plugins/telemetry/server/fetcher.ts
@@ -230,6 +230,7 @@ export class FetcherTask {
           method: 'post',
           body: stats,
           headers: {
+            'Content-Type': 'application/json',
             'X-Elastic-Stack-Version': this.currentKibanaVersion,
             'X-Elastic-Cluster-ID': clusterUuid,
             'X-Elastic-Content-Encoding': PAYLOAD_CONTENT_ENCODING,
diff --git a/src/plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap b/src/plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
index bc6d28bd5c1c4..b25444d16c46a 100644
--- a/src/plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
+++ b/src/plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
@@ -12,8 +12,10 @@ exports[`DefaultEditorAgg component should init with the default set of props 1`
     </React.Fragment>
   }
   buttonContentClassName="visEditorSidebar__aggGroupAccordionButtonContent eui-textTruncate"
+  buttonElement="button"
   className="visEditorSidebar__section visEditorSidebar__collapsible visEditorSidebar__collapsible--marginBottom"
   data-test-subj="visEditorAggAccordion1"
+  element="div"
   extraAction={
     <div>
       <EuiToolTip
diff --git a/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx b/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx
index a73f9c6a5e092..886b569671a6b 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx
@@ -8,8 +8,8 @@
 
 import './timeseries_visualization.scss';
 
-import React, { useCallback, useEffect } from 'react';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import React, { Suspense, useCallback, useEffect } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiLoadingChart } from '@elastic/eui';
 import { XYChartSeriesIdentifier, GeometryValue } from '@elastic/charts';
 import { IUiSettingsClient } from 'src/core/public';
 import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
@@ -28,6 +28,7 @@ import { getInterval } from './lib/get_interval';
 import { AUTO_INTERVAL } from '../../../common/constants';
 import { TIME_RANGE_DATA_MODES, PANEL_TYPES } from '../../../common/enums';
 import type { IndexPattern } from '../../../../../data/common';
+import '../index.scss';
 
 interface TimeseriesVisualizationProps {
   className?: string;
@@ -161,18 +162,26 @@ function TimeseriesVisualization({
           </EuiFlexItem>
         )}
         <EuiFlexItem>
-          <VisComponent
-            getConfig={getConfig}
-            model={model}
-            visData={visData}
-            uiState={uiState}
-            onBrush={onBrush}
-            onFilterClick={handleFilterClick}
-            onUiState={handleUiState}
-            syncColors={syncColors}
-            palettesService={palettesService}
-            fieldFormatMap={indexPattern?.fieldFormatMap}
-          />
+          <Suspense
+            fallback={
+              <div className="visChart__spinner">
+                <EuiLoadingChart mono size="l" />
+              </div>
+            }
+          >
+            <VisComponent
+              getConfig={getConfig}
+              model={model}
+              visData={visData}
+              uiState={uiState}
+              onBrush={onBrush}
+              onFilterClick={handleFilterClick}
+              onUiState={handleUiState}
+              syncColors={syncColors}
+              palettesService={palettesService}
+              fieldFormatMap={indexPattern?.fieldFormatMap}
+            />
+          </Suspense>
         </EuiFlexItem>
       </EuiFlexGroup>
     );
diff --git a/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx b/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx
index 34cc1dc347ef8..ad069a4d7e2cc 100644
--- a/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx
+++ b/src/plugins/vis_types/timeseries/public/timeseries_vis_renderer.tsx
@@ -13,6 +13,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n/react';
 import { IUiSettingsClient } from 'kibana/public';
 
+import { EuiLoadingChart } from '@elastic/eui';
 import { fetchIndexPattern } from '../common/index_patterns_utils';
 import { VisualizationContainer, PersistedState } from '../../../visualizations/public';
 
@@ -43,10 +44,6 @@ export const getTimeseriesVisRenderer: (deps: {
   name: 'timeseries_vis',
   reuseDomNode: true,
   render: async (domNode, config, handlers) => {
-    // Build optimization. Move app styles from main bundle
-    // @ts-expect-error TS error, cannot find type declaration for scss
-    await import('./application/index.scss');
-
     handlers.onDestroy(() => {
       unmountComponentAtNode(domNode);
     });
@@ -55,33 +52,49 @@ export const getTimeseriesVisRenderer: (deps: {
     const { indexPatterns } = getDataStart();
 
     const showNoResult = !checkIfDataExists(visData, model);
-    const [palettesService, { indexPattern }] = await Promise.all([
+
+    let servicesLoaded;
+
+    Promise.all([
       palettes.getPalettes(),
       fetchIndexPattern(model.index_pattern, indexPatterns),
-    ]);
+    ]).then(([palettesService, { indexPattern }]) => {
+      servicesLoaded = true;
 
-    render(
-      <I18nProvider>
-        <VisualizationContainer
-          data-test-subj="timeseriesVis"
-          handlers={handlers}
-          showNoResult={showNoResult}
-          error={get(visData, [model.id, 'error'])}
-        >
-          <TimeseriesVisualization
-            // it is mandatory to bind uiSettings because of "this" usage inside "get" method
-            getConfig={uiSettings.get.bind(uiSettings)}
+      unmountComponentAtNode(domNode);
+
+      render(
+        <I18nProvider>
+          <VisualizationContainer
+            data-test-subj="timeseriesVis"
             handlers={handlers}
-            indexPattern={indexPattern}
-            model={model}
-            visData={visData as TimeseriesVisData}
-            syncColors={syncColors}
-            uiState={handlers.uiState! as PersistedState}
-            palettesService={palettesService}
-          />
-        </VisualizationContainer>
-      </I18nProvider>,
-      domNode
-    );
+            showNoResult={showNoResult}
+            error={get(visData, [model.id, 'error'])}
+          >
+            <TimeseriesVisualization
+              // it is mandatory to bind uiSettings because of "this" usage inside "get" method
+              getConfig={uiSettings.get.bind(uiSettings)}
+              handlers={handlers}
+              indexPattern={indexPattern}
+              model={model}
+              visData={visData as TimeseriesVisData}
+              syncColors={syncColors}
+              uiState={handlers.uiState! as PersistedState}
+              palettesService={palettesService}
+            />
+          </VisualizationContainer>
+        </I18nProvider>,
+        domNode
+      );
+    });
+
+    if (!servicesLoaded) {
+      render(
+        <div className="visChart__spinner">
+          <EuiLoadingChart mono size="l" />
+        </div>,
+        domNode
+      );
+    }
   },
 });
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/get_interval_and_timefield.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/get_interval_and_timefield.ts
index b7a22abd825e0..7c17f003dfbab 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/get_interval_and_timefield.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/get_interval_and_timefield.ts
@@ -24,10 +24,15 @@ export function getIntervalAndTimefield(
   { min, max, maxBuckets }: IntervalParams,
   series?: Series
 ) {
-  const timeField =
+  let timeField =
     (series?.override_index_pattern ? series.series_time_field : panel.time_field) ||
     index.indexPattern?.timeFieldName;
 
+  // should use @timestamp as default timeField for es indeces if user doesn't provide timeField
+  if (!panel.use_kibana_indexes && !timeField) {
+    timeField = '@timestamp';
+  }
+
   if (panel.use_kibana_indexes) {
     validateField(timeField!, index);
   }
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
index f50836e6ca8af..1dd916f827fe6 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
@@ -66,8 +66,10 @@ exports[`ValueAxesPanel component should init with the default set of props 1`]
       </React.Fragment>
     }
     buttonContentClassName="visEditorSidebar__aggGroupAccordionButtonContent eui-textTruncate"
+    buttonElement="button"
     className="visEditorSidebar__section visEditorSidebar__collapsible"
     data-test-subj="toggleYAxisOptions-ValueAxis-1"
+    element="div"
     extraAction={
       <EuiToolTip
         content="Remove Y-axis"
@@ -176,8 +178,10 @@ exports[`ValueAxesPanel component should init with the default set of props 1`]
       </React.Fragment>
     }
     buttonContentClassName="visEditorSidebar__aggGroupAccordionButtonContent eui-textTruncate"
+    buttonElement="button"
     className="visEditorSidebar__section visEditorSidebar__collapsible"
     data-test-subj="toggleYAxisOptions-ValueAxis-2"
+    element="div"
     extraAction={
       <EuiToolTip
         content="Remove Y-axis"
diff --git a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
index d8da56f0a260f..b036cd93d300b 100644
--- a/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
+++ b/src/plugins/vis_types/xy/public/editor/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
@@ -117,7 +117,9 @@ exports[`ValueAxisOptions component should init with the default set of props 1`
     arrowDisplay="left"
     buttonContent="Custom extents"
     buttonContentClassName="euiText euiText--small"
+    buttonElement="button"
     className="visEditorSidebar__section visEditorSidebar__collapsible"
+    element="div"
     id="yAxisOptionsAccordionValueAxis-1"
     initialIsOpen={false}
     isLoading={false}
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx
similarity index 98%
rename from src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
rename to src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx
index 928cbec9c3747..37365fd613e5a 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx
@@ -9,6 +9,9 @@
 import _, { get } from 'lodash';
 import { Subscription } from 'rxjs';
 import { i18n } from '@kbn/i18n';
+import React from 'react';
+import { render } from 'react-dom';
+import { EuiLoadingChart } from '@elastic/eui';
 import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
 import {
   IndexPattern,
@@ -299,6 +302,13 @@ export class VisualizeEmbeddable
     this.domNode = div;
     super.render(this.domNode);
 
+    render(
+      <div className="visChart__spinner">
+        <EuiLoadingChart mono size="l" />
+      </div>,
+      this.domNode
+    );
+
     const expressions = getExpressions();
     this.handler = await expressions.loader(this.domNode, undefined, {
       onRenderError: (element: HTMLElement, error: ExpressionRenderError) => {
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable_async.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable_async.ts
index c7480844adbea..2fa22cfe8d80b 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable_async.ts
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable_async.ts
@@ -12,10 +12,12 @@ export const createVisualizeEmbeddableAsync = async (
   ...args: ConstructorParameters<typeof VisualizeEmbeddableType>
 ) => {
   // Build optimization. Move app styles from main bundle
-  // @ts-expect-error TS error, cannot find type declaration for scss
-  await import('./embeddables.scss');
 
-  const { VisualizeEmbeddable } = await import('./visualize_embeddable');
+  const [{ VisualizeEmbeddable }] = await Promise.all([
+    import('./visualize_embeddable'),
+    // @ts-expect-error TS error, cannot find type declaration for scss
+    import('./embeddables.scss'),
+  ]);
 
   return new VisualizeEmbeddable(...args);
 };
diff --git a/test/api_integration/apis/custom_integration/integrations.ts b/test/api_integration/apis/custom_integration/integrations.ts
index e4797b334a866..0784a86e4b546 100644
--- a/test/api_integration/apis/custom_integration/integrations.ts
+++ b/test/api_integration/apis/custom_integration/integrations.ts
@@ -22,7 +22,7 @@ export default function ({ getService }: FtrProviderContext) {
 
         expect(resp.body).to.be.an('array');
 
-        expect(resp.body.length).to.be(12);
+        expect(resp.body.length).to.be(33);
 
         // Test for sample data card
         expect(resp.body.findIndex((c: { id: string }) => c.id === 'sample_data_all')).to.be.above(
diff --git a/test/api_integration/apis/saved_objects_management/find.ts b/test/api_integration/apis/saved_objects_management/find.ts
index 0b744b7991b38..ea7f297dfeb08 100644
--- a/test/api_integration/apis/saved_objects_management/find.ts
+++ b/test/api_integration/apis/saved_objects_management/find.ts
@@ -249,7 +249,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/management/kibana/dataViews/dataView/8963ca30-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'management.kibana.indexPatterns',
               },
-              namespaceType: 'single',
+              namespaceType: 'multiple-isolated',
             });
           }));
     });
diff --git a/test/api_integration/apis/saved_objects_management/relationships.ts b/test/api_integration/apis/saved_objects_management/relationships.ts
index 518ec29947016..838bc05346dda 100644
--- a/test/api_integration/apis/saved_objects_management/relationships.ts
+++ b/test/api_integration/apis/saved_objects_management/relationships.ts
@@ -91,7 +91,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/management/kibana/dataViews/dataView/8963ca30-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'management.kibana.indexPatterns',
               },
-              namespaceType: 'single',
+              namespaceType: 'multiple-isolated',
               hiddenType: false,
             },
           },
@@ -132,7 +132,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/management/kibana/dataViews/dataView/8963ca30-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'management.kibana.indexPatterns',
               },
-              namespaceType: 'single',
+              namespaceType: 'multiple-isolated',
               hiddenType: false,
             },
             relationship: 'child',
diff --git a/test/common/services/security/test_user.ts b/test/common/services/security/test_user.ts
index 695294f08b02d..1161e7b493f41 100644
--- a/test/common/services/security/test_user.ts
+++ b/test/common/services/security/test_user.ts
@@ -71,13 +71,12 @@ export class TestUser extends FtrService {
 export async function createTestUserService(ctx: FtrProviderContext, role: Role, user: User) {
   const log = ctx.getService('log');
   const config = ctx.getService('config');
-  const kibanaServer = ctx.getService('kibanaServer');
 
-  const enabledPlugins = config.get('security.disableTestUser')
-    ? []
-    : await kibanaServer.plugins.getEnabledIds();
-
-  const enabled = enabledPlugins.includes('security') && !config.get('security.disableTestUser');
+  const enabled =
+    !config
+      .get('esTestCluster.serverArgs')
+      .some((arg: string) => arg === 'xpack.security.enabled=false') &&
+    !config.get('security.disableTestUser');
 
   if (enabled) {
     log.debug('===============creating roles and users===============');
diff --git a/test/functional/apps/context/_discover_navigation.ts b/test/functional/apps/context/_discover_navigation.ts
index 1b8300f3345b1..60745bd64b8be 100644
--- a/test/functional/apps/context/_discover_navigation.ts
+++ b/test/functional/apps/context/_discover_navigation.ts
@@ -74,7 +74,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     it('should open the context view with the same columns', async () => {
       const columnNames = await docTable.getHeaderFields();
-      expect(columnNames).to.eql(['Time', ...TEST_COLUMN_NAMES]);
+      expect(columnNames).to.eql(['@timestamp', ...TEST_COLUMN_NAMES]);
     });
 
     it('should open the context view with the filters disabled', async () => {
diff --git a/test/functional/apps/discover/_data_grid.ts b/test/functional/apps/discover/_data_grid.ts
index 4a343fb30384e..198691f3b8477 100644
--- a/test/functional/apps/discover/_data_grid.ts
+++ b/test/functional/apps/discover/_data_grid.ts
@@ -39,19 +39,19 @@ export default function ({
       const getTitles = async () =>
         (await testSubjects.getVisibleText('dataGridHeader')).replace(/\s|\r?\n|\r/g, ' ');
 
-      expect(await getTitles()).to.be('Time (@timestamp) Document');
+      expect(await getTitles()).to.be('@timestamp Document');
 
       await PageObjects.discover.clickFieldListItemAdd('bytes');
-      expect(await getTitles()).to.be('Time (@timestamp) bytes');
+      expect(await getTitles()).to.be('@timestamp bytes');
 
       await PageObjects.discover.clickFieldListItemAdd('agent');
-      expect(await getTitles()).to.be('Time (@timestamp) bytes agent');
+      expect(await getTitles()).to.be('@timestamp bytes agent');
 
       await PageObjects.discover.clickFieldListItemRemove('bytes');
-      expect(await getTitles()).to.be('Time (@timestamp) agent');
+      expect(await getTitles()).to.be('@timestamp agent');
 
       await PageObjects.discover.clickFieldListItemRemove('agent');
-      expect(await getTitles()).to.be('Time (@timestamp) Document');
+      expect(await getTitles()).to.be('@timestamp Document');
     });
   });
 }
diff --git a/test/functional/apps/discover/_data_grid_context.ts b/test/functional/apps/discover/_data_grid_context.ts
index 3d9e01e1dee19..d12ada2070cff 100644
--- a/test/functional/apps/discover/_data_grid_context.ts
+++ b/test/functional/apps/discover/_data_grid_context.ts
@@ -76,7 +76,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     it('should open the context view with the same columns', async () => {
       const columnNames = await dataGrid.getHeaderFields();
-      expect(columnNames).to.eql(['Time (@timestamp)', ...TEST_COLUMN_NAMES]);
+      expect(columnNames).to.eql(['@timestamp', ...TEST_COLUMN_NAMES]);
     });
 
     it('should open the context view with the filters disabled', async () => {
diff --git a/test/functional/apps/discover/_data_grid_field_data.ts b/test/functional/apps/discover/_data_grid_field_data.ts
index 94e8e942f86ba..91c2d5914732d 100644
--- a/test/functional/apps/discover/_data_grid_field_data.ts
+++ b/test/functional/apps/discover/_data_grid_field_data.ts
@@ -59,8 +59,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         });
       });
 
-      it('doc view should show Time and _source columns', async function () {
-        const expectedHeader = 'Time (@timestamp) Document';
+      it('doc view should show @timestamp and _source columns', async function () {
+        const expectedHeader = '@timestamp Document';
         const DocHeader = await dataGrid.getHeaderFields();
         expect(DocHeader.join(' ')).to.be(expectedHeader);
       });
diff --git a/test/functional/apps/discover/_field_data.ts b/test/functional/apps/discover/_field_data.ts
index 27407e9a0bc4d..28f147eeab55f 100644
--- a/test/functional/apps/discover/_field_data.ts
+++ b/test/functional/apps/discover/_field_data.ts
@@ -107,8 +107,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         after(async function () {
           await kibanaServer.uiSettings.replace({});
         });
-        it('doc view should show Time and _source columns', async function () {
-          const expectedHeader = 'Time\n_source';
+        it('doc view should show @timestamp and _source columns', async function () {
+          const expectedHeader = '@timestamp\n_source';
           const docHeader = await find.byCssSelector('thead > tr:nth-child(1)');
           const docHeaderText = await docHeader.getVisibleText();
           expect(docHeaderText).to.be(expectedHeader);
diff --git a/test/functional/apps/discover/_field_data_with_fields_api.ts b/test/functional/apps/discover/_field_data_with_fields_api.ts
index 666377ae7f794..f0dedb155fc9b 100644
--- a/test/functional/apps/discover/_field_data_with_fields_api.ts
+++ b/test/functional/apps/discover/_field_data_with_fields_api.ts
@@ -64,9 +64,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         });
       });
 
-      it('doc view should show Time and Document columns', async function () {
+      it('doc view should show @timestamp and Document columns', async function () {
         const Docheader = await PageObjects.discover.getDocHeader();
-        expect(Docheader).to.contain('Time');
+        expect(Docheader).to.contain('@timestamp');
         expect(Docheader).to.contain('Document');
       });
 
diff --git a/test/functional/apps/visualize/_timelion.ts b/test/functional/apps/visualize/_timelion.ts
index bb85b6821df31..c531ada8a2573 100644
--- a/test/functional/apps/visualize/_timelion.ts
+++ b/test/functional/apps/visualize/_timelion.ts
@@ -257,7 +257,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         expect(value).to.eql('.es()');
       });
 
-      describe('dynamic suggestions for argument values', () => {
+      // FLAKY: https://github.com/elastic/kibana/issues/116033
+      describe.skip('dynamic suggestions for argument values', () => {
         describe('.es()', () => {
           it('should show index pattern suggestions for index argument', async () => {
             await monacoEditor.setCodeEditorValue('');
diff --git a/test/functional/config.js b/test/functional/config.js
index e0195c4dadc8d..5b0b79e84e8df 100644
--- a/test/functional/config.js
+++ b/test/functional/config.js
@@ -45,7 +45,6 @@ export default async function ({ readConfigFile }) {
         '--savedObjects.maxImportPayloadBytes=10485760',
 
         // to be re-enabled once kibana/issues/102552 is completed
-        '--xpack.security.enabled=false',
         '--xpack.reporting.enabled=false',
       ],
     },
diff --git a/vars/tasks.groovy b/vars/tasks.groovy
index da18d73e5b36c..1842e278282b1 100644
--- a/vars/tasks.groovy
+++ b/vars/tasks.groovy
@@ -146,13 +146,13 @@ def functionalXpack(Map params = [:]) {
       }
     }
 
-    // whenChanged([
-    //   'x-pack/plugins/apm/',
-    // ]) {
-    //   if (githubPr.isPr()) {
-    //     task(kibanaPipeline.functionalTestProcess('xpack-APMCypress', './test/scripts/jenkins_apm_cypress.sh'))
-    //   }
-    // }
+    whenChanged([
+      'x-pack/plugins/apm/',
+    ]) {
+      if (githubPr.isPr()) {
+        task(kibanaPipeline.functionalTestProcess('xpack-APMCypress', './test/scripts/jenkins_apm_cypress.sh'))
+      }
+    }
 
     whenChanged([
       'x-pack/plugins/uptime/',
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
index 2300143925b1e..1254d86e99066 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/service.test.ts
@@ -8,7 +8,7 @@
 import axios from 'axios';
 
 import { createExternalService } from './service';
-import * as utils from '../lib/axios_utils';
+import { request, createAxiosResponse } from '../lib/axios_utils';
 import { ExternalService } from './types';
 import { Logger } from '../../../../../../src/core/server';
 import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
@@ -29,10 +29,10 @@ jest.mock('../lib/axios_utils', () => {
 });
 
 axios.create = jest.fn(() => axios);
-const requestMock = utils.request as jest.Mock;
+const requestMock = request as jest.Mock;
 const configurationUtilities = actionsConfigMock.create();
 
-const issueTypesResponse = {
+const issueTypesResponse = createAxiosResponse({
   data: {
     projects: [
       {
@@ -49,9 +49,9 @@ const issueTypesResponse = {
       },
     ],
   },
-};
+});
 
-const fieldsResponse = {
+const fieldsResponse = createAxiosResponse({
   data: {
     projects: [
       {
@@ -98,7 +98,7 @@ const fieldsResponse = {
       },
     ],
   },
-};
+});
 
 const issueResponse = {
   id: '10267',
@@ -108,6 +108,31 @@ const issueResponse = {
 
 const issuesResponse = [issueResponse];
 
+const mockNewAPI = () =>
+  requestMock.mockImplementationOnce(() =>
+    createAxiosResponse({
+      data: {
+        capabilities: {
+          'list-project-issuetypes':
+            'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
+          'list-issuetype-fields':
+            'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
+        },
+      },
+    })
+  );
+
+const mockOldAPI = () =>
+  requestMock.mockImplementationOnce(() =>
+    createAxiosResponse({
+      data: {
+        capabilities: {
+          navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
+        },
+      },
+    })
+  );
+
 describe('Jira service', () => {
   let service: ExternalService;
 
@@ -183,18 +208,34 @@ describe('Jira service', () => {
   });
 
   describe('getIncident', () => {
+    const axiosRes = {
+      data: {
+        id: '1',
+        key: 'CK-1',
+        fields: {
+          summary: 'title',
+          description: 'description',
+          created: '2021-10-20T19:41:02.754+0300',
+          updated: '2021-10-20T19:41:02.754+0300',
+        },
+      },
+    };
+
     test('it returns the incident correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data: { id: '1', key: 'CK-1', fields: { summary: 'title', description: 'description' } },
-      }));
+      requestMock.mockImplementation(() => createAxiosResponse(axiosRes));
       const res = await service.getIncident('1');
-      expect(res).toEqual({ id: '1', key: 'CK-1', summary: 'title', description: 'description' });
+      expect(res).toEqual({
+        id: '1',
+        key: 'CK-1',
+        summary: 'title',
+        description: 'description',
+        created: '2021-10-20T19:41:02.754+0300',
+        updated: '2021-10-20T19:41:02.754+0300',
+      });
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data: { id: '1', key: 'CK-1' },
-      }));
+      requestMock.mockImplementation(() => createAxiosResponse(axiosRes));
 
       await service.getIncident('1');
       expect(requestMock).toHaveBeenCalledWith({
@@ -215,9 +256,38 @@ describe('Jira service', () => {
         '[Action][Jira]: Unable to get incident with id 1. Error: An error has occurred Reason: Required field'
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ ...axiosRes, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.getIncident('1')).rejects.toThrow(
+        '[Action][Jira]: Unable to get incident with id 1. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json Reason: unknown: errorResponse was null'
+      );
+    });
+
+    test('it should throw if the required attributes are not there', async () => {
+      requestMock.mockImplementation(() => createAxiosResponse({ data: { notRequired: 'test' } }));
+
+      await expect(service.getIncident('1')).rejects.toThrow(
+        '[Action][Jira]: Unable to get incident with id 1. Error: Response is missing at least one of the expected fields: id,key Reason: unknown: errorResponse was null'
+      );
+    });
   });
 
   describe('createIncident', () => {
+    const incident = {
+      incident: {
+        summary: 'title',
+        description: 'desc',
+        labels: [],
+        issueType: '10006',
+        priority: 'High',
+        parent: 'RJ-107',
+      },
+    };
+
     test('it creates the incident correctly', async () => {
       /* The response from Jira when creating an issue contains only the key and the id.
       The function makes the following calls when creating an issue:
@@ -225,24 +295,19 @@ describe('Jira service', () => {
         2. Create the issue.
         3. Get the created issue with all the necessary fields.
     */
-      requestMock.mockImplementationOnce(() => ({
-        data: { id: '1', key: 'CK-1', fields: { summary: 'title', description: 'description' } },
-      }));
+      requestMock.mockImplementationOnce(() =>
+        createAxiosResponse({
+          data: { id: '1', key: 'CK-1', fields: { summary: 'title', description: 'description' } },
+        })
+      );
 
-      requestMock.mockImplementationOnce(() => ({
-        data: { id: '1', key: 'CK-1', fields: { created: '2020-04-27T10:59:46.202Z' } },
-      }));
+      requestMock.mockImplementationOnce(() =>
+        createAxiosResponse({
+          data: { id: '1', key: 'CK-1', fields: { created: '2020-04-27T10:59:46.202Z' } },
+        })
+      );
 
-      const res = await service.createIncident({
-        incident: {
-          summary: 'title',
-          description: 'desc',
-          labels: [],
-          issueType: '10006',
-          priority: 'High',
-          parent: null,
-        },
-      });
+      const res = await service.createIncident(incident);
 
       expect(res).toEqual({
         title: 'CK-1',
@@ -260,24 +325,30 @@ describe('Jira service', () => {
         3. Get the created issue with all the necessary fields.
     */
       // getIssueType mocks
-      requestMock.mockImplementationOnce(() => ({
-        data: {
-          capabilities: {
-            navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
+      requestMock.mockImplementationOnce(() =>
+        createAxiosResponse({
+          data: {
+            capabilities: {
+              navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
+            },
           },
-        },
-      }));
+        })
+      );
 
       // getIssueType mocks
       requestMock.mockImplementationOnce(() => issueTypesResponse);
 
-      requestMock.mockImplementationOnce(() => ({
-        data: { id: '1', key: 'CK-1', fields: { summary: 'title', description: 'description' } },
-      }));
+      requestMock.mockImplementationOnce(() =>
+        createAxiosResponse({
+          data: { id: '1', key: 'CK-1', fields: { summary: 'title', description: 'description' } },
+        })
+      );
 
-      requestMock.mockImplementationOnce(() => ({
-        data: { id: '1', key: 'CK-1', fields: { created: '2020-04-27T10:59:46.202Z' } },
-      }));
+      requestMock.mockImplementationOnce(() =>
+        createAxiosResponse({
+          data: { id: '1', key: 'CK-1', fields: { created: '2020-04-27T10:59:46.202Z' } },
+        })
+      );
 
       const res = await service.createIncident({
         incident: {
@@ -317,25 +388,31 @@ describe('Jira service', () => {
     });
 
     test('removes newline characters and trialing spaces from summary', async () => {
-      requestMock.mockImplementationOnce(() => ({
-        data: {
-          capabilities: {
-            navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
+      requestMock.mockImplementationOnce(() =>
+        createAxiosResponse({
+          data: {
+            capabilities: {
+              navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
+            },
           },
-        },
-      }));
+        })
+      );
 
       // getIssueType mocks
       requestMock.mockImplementationOnce(() => issueTypesResponse);
 
       // getIssueType mocks
-      requestMock.mockImplementationOnce(() => ({
-        data: { id: '1', key: 'CK-1', fields: { summary: 'test', description: 'description' } },
-      }));
+      requestMock.mockImplementationOnce(() =>
+        createAxiosResponse({
+          data: { id: '1', key: 'CK-1', fields: { summary: 'test', description: 'description' } },
+        })
+      );
 
-      requestMock.mockImplementationOnce(() => ({
-        data: { id: '1', key: 'CK-1', fields: { created: '2020-04-27T10:59:46.202Z' } },
-      }));
+      requestMock.mockImplementationOnce(() =>
+        createAxiosResponse({
+          data: { id: '1', key: 'CK-1', fields: { created: '2020-04-27T10:59:46.202Z' } },
+        })
+      );
 
       await service.createIncident({
         incident: {
@@ -368,24 +445,17 @@ describe('Jira service', () => {
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          id: '1',
-          key: 'CK-1',
-          fields: { created: '2020-04-27T10:59:46.202Z' },
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            id: '1',
+            key: 'CK-1',
+            fields: { created: '2020-04-27T10:59:46.202Z' },
+          },
+        })
+      );
 
-      await service.createIncident({
-        incident: {
-          summary: 'title',
-          description: 'desc',
-          labels: [],
-          issueType: '10006',
-          priority: 'High',
-          parent: 'RJ-107',
-        },
-      });
+      await service.createIncident(incident);
 
       expect(requestMock).toHaveBeenCalledWith({
         axios,
@@ -414,44 +484,55 @@ describe('Jira service', () => {
         throw error;
       });
 
-      await expect(
-        service.createIncident({
-          incident: {
-            summary: 'title',
-            description: 'desc',
-            labels: [],
-            issueType: '10006',
-            priority: 'High',
-            parent: null,
-          },
-        })
-      ).rejects.toThrow(
+      await expect(service.createIncident(incident)).rejects.toThrow(
         '[Action][Jira]: Unable to create incident. Error: An error has occurred. Reason: Required field'
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.createIncident(incident)).rejects.toThrow(
+        '[Action][Jira]: Unable to create incident. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown: errorResponse was null'
+      );
+    });
+
+    test('it should throw if the required attributes are not there', async () => {
+      requestMock.mockImplementation(() => createAxiosResponse({ data: { notRequired: 'test' } }));
+
+      await expect(service.createIncident(incident)).rejects.toThrow(
+        '[Action][Jira]: Unable to create incident. Error: Response is missing at least one of the expected fields: id. Reason: unknown: errorResponse was null'
+      );
+    });
   });
 
   describe('updateIncident', () => {
+    const incident = {
+      incidentId: '1',
+      incident: {
+        summary: 'title',
+        description: 'desc',
+        labels: [],
+        issueType: '10006',
+        priority: 'High',
+        parent: 'RJ-107',
+      },
+    };
+
     test('it updates the incident correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          id: '1',
-          key: 'CK-1',
-          fields: { updated: '2020-04-27T10:59:46.202Z' },
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            id: '1',
+            key: 'CK-1',
+            fields: { updated: '2020-04-27T10:59:46.202Z' },
+          },
+        })
+      );
 
-      const res = await service.updateIncident({
-        incidentId: '1',
-        incident: {
-          summary: 'title',
-          description: 'desc',
-          labels: [],
-          issueType: '10006',
-          priority: 'High',
-          parent: null,
-        },
-      });
+      const res = await service.updateIncident(incident);
 
       expect(res).toEqual({
         title: 'CK-1',
@@ -462,25 +543,17 @@ describe('Jira service', () => {
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          id: '1',
-          key: 'CK-1',
-          fields: { updated: '2020-04-27T10:59:46.202Z' },
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            id: '1',
+            key: 'CK-1',
+            fields: { updated: '2020-04-27T10:59:46.202Z' },
+          },
+        })
+      );
 
-      await service.updateIncident({
-        incidentId: '1',
-        incident: {
-          summary: 'title',
-          description: 'desc',
-          labels: [],
-          issueType: '10006',
-          priority: 'High',
-          parent: 'RJ-107',
-        },
-      });
+      await service.updateIncident(incident);
 
       expect(requestMock).toHaveBeenCalledWith({
         axios,
@@ -509,41 +582,42 @@ describe('Jira service', () => {
         throw error;
       });
 
-      await expect(
-        service.updateIncident({
-          incidentId: '1',
-          incident: {
-            summary: 'title',
-            description: 'desc',
-            labels: [],
-            issueType: '10006',
-            priority: 'High',
-            parent: null,
-          },
-        })
-      ).rejects.toThrow(
+      await expect(service.updateIncident(incident)).rejects.toThrow(
         '[Action][Jira]: Unable to update incident with id 1. Error: An error has occurred. Reason: Required field'
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.updateIncident(incident)).rejects.toThrow(
+        '[Action][Jira]: Unable to update incident with id 1. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown: errorResponse was null'
+      );
+    });
   });
 
   describe('createComment', () => {
+    const commentReq = {
+      incidentId: '1',
+      comment: {
+        comment: 'comment',
+        commentId: 'comment-1',
+      },
+    };
     test('it creates the comment correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          id: '1',
-          key: 'CK-1',
-          created: '2020-04-27T10:59:46.202Z',
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            id: '1',
+            key: 'CK-1',
+            created: '2020-04-27T10:59:46.202Z',
+          },
+        })
+      );
 
-      const res = await service.createComment({
-        incidentId: '1',
-        comment: {
-          comment: 'comment',
-          commentId: 'comment-1',
-        },
-      });
+      const res = await service.createComment(commentReq);
 
       expect(res).toEqual({
         commentId: 'comment-1',
@@ -553,21 +627,17 @@ describe('Jira service', () => {
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          id: '1',
-          key: 'CK-1',
-          created: '2020-04-27T10:59:46.202Z',
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            id: '1',
+            key: 'CK-1',
+            created: '2020-04-27T10:59:46.202Z',
+          },
+        })
+      );
 
-      await service.createComment({
-        incidentId: '1',
-        comment: {
-          comment: 'comment',
-          commentId: 'comment-1',
-        },
-      });
+      await service.createComment(commentReq);
 
       expect(requestMock).toHaveBeenCalledWith({
         axios,
@@ -586,29 +656,33 @@ describe('Jira service', () => {
         throw error;
       });
 
-      await expect(
-        service.createComment({
-          incidentId: '1',
-          comment: {
-            comment: 'comment',
-            commentId: 'comment-1',
-          },
-        })
-      ).rejects.toThrow(
+      await expect(service.createComment(commentReq)).rejects.toThrow(
         '[Action][Jira]: Unable to create comment at incident with id 1. Error: An error has occurred. Reason: Required field'
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.createComment(commentReq)).rejects.toThrow(
+        '[Action][Jira]: Unable to create comment at incident with id 1. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown: errorResponse was null'
+      );
+    });
+
+    test('it should throw if the required attributes are not there', async () => {
+      requestMock.mockImplementation(() => createAxiosResponse({ data: { notRequired: 'test' } }));
+
+      await expect(service.createComment(commentReq)).rejects.toThrow(
+        '[Action][Jira]: Unable to create comment at incident with id 1. Error: Response is missing at least one of the expected fields: id,created. Reason: unknown: errorResponse was null'
+      );
+    });
   });
 
   describe('getCapabilities', () => {
     test('it should return the capabilities', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          capabilities: {
-            navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
-          },
-        },
-      }));
+      mockOldAPI();
       const res = await service.getCapabilities();
       expect(res).toEqual({
         capabilities: {
@@ -618,13 +692,7 @@ describe('Jira service', () => {
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          capabilities: {
-            navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
-          },
-        },
-      }));
+      mockOldAPI();
 
       await service.getCapabilities();
 
@@ -649,16 +717,34 @@ describe('Jira service', () => {
       );
     });
 
-    test('it should throw an auth error', async () => {
+    test('it should return unknown if the error is a string', async () => {
       requestMock.mockImplementation(() => {
         const error = new Error('An error has occurred');
-        // @ts-ignore this can happen!
+        // @ts-ignore
         error.response = { data: 'Unauthorized' };
         throw error;
       });
 
       await expect(service.getCapabilities()).rejects.toThrow(
-        '[Action][Jira]: Unable to get capabilities. Error: An error has occurred. Reason: Unauthorized'
+        '[Action][Jira]: Unable to get capabilities. Error: An error has occurred. Reason: unknown: errorResponse.errors was null'
+      );
+    });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.getCapabilities()).rejects.toThrow(
+        '[Action][Jira]: Unable to get capabilities. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown: errorResponse was null'
+      );
+    });
+
+    test('it should throw if the required attributes are not there', async () => {
+      requestMock.mockImplementation(() => createAxiosResponse({ data: { notRequired: 'test' } }));
+
+      await expect(service.getCapabilities()).rejects.toThrow(
+        '[Action][Jira]: Unable to get capabilities. Error: Response is missing at least one of the expected fields: capabilities. Reason: unknown: errorResponse was null'
       );
     });
   });
@@ -666,13 +752,7 @@ describe('Jira service', () => {
   describe('getIssueTypes', () => {
     describe('Old API', () => {
       test('it should return the issue types', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
-            },
-          },
-        }));
+        mockOldAPI();
 
         requestMock.mockImplementationOnce(() => issueTypesResponse);
 
@@ -691,13 +771,7 @@ describe('Jira service', () => {
       });
 
       test('it should call request with correct arguments', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
-            },
-          },
-        }));
+        mockOldAPI();
 
         requestMock.mockImplementationOnce(() => issueTypesResponse);
 
@@ -713,13 +787,7 @@ describe('Jira service', () => {
       });
 
       test('it should throw an error', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
-            },
-          },
-        }));
+        mockOldAPI();
 
         requestMock.mockImplementation(() => {
           const error: ResponseError = new Error('An error has occurred');
@@ -731,25 +799,30 @@ describe('Jira service', () => {
           '[Action][Jira]: Unable to get issue types. Error: An error has occurred. Reason: Could not get issue types'
         );
       });
+
+      test('it should throw if the request is not a JSON', async () => {
+        mockOldAPI();
+
+        requestMock.mockImplementation(() =>
+          createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+        );
+
+        await expect(service.getIssueTypes()).rejects.toThrow(
+          '[Action][Jira]: Unable to get issue types. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown: errorResponse was null'
+        );
+      });
     });
     describe('New API', () => {
       test('it should return the issue types', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              'list-project-issuetypes':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
-              'list-issuetype-fields':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
-            },
-          },
-        }));
+        mockNewAPI();
 
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            values: issueTypesResponse.data.projects[0].issuetypes,
-          },
-        }));
+        requestMock.mockImplementationOnce(() =>
+          createAxiosResponse({
+            data: {
+              values: issueTypesResponse.data.projects[0].issuetypes,
+            },
+          })
+        );
 
         const res = await service.getIssueTypes();
 
@@ -766,22 +839,15 @@ describe('Jira service', () => {
       });
 
       test('it should call request with correct arguments', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              'list-project-issuetypes':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
-              'list-issuetype-fields':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
-            },
-          },
-        }));
+        mockNewAPI();
 
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            values: issueTypesResponse.data.projects[0].issuetypes,
-          },
-        }));
+        requestMock.mockImplementationOnce(() =>
+          createAxiosResponse({
+            data: {
+              values: issueTypesResponse.data.projects[0].issuetypes,
+            },
+          })
+        );
 
         await service.getIssueTypes();
 
@@ -795,16 +861,7 @@ describe('Jira service', () => {
       });
 
       test('it should throw an error', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              'list-project-issuetypes':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
-              'list-issuetype-fields':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
-            },
-          },
-        }));
+        mockNewAPI();
 
         requestMock.mockImplementation(() => {
           const error: ResponseError = new Error('An error has occurred');
@@ -816,19 +873,25 @@ describe('Jira service', () => {
           '[Action][Jira]: Unable to get issue types. Error: An error has occurred. Reason: Could not get issue types'
         );
       });
+
+      test('it should throw if the request is not a JSON', async () => {
+        mockNewAPI();
+
+        requestMock.mockImplementation(() =>
+          createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+        );
+
+        await expect(service.getIssueTypes()).rejects.toThrow(
+          '[Action][Jira]: Unable to get issue types. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown: errorResponse was null'
+        );
+      });
     });
   });
 
   describe('getFieldsByIssueType', () => {
     describe('Old API', () => {
       test('it should return the fields', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
-            },
-          },
-        }));
+        mockOldAPI();
 
         requestMock.mockImplementationOnce(() => fieldsResponse);
 
@@ -857,13 +920,7 @@ describe('Jira service', () => {
       });
 
       test('it should call request with correct arguments', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
-            },
-          },
-        }));
+        mockOldAPI();
 
         requestMock.mockImplementationOnce(() => fieldsResponse);
 
@@ -879,13 +936,7 @@ describe('Jira service', () => {
       });
 
       test('it should throw an error', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              navigation: 'https://siem-kibana.atlassian.net/rest/capabilities/navigation',
-            },
-          },
-        }));
+        mockOldAPI();
 
         requestMock.mockImplementation(() => {
           const error: ResponseError = new Error('An error has occurred');
@@ -897,43 +948,48 @@ describe('Jira service', () => {
           '[Action][Jira]: Unable to get fields. Error: An error has occurred. Reason: Could not get fields'
         );
       });
+
+      test('it should throw if the request is not a JSON', async () => {
+        mockOldAPI();
+
+        requestMock.mockImplementation(() =>
+          createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+        );
+
+        await expect(service.getFieldsByIssueType('10006')).rejects.toThrow(
+          '[Action][Jira]: Unable to get fields. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown: errorResponse was null'
+        );
+      });
     });
 
     describe('New API', () => {
       test('it should return the fields', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              'list-project-issuetypes':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
-              'list-issuetype-fields':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
-            },
-          },
-        }));
-
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            values: [
-              { required: true, schema: { type: 'string' }, fieldId: 'summary' },
-              {
-                required: false,
-                schema: { type: 'string' },
-                fieldId: 'priority',
-                allowedValues: [
-                  {
+        mockNewAPI();
+
+        requestMock.mockImplementationOnce(() =>
+          createAxiosResponse({
+            data: {
+              values: [
+                { required: true, schema: { type: 'string' }, fieldId: 'summary' },
+                {
+                  required: false,
+                  schema: { type: 'string' },
+                  fieldId: 'priority',
+                  allowedValues: [
+                    {
+                      name: 'Medium',
+                      id: '3',
+                    },
+                  ],
+                  defaultValue: {
                     name: 'Medium',
                     id: '3',
                   },
-                ],
-                defaultValue: {
-                  name: 'Medium',
-                  id: '3',
                 },
-              },
-            ],
-          },
-        }));
+              ],
+            },
+          })
+        );
 
         const res = await service.getFieldsByIssueType('10006');
 
@@ -954,39 +1010,32 @@ describe('Jira service', () => {
       });
 
       test('it should call request with correct arguments', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              'list-project-issuetypes':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
-              'list-issuetype-fields':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
-            },
-          },
-        }));
-
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            values: [
-              { required: true, schema: { type: 'string' }, fieldId: 'summary' },
-              {
-                required: true,
-                schema: { type: 'string' },
-                fieldId: 'priority',
-                allowedValues: [
-                  {
+        mockNewAPI();
+
+        requestMock.mockImplementationOnce(() =>
+          createAxiosResponse({
+            data: {
+              values: [
+                { required: true, schema: { type: 'string' }, fieldId: 'summary' },
+                {
+                  required: true,
+                  schema: { type: 'string' },
+                  fieldId: 'priority',
+                  allowedValues: [
+                    {
+                      name: 'Medium',
+                      id: '3',
+                    },
+                  ],
+                  defaultValue: {
                     name: 'Medium',
                     id: '3',
                   },
-                ],
-                defaultValue: {
-                  name: 'Medium',
-                  id: '3',
                 },
-              },
-            ],
-          },
-        }));
+              ],
+            },
+          })
+        );
 
         await service.getFieldsByIssueType('10006');
 
@@ -1000,16 +1049,7 @@ describe('Jira service', () => {
       });
 
       test('it should throw an error', async () => {
-        requestMock.mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              'list-project-issuetypes':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
-              'list-issuetype-fields':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
-            },
-          },
-        }));
+        mockNewAPI();
 
         requestMock.mockImplementation(() => {
           const error: ResponseError = new Error('An error has occurred');
@@ -1021,16 +1061,30 @@ describe('Jira service', () => {
           '[Action][Jira]: Unable to get fields. Error: An error has occurred. Reason: Could not get issue types'
         );
       });
+
+      test('it should throw if the request is not a JSON', async () => {
+        mockNewAPI();
+
+        requestMock.mockImplementation(() =>
+          createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+        );
+
+        await expect(service.getFieldsByIssueType('10006')).rejects.toThrow(
+          '[Action][Jira]: Unable to get fields. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown: errorResponse was null'
+        );
+      });
     });
   });
 
   describe('getIssues', () => {
     test('it should return the issues', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          issues: issuesResponse,
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            issues: issuesResponse,
+          },
+        })
+      );
 
       const res = await service.getIssues('Test title');
 
@@ -1044,11 +1098,13 @@ describe('Jira service', () => {
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          issues: issuesResponse,
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            issues: issuesResponse,
+          },
+        })
+      );
 
       await service.getIssues('Test title');
       expect(requestMock).toHaveBeenLastCalledWith({
@@ -1071,13 +1127,25 @@ describe('Jira service', () => {
         '[Action][Jira]: Unable to get issues. Error: An error has occurred. Reason: Could not get issue types'
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.getIssues('Test title')).rejects.toThrow(
+        '[Action][Jira]: Unable to get issues. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown: errorResponse was null'
+      );
+    });
   });
 
   describe('getIssue', () => {
     test('it should return a single issue', async () => {
-      requestMock.mockImplementation(() => ({
-        data: issueResponse,
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: issueResponse,
+        })
+      );
 
       const res = await service.getIssue('RJ-107');
 
@@ -1089,11 +1157,13 @@ describe('Jira service', () => {
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          issues: issuesResponse,
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            issues: issuesResponse,
+          },
+        })
+      );
 
       await service.getIssue('RJ-107');
       expect(requestMock).toHaveBeenLastCalledWith({
@@ -1116,81 +1186,105 @@ describe('Jira service', () => {
         '[Action][Jira]: Unable to get issue with id RJ-107. Error: An error has occurred. Reason: Could not get issue types'
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.getIssue('Test title')).rejects.toThrow(
+        '[Action][Jira]: Unable to get issue with id Test title. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown: errorResponse was null'
+      );
+    });
   });
 
   describe('getFields', () => {
     const callMocks = () => {
       requestMock
-        .mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              'list-project-issuetypes':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
-              'list-issuetype-fields':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
+        .mockImplementationOnce(() =>
+          createAxiosResponse({
+            data: {
+              capabilities: {
+                'list-project-issuetypes':
+                  'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
+                'list-issuetype-fields':
+                  'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
+              },
             },
-          },
-        }))
-        .mockImplementationOnce(() => ({
-          data: {
-            values: issueTypesResponse.data.projects[0].issuetypes,
-          },
-        }))
-        .mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              'list-project-issuetypes':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
-              'list-issuetype-fields':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
+          })
+        )
+        .mockImplementationOnce(() =>
+          createAxiosResponse({
+            data: {
+              values: issueTypesResponse.data.projects[0].issuetypes,
             },
-          },
-        }))
-        .mockImplementationOnce(() => ({
-          data: {
-            capabilities: {
-              'list-project-issuetypes':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
-              'list-issuetype-fields':
-                'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
+          })
+        )
+        .mockImplementationOnce(() =>
+          createAxiosResponse({
+            data: {
+              capabilities: {
+                'list-project-issuetypes':
+                  'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
+                'list-issuetype-fields':
+                  'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
+              },
             },
-          },
-        }))
-        .mockImplementationOnce(() => ({
-          data: {
-            values: [
-              { required: true, schema: { type: 'string' }, fieldId: 'summary' },
-              { required: true, schema: { type: 'string' }, fieldId: 'description' },
-              {
-                required: false,
-                schema: { type: 'string' },
-                fieldId: 'priority',
-                allowedValues: [
-                  {
+          })
+        )
+        .mockImplementationOnce(() =>
+          createAxiosResponse({
+            data: {
+              capabilities: {
+                'list-project-issuetypes':
+                  'https://siem-kibana.atlassian.net/rest/capabilities/list-project-issuetypes',
+                'list-issuetype-fields':
+                  'https://siem-kibana.atlassian.net/rest/capabilities/list-issuetype-fields',
+              },
+            },
+          })
+        )
+        .mockImplementationOnce(() =>
+          createAxiosResponse({
+            data: {
+              values: [
+                { required: true, schema: { type: 'string' }, fieldId: 'summary' },
+                { required: true, schema: { type: 'string' }, fieldId: 'description' },
+                {
+                  required: false,
+                  schema: { type: 'string' },
+                  fieldId: 'priority',
+                  allowedValues: [
+                    {
+                      name: 'Medium',
+                      id: '3',
+                    },
+                  ],
+                  defaultValue: {
                     name: 'Medium',
                     id: '3',
                   },
-                ],
-                defaultValue: {
-                  name: 'Medium',
-                  id: '3',
                 },
-              },
-            ],
-          },
-        }))
-        .mockImplementationOnce(() => ({
-          data: {
-            values: [
-              { required: true, schema: { type: 'string' }, fieldId: 'summary' },
-              { required: true, schema: { type: 'string' }, fieldId: 'description' },
-            ],
-          },
-        }));
+              ],
+            },
+          })
+        )
+        .mockImplementationOnce(() =>
+          createAxiosResponse({
+            data: {
+              values: [
+                { required: true, schema: { type: 'string' }, fieldId: 'summary' },
+                { required: true, schema: { type: 'string' }, fieldId: 'description' },
+              ],
+            },
+          })
+        );
     };
+
     beforeEach(() => {
       jest.resetAllMocks();
     });
+
     test('it should call request with correct arguments', async () => {
       callMocks();
       await service.getFields();
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts
index be0240e705a65..a3262a526e2f4 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/jira/service.ts
@@ -27,7 +27,7 @@ import {
 } from './types';
 
 import * as i18n from './translations';
-import { request, getErrorMessage } from '../lib/axios_utils';
+import { request, getErrorMessage, throwIfResponseIsNotValid } from '../lib/axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 
 const VERSION = '2';
@@ -111,19 +111,15 @@ export const createExternalService = (
       .filter((item) => !isEmpty(item))
       .join(', ');
 
-  const createErrorMessage = (errorResponse: ResponseError | string | null | undefined): string => {
+  const createErrorMessage = (errorResponse: ResponseError | null | undefined): string => {
     if (errorResponse == null) {
-      return '';
-    }
-    if (typeof errorResponse === 'string') {
-      // Jira error.response.data can be string!!
-      return errorResponse;
+      return 'unknown: errorResponse was null';
     }
 
     const { errorMessages, errors } = errorResponse;
 
     if (errors == null) {
-      return '';
+      return 'unknown: errorResponse.errors was null';
     }
 
     if (Array.isArray(errorMessages) && errorMessages.length > 0) {
@@ -185,9 +181,14 @@ export const createExternalService = (
         configurationUtilities,
       });
 
-      const { fields, ...rest } = res.data;
+      throwIfResponseIsNotValid({
+        res,
+        requiredAttributesToBeInTheResponse: ['id', 'key'],
+      });
+
+      const { fields, id: incidentId, key } = res.data;
 
-      return { ...rest, ...fields };
+      return { id: incidentId, key, created: fields.created, updated: fields.updated, ...fields };
     } catch (error) {
       throw new Error(
         getErrorMessage(
@@ -234,6 +235,11 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+        requiredAttributesToBeInTheResponse: ['id'],
+      });
+
       const updatedIncident = await getIncident(res.data.id);
 
       return {
@@ -266,7 +272,7 @@ export const createExternalService = (
     const fields = createFields(projectKey, incidentWithoutNullValues);
 
     try {
-      await request({
+      const res = await request({
         axios: axiosInstance,
         method: 'put',
         url: `${incidentUrl}/${incidentId}`,
@@ -275,6 +281,10 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+      });
+
       const updatedIncident = await getIncident(incidentId as string);
 
       return {
@@ -309,6 +319,11 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+        requiredAttributesToBeInTheResponse: ['id', 'created'],
+      });
+
       return {
         commentId: comment.commentId,
         externalCommentId: res.data.id,
@@ -336,6 +351,11 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+        requiredAttributesToBeInTheResponse: ['capabilities'],
+      });
+
       return { ...res.data };
     } catch (error) {
       throw new Error(
@@ -362,6 +382,10 @@ export const createExternalService = (
           configurationUtilities,
         });
 
+        throwIfResponseIsNotValid({
+          res,
+        });
+
         const issueTypes = res.data.projects[0]?.issuetypes ?? [];
         return normalizeIssueTypes(issueTypes);
       } else {
@@ -373,6 +397,10 @@ export const createExternalService = (
           configurationUtilities,
         });
 
+        throwIfResponseIsNotValid({
+          res,
+        });
+
         const issueTypes = res.data.values;
         return normalizeIssueTypes(issueTypes);
       }
@@ -401,6 +429,10 @@ export const createExternalService = (
           configurationUtilities,
         });
 
+        throwIfResponseIsNotValid({
+          res,
+        });
+
         const fields = res.data.projects[0]?.issuetypes[0]?.fields || {};
         return normalizeFields(fields);
       } else {
@@ -412,6 +444,10 @@ export const createExternalService = (
           configurationUtilities,
         });
 
+        throwIfResponseIsNotValid({
+          res,
+        });
+
         const fields = res.data.values.reduce(
           (acc: { [x: string]: {} }, value: { fieldId: string }) => ({
             ...acc,
@@ -471,6 +507,10 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+      });
+
       return normalizeSearchResults(res.data?.issues ?? []);
     } catch (error) {
       throw new Error(
@@ -495,6 +535,10 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+      });
+
       return normalizeIssue(res.data ?? {});
     } catch (error) {
       throw new Error(
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
index 287f74c6bc703..d0177e0e5a8a2 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
@@ -10,7 +10,14 @@ import { Agent as HttpsAgent } from 'https';
 import HttpProxyAgent from 'http-proxy-agent';
 import { HttpsProxyAgent } from 'https-proxy-agent';
 import { Logger } from '../../../../../../src/core/server';
-import { addTimeZoneToDate, request, patch, getErrorMessage } from './axios_utils';
+import {
+  addTimeZoneToDate,
+  request,
+  patch,
+  getErrorMessage,
+  throwIfResponseIsNotValid,
+  createAxiosResponse,
+} from './axios_utils';
 import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
 import { actionsConfigMock } from '../../actions_config.mock';
 import { getCustomAgents } from './get_custom_agents';
@@ -292,3 +299,82 @@ describe('getErrorMessage', () => {
     expect(msg).toBe('[Action][My connector name]: An error has occurred');
   });
 });
+
+describe('throwIfResponseIsNotValid', () => {
+  const res = createAxiosResponse({
+    headers: { ['content-type']: 'application/json' },
+    data: { incident: { id: '1' } },
+  });
+
+  test('it does NOT throw if the request is valid', () => {
+    expect(() => throwIfResponseIsNotValid({ res })).not.toThrow();
+  });
+
+  test('it does throw if the content-type is not json', () => {
+    expect(() =>
+      throwIfResponseIsNotValid({
+        res: { ...res, headers: { ['content-type']: 'text/html' } },
+      })
+    ).toThrow(
+      'Unsupported content type: text/html in GET https://example.com. Supported content types: application/json'
+    );
+  });
+
+  test('it does throw if the content-type is undefined', () => {
+    expect(() =>
+      throwIfResponseIsNotValid({
+        res: { ...res, headers: {} },
+      })
+    ).toThrow(
+      'Unsupported content type: undefined in GET https://example.com. Supported content types: application/json'
+    );
+  });
+
+  test('it does throw if the data is not an object or array', () => {
+    expect(() =>
+      throwIfResponseIsNotValid({
+        res: { ...res, data: 'string' },
+      })
+    ).toThrow('Response is not a valid JSON');
+  });
+
+  test('it does NOT throw if the data is an array', () => {
+    expect(() =>
+      throwIfResponseIsNotValid({
+        res: { ...res, data: ['test'] },
+      })
+    ).not.toThrow();
+  });
+
+  test.each(['', [], {}])('it does NOT throw if the data is %p', (data) => {
+    expect(() =>
+      throwIfResponseIsNotValid({
+        res: { ...res, data },
+      })
+    ).not.toThrow();
+  });
+
+  test('it does throw if the required attribute is not in the response', () => {
+    expect(() =>
+      throwIfResponseIsNotValid({ res, requiredAttributesToBeInTheResponse: ['not-exist'] })
+    ).toThrow('Response is missing at least one of the expected fields: not-exist');
+  });
+
+  test('it does throw if the required attribute are defined and the data is an array', () => {
+    expect(() =>
+      throwIfResponseIsNotValid({
+        res: { ...res, data: ['test'] },
+        requiredAttributesToBeInTheResponse: ['not-exist'],
+      })
+    ).toThrow('Response is missing at least one of the expected fields: not-exist');
+  });
+
+  test('it does NOT throw if the value of the required attribute is null', () => {
+    expect(() =>
+      throwIfResponseIsNotValid({
+        res: { ...res, data: { id: null } },
+        requiredAttributesToBeInTheResponse: ['id'],
+      })
+    ).not.toThrow();
+  });
+});
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts
index af353e1d1da5a..43c9d276e6574 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { isObjectLike, isEmpty } from 'lodash';
 import { AxiosInstance, Method, AxiosResponse, AxiosBasicCredentials } from 'axios';
 import { Logger } from '../../../../../../src/core/server';
 import { getCustomAgents } from './get_custom_agents';
@@ -76,3 +77,70 @@ export const addTimeZoneToDate = (date: string, timezone = 'GMT'): string => {
 export const getErrorMessage = (connector: string, msg: string) => {
   return `[Action][${connector}]: ${msg}`;
 };
+
+export const throwIfResponseIsNotValid = ({
+  res,
+  requiredAttributesToBeInTheResponse = [],
+}: {
+  res: AxiosResponse;
+  requiredAttributesToBeInTheResponse?: string[];
+}) => {
+  const requiredContentType = 'application/json';
+  const contentType = res.headers['content-type'] ?? 'undefined';
+  const data = res.data;
+
+  /**
+   * Check that the content-type of the response is application/json.
+   * Then includes is added because the header can be application/json;charset=UTF-8.
+   */
+  if (!contentType.includes(requiredContentType)) {
+    throw new Error(
+      `Unsupported content type: ${contentType} in ${res.config.method} ${res.config.url}. Supported content types: ${requiredContentType}`
+    );
+  }
+
+  /**
+   * Check if the response is a JS object (data != null && typeof data === 'object')
+   * in case the content type is application/json but for some reason the response is not.
+   * Empty responses (204 No content) are ignored because the typeof data will be string and
+   * isObjectLike will fail.
+   * Axios converts automatically JSON to JS objects.
+   */
+  if (!isEmpty(data) && !isObjectLike(data)) {
+    throw new Error('Response is not a valid JSON');
+  }
+
+  if (requiredAttributesToBeInTheResponse.length > 0) {
+    const requiredAttributesError = new Error(
+      `Response is missing at least one of the expected fields: ${requiredAttributesToBeInTheResponse.join(
+        ','
+      )}`
+    );
+
+    /**
+     * If the response is an array and requiredAttributesToBeInTheResponse
+     * are not empty then we thrown an error assuming that the consumer
+     * expects an object response and not an array.
+     */
+
+    if (Array.isArray(data)) {
+      throw requiredAttributesError;
+    }
+
+    requiredAttributesToBeInTheResponse.forEach((attr) => {
+      // Check only for undefined as null is a valid value
+      if (data[attr] === undefined) {
+        throw requiredAttributesError;
+      }
+    });
+  }
+};
+
+export const createAxiosResponse = (res: Partial<AxiosResponse>): AxiosResponse => ({
+  data: {},
+  status: 200,
+  statusText: 'OK',
+  headers: { ['content-type']: 'application/json' },
+  config: { method: 'GET', url: 'https://example.com' },
+  ...res,
+});
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts
index ba55543386225..094b8150850df 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.test.ts
@@ -8,7 +8,7 @@
 import axios from 'axios';
 
 import { createExternalService, getValueTextContent, formatUpdateRequest } from './service';
-import * as utils from '../lib/axios_utils';
+import { request, createAxiosResponse } from '../lib/axios_utils';
 import { ExternalService } from './types';
 import { Logger } from '../../../../../../src/core/server';
 import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
@@ -27,7 +27,7 @@ jest.mock('../lib/axios_utils', () => {
 });
 
 axios.create = jest.fn(() => axios);
-const requestMock = utils.request as jest.Mock;
+const requestMock = request as jest.Mock;
 const now = Date.now;
 const TIMESTAMP = 1589391874472;
 const configurationUtilities = actionsConfigMock.create();
@@ -38,44 +38,50 @@ const configurationUtilities = actionsConfigMock.create();
 // b) Update the incident
 // c) Get the updated incident
 const mockIncidentUpdate = (withUpdateError = false) => {
-  requestMock.mockImplementationOnce(() => ({
-    data: {
-      id: '1',
-      name: 'title',
-      description: {
-        format: 'html',
-        content: 'description',
+  requestMock.mockImplementationOnce(() =>
+    createAxiosResponse({
+      data: {
+        id: '1',
+        name: 'title',
+        description: {
+          format: 'html',
+          content: 'description',
+        },
+        incident_type_ids: [1001, 16, 12],
+        severity_code: 6,
       },
-      incident_type_ids: [1001, 16, 12],
-      severity_code: 6,
-    },
-  }));
+    })
+  );
 
   if (withUpdateError) {
     requestMock.mockImplementationOnce(() => {
       throw new Error('An error has occurred');
     });
   } else {
-    requestMock.mockImplementationOnce(() => ({
+    requestMock.mockImplementationOnce(() =>
+      createAxiosResponse({
+        data: {
+          success: true,
+          id: '1',
+          inc_last_modified_date: 1589391874472,
+        },
+      })
+    );
+  }
+
+  requestMock.mockImplementationOnce(() =>
+    createAxiosResponse({
       data: {
-        success: true,
         id: '1',
+        name: 'title_updated',
+        description: {
+          format: 'html',
+          content: 'desc_updated',
+        },
         inc_last_modified_date: 1589391874472,
       },
-    }));
-  }
-
-  requestMock.mockImplementationOnce(() => ({
-    data: {
-      id: '1',
-      name: 'title_updated',
-      description: {
-        format: 'html',
-        content: 'desc_updated',
-      },
-      inc_last_modified_date: 1589391874472,
-    },
-  }));
+    })
+  );
 };
 
 describe('IBM Resilient service', () => {
@@ -207,24 +213,28 @@ describe('IBM Resilient service', () => {
 
   describe('getIncident', () => {
     test('it returns the incident correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          id: '1',
-          name: '1',
-          description: {
-            format: 'html',
-            content: 'description',
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            id: '1',
+            name: '1',
+            description: {
+              format: 'html',
+              content: 'description',
+            },
           },
-        },
-      }));
+        })
+      );
       const res = await service.getIncident('1');
       expect(res).toEqual({ id: '1', name: '1', description: 'description' });
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data: { id: '1' },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: { id: '1' },
+        })
+      );
 
       await service.getIncident('1');
       expect(requestMock).toHaveBeenCalledWith({
@@ -246,28 +256,42 @@ describe('IBM Resilient service', () => {
         'Unable to get incident with id 1. Error: An error has occurred'
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.getIncident('1')).rejects.toThrow(
+        '[Action][IBM Resilient]: Unable to get incident with id 1. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json.'
+      );
+    });
   });
 
   describe('createIncident', () => {
+    const incident = {
+      incident: {
+        name: 'title',
+        description: 'desc',
+        incidentTypes: [1001],
+        severityCode: 6,
+      },
+    };
+
     test('it creates the incident correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          id: '1',
-          name: 'title',
-          description: 'description',
-          discovered_date: 1589391874472,
-          create_date: 1589391874472,
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            id: '1',
+            name: 'title',
+            description: 'description',
+            discovered_date: 1589391874472,
+            create_date: 1589391874472,
+          },
+        })
+      );
 
-      const res = await service.createIncident({
-        incident: {
-          name: 'title',
-          description: 'desc',
-          incidentTypes: [1001],
-          severityCode: 6,
-        },
-      });
+      const res = await service.createIncident(incident);
 
       expect(res).toEqual({
         title: '1',
@@ -278,24 +302,19 @@ describe('IBM Resilient service', () => {
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          id: '1',
-          name: 'title',
-          description: 'description',
-          discovered_date: 1589391874472,
-          create_date: 1589391874472,
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            id: '1',
+            name: 'title',
+            description: 'description',
+            discovered_date: 1589391874472,
+            create_date: 1589391874472,
+          },
+        })
+      );
 
-      await service.createIncident({
-        incident: {
-          name: 'title',
-          description: 'desc',
-          incidentTypes: [1001],
-          severityCode: 6,
-        },
-      });
+      await service.createIncident(incident);
 
       expect(requestMock).toHaveBeenCalledWith({
         axios,
@@ -334,20 +353,39 @@ describe('IBM Resilient service', () => {
         '[Action][IBM Resilient]: Unable to create incident. Error: An error has occurred'
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.createIncident(incident)).rejects.toThrow(
+        '[Action][IBM Resilient]: Unable to create incident. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json.'
+      );
+    });
+
+    test('it should throw if the required attributes are not there', async () => {
+      requestMock.mockImplementation(() => createAxiosResponse({ data: { notRequired: 'test' } }));
+
+      await expect(service.createIncident(incident)).rejects.toThrow(
+        '[Action][IBM Resilient]: Unable to create incident. Error: Response is missing at least one of the expected fields: id,create_date.'
+      );
+    });
   });
 
   describe('updateIncident', () => {
+    const req = {
+      incidentId: '1',
+      incident: {
+        name: 'title',
+        description: 'desc',
+        incidentTypes: [1001],
+        severityCode: 6,
+      },
+    };
     test('it updates the incident correctly', async () => {
       mockIncidentUpdate();
-      const res = await service.updateIncident({
-        incidentId: '1',
-        incident: {
-          name: 'title',
-          description: 'desc',
-          incidentTypes: [1001],
-          severityCode: 6,
-        },
-      });
+      const res = await service.updateIncident(req);
 
       expect(res).toEqual({
         title: '1',
@@ -430,38 +468,59 @@ describe('IBM Resilient service', () => {
     test('it should throw an error', async () => {
       mockIncidentUpdate(true);
 
-      await expect(
-        service.updateIncident({
-          incidentId: '1',
-          incident: {
+      await expect(service.updateIncident(req)).rejects.toThrow(
+        '[Action][IBM Resilient]: Unable to update incident with id 1. Error: An error has occurred'
+      );
+    });
+
+    test('it should throw if the request is not a JSON', async () => {
+      // get incident request
+      requestMock.mockImplementationOnce(() =>
+        createAxiosResponse({
+          data: {
+            id: '1',
             name: 'title',
-            description: 'desc',
-            incidentTypes: [1001],
-            severityCode: 5,
+            description: {
+              format: 'html',
+              content: 'description',
+            },
+            incident_type_ids: [1001, 16, 12],
+            severity_code: 6,
           },
         })
-      ).rejects.toThrow(
-        '[Action][IBM Resilient]: Unable to update incident with id 1. Error: An error has occurred'
+      );
+
+      // update incident request
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.updateIncident(req)).rejects.toThrow(
+        '[Action][IBM Resilient]: Unable to update incident with id 1. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json'
       );
     });
   });
 
   describe('createComment', () => {
+    const req = {
+      incidentId: '1',
+      comment: {
+        comment: 'comment',
+        commentId: 'comment-1',
+      },
+    };
+
     test('it creates the comment correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          id: '1',
-          create_date: 1589391874472,
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            id: '1',
+            create_date: 1589391874472,
+          },
+        })
+      );
 
-      const res = await service.createComment({
-        incidentId: '1',
-        comment: {
-          comment: 'comment',
-          commentId: 'comment-1',
-        },
-      });
+      const res = await service.createComment(req);
 
       expect(res).toEqual({
         commentId: 'comment-1',
@@ -471,20 +530,16 @@ describe('IBM Resilient service', () => {
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          id: '1',
-          create_date: 1589391874472,
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            id: '1',
+            create_date: 1589391874472,
+          },
+        })
+      );
 
-      await service.createComment({
-        incidentId: '1',
-        comment: {
-          comment: 'comment',
-          commentId: 'comment-1',
-        },
-      });
+      await service.createComment(req);
 
       expect(requestMock).toHaveBeenCalledWith({
         axios,
@@ -506,27 +561,31 @@ describe('IBM Resilient service', () => {
         throw new Error('An error has occurred');
       });
 
-      await expect(
-        service.createComment({
-          incidentId: '1',
-          comment: {
-            comment: 'comment',
-            commentId: 'comment-1',
-          },
-        })
-      ).rejects.toThrow(
+      await expect(service.createComment(req)).rejects.toThrow(
         '[Action][IBM Resilient]: Unable to create comment at incident with id 1. Error: An error has occurred'
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.createComment(req)).rejects.toThrow(
+        '[Action][IBM Resilient]: Unable to create comment at incident with id 1. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json.'
+      );
+    });
   });
 
   describe('getIncidentTypes', () => {
     test('it creates the incident correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          values: incidentTypes,
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            values: incidentTypes,
+          },
+        })
+      );
 
       const res = await service.getIncidentTypes();
 
@@ -545,15 +604,27 @@ describe('IBM Resilient service', () => {
         '[Action][IBM Resilient]: Unable to get incident types. Error: An error has occurred.'
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.getIncidentTypes()).rejects.toThrow(
+        '[Action][IBM Resilient]: Unable to get incident types. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json.'
+      );
+    });
   });
 
   describe('getSeverity', () => {
     test('it creates the incident correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data: {
-          values: severity,
-        },
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: {
+            values: severity,
+          },
+        })
+      );
 
       const res = await service.getSeverity();
 
@@ -578,17 +649,29 @@ describe('IBM Resilient service', () => {
         throw new Error('An error has occurred');
       });
 
-      await expect(service.getIncidentTypes()).rejects.toThrow(
-        '[Action][IBM Resilient]: Unable to get incident types. Error: An error has occurred.'
+      await expect(service.getSeverity()).rejects.toThrow(
+        '[Action][IBM Resilient]: Unable to get severity. Error: An error has occurred.'
+      );
+    });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.getSeverity()).rejects.toThrow(
+        '[Action][IBM Resilient]: Unable to get severity. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json.'
       );
     });
   });
 
   describe('getFields', () => {
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data: resilientFields,
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: resilientFields,
+        })
+      );
       await service.getFields();
 
       expect(requestMock).toHaveBeenCalledWith({
@@ -598,10 +681,13 @@ describe('IBM Resilient service', () => {
         url: 'https://resilient.elastic.co/rest/orgs/201/types/incident/fields',
       });
     });
+
     test('it returns common fields correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data: resilientFields,
-      }));
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({
+          data: resilientFields,
+        })
+      );
       const res = await service.getFields();
       expect(res).toEqual(resilientFields);
     });
@@ -614,5 +700,15 @@ describe('IBM Resilient service', () => {
         'Unable to get fields. Error: An error has occurred'
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data: { id: '1' }, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.getFields()).rejects.toThrow(
+        '[Action][IBM Resilient]: Unable to get fields. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json.'
+      );
+    });
   });
 });
diff --git a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts
index 2f385315e4392..a469c631fac37 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/resilient/service.ts
@@ -24,7 +24,7 @@ import {
 } from './types';
 
 import * as i18n from './translations';
-import { getErrorMessage, request } from '../lib/axios_utils';
+import { getErrorMessage, request, throwIfResponseIsNotValid } from '../lib/axios_utils';
 import { ActionsConfigurationUtilities } from '../../actions_config';
 
 const VIEW_INCIDENT_URL = `#incidents`;
@@ -134,6 +134,10 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+      });
+
       return { ...res.data, description: res.data.description?.content ?? '' };
     } catch (error) {
       throw new Error(
@@ -182,6 +186,11 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+        requiredAttributesToBeInTheResponse: ['id', 'create_date'],
+      });
+
       return {
         title: `${res.data.id}`,
         id: `${res.data.id}`,
@@ -212,6 +221,10 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+      });
+
       if (!res.data.success) {
         throw new Error(res.data.message);
       }
@@ -245,6 +258,10 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+      });
+
       return {
         commentId: comment.commentId,
         externalCommentId: res.data.id,
@@ -270,6 +287,10 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+      });
+
       const incidentTypes = res.data?.values ?? [];
       return incidentTypes.map((type: { value: string; label: string }) => ({
         id: type.value,
@@ -292,6 +313,10 @@ export const createExternalService = (
         configurationUtilities,
       });
 
+      throwIfResponseIsNotValid({
+        res,
+      });
+
       const incidentTypes = res.data?.values ?? [];
       return incidentTypes.map((type: { value: string; label: string }) => ({
         id: type.value,
@@ -312,6 +337,11 @@ export const createExternalService = (
         logger,
         configurationUtilities,
       });
+
+      throwIfResponseIsNotValid({
+        res,
+      });
+
       return res.data ?? [];
     } catch (error) {
       throw new Error(getErrorMessage(i18n.NAME, `Unable to get fields. Error: ${error.message}.`));
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts
index 358af7cd2e9ef..e5a161611fcb1 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.test.ts
@@ -132,7 +132,7 @@ describe('api_sir', () => {
   });
 
   describe('prepareParams', () => {
-    test('it prepares the params correctly when the connector is legacy', async () => {
+    test('it prepares the params correctly when the connector uses the old API', async () => {
       expect(prepareParams(true, sirParams)).toEqual({
         ...sirParams,
         incident: {
@@ -145,7 +145,7 @@ describe('api_sir', () => {
       });
     });
 
-    test('it prepares the params correctly when the connector is not legacy', async () => {
+    test('it prepares the params correctly when the connector does not uses the old API', async () => {
       expect(prepareParams(false, sirParams)).toEqual({
         ...sirParams,
         incident: {
@@ -158,7 +158,7 @@ describe('api_sir', () => {
       });
     });
 
-    test('it prepares the params correctly when the connector is legacy and the observables are undefined', async () => {
+    test('it prepares the params correctly when the connector uses the old API and the observables are undefined', async () => {
       const {
         dest_ip: destIp,
         source_ip: sourceIp,
@@ -192,7 +192,7 @@ describe('api_sir', () => {
       const res = await apiSIR.pushToService({
         externalService,
         params,
-        config: { isLegacy: false },
+        config: { usesTableApi: false },
         secrets: {},
         logger: mockedLogger,
         commentFieldKey: 'work_notes',
@@ -221,7 +221,7 @@ describe('api_sir', () => {
       await apiSIR.pushToService({
         externalService,
         params,
-        config: { isLegacy: false },
+        config: { usesTableApi: false },
         secrets: {},
         logger: mockedLogger,
         commentFieldKey: 'work_notes',
@@ -244,12 +244,12 @@ describe('api_sir', () => {
       );
     });
 
-    test('it does not call bulkAddObservableToIncident if it a legacy connector', async () => {
+    test('it does not call bulkAddObservableToIncident if the connector uses the old API', async () => {
       const params = { ...sirParams, incident: { ...sirParams.incident, externalId: null } };
       await apiSIR.pushToService({
         externalService,
         params,
-        config: { isLegacy: true },
+        config: { usesTableApi: true },
         secrets: {},
         logger: mockedLogger,
         commentFieldKey: 'work_notes',
@@ -274,7 +274,7 @@ describe('api_sir', () => {
       await apiSIR.pushToService({
         externalService,
         params,
-        config: { isLegacy: false },
+        config: { usesTableApi: false },
         secrets: {},
         logger: mockedLogger,
         commentFieldKey: 'work_notes',
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.ts
index 326bb79a0e708..4e74d79c6f4a0 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/api_sir.ts
@@ -59,13 +59,13 @@ const observablesToString = (obs: string | string[] | null | undefined): string
 };
 
 export const prepareParams = (
-  isLegacy: boolean,
+  usesTableApi: boolean,
   params: PushToServiceApiParamsSIR
 ): PushToServiceApiParamsSIR => {
-  if (isLegacy) {
+  if (usesTableApi) {
     /**
      * The schema has change to accept an array of observables
-     * or a string. In the case of a legacy connector we need to
+     * or a string. In the case of connector that uses the old API we need to
      * convert the observables to a string
      */
     return {
@@ -81,8 +81,8 @@ export const prepareParams = (
   }
 
   /**
-   * For non legacy connectors the observables
-   * will be added in a different call.
+   * For connectors that do not use the old API
+   * the observables will be added in a different call.
    * They need to be set to null when sending the fields
    * to ServiceNow
    */
@@ -108,7 +108,7 @@ const pushToServiceHandler = async ({
 }: PushToServiceApiHandlerArgs): Promise<PushToServiceResponse> => {
   const res = await api.pushToService({
     externalService,
-    params: prepareParams(!!config.isLegacy, params as PushToServiceApiParamsSIR),
+    params: prepareParams(!!config.usesTableApi, params as PushToServiceApiParamsSIR),
     config,
     secrets,
     commentFieldKey,
@@ -130,7 +130,7 @@ const pushToServiceHandler = async ({
    * through the pushToService call.
    */
 
-  if (!config.isLegacy) {
+  if (!config.usesTableApi) {
     const sirExternalService = externalService as ExternalServiceSIR;
 
     const obsWithType: Array<[string[], ObservableTypes]> = [
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/schema.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/schema.ts
index af8d1b9f38b17..e41eea24834c7 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/schema.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/schema.ts
@@ -14,7 +14,7 @@ export const ExternalIncidentServiceConfigurationBase = {
 
 export const ExternalIncidentServiceConfiguration = {
   ...ExternalIncidentServiceConfigurationBase,
-  isLegacy: schema.boolean({ defaultValue: true }),
+  usesTableApi: schema.boolean({ defaultValue: true }),
 };
 
 export const ExternalIncidentServiceConfigurationBaseSchema = schema.object(
@@ -49,7 +49,7 @@ const CommonAttributes = {
   externalId: schema.nullable(schema.string()),
   category: schema.nullable(schema.string()),
   subcategory: schema.nullable(schema.string()),
-  correlation_id: schema.nullable(schema.string()),
+  correlation_id: schema.nullable(schema.string({ defaultValue: DEFAULT_ALERTS_GROUPING_KEY })),
   correlation_display: schema.nullable(schema.string()),
 };
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
index cb030c7bb6933..c90a7222ba10b 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
@@ -35,7 +35,8 @@ export const createExternalService: ServiceFactory = (
   configurationUtilities: ActionsConfigurationUtilities,
   { table, importSetTable, useImportAPI, appScope }: SNProductsConfigValue
 ): ExternalService => {
-  const { apiUrl: url, isLegacy } = config as ServiceNowPublicConfigurationType;
+  const { apiUrl: url, usesTableApi: usesTableApiConfigValue } =
+    config as ServiceNowPublicConfigurationType;
   const { username, password } = secrets as ServiceNowSecretConfigurationType;
 
   if (!url || !username || !password) {
@@ -57,11 +58,11 @@ export const createExternalService: ServiceFactory = (
     auth: { username, password },
   });
 
-  const useOldApi = !useImportAPI || isLegacy;
+  const useTableApi = !useImportAPI || usesTableApiConfigValue;
 
-  const getCreateIncidentUrl = () => (useOldApi ? tableApiIncidentUrl : importSetTableUrl);
+  const getCreateIncidentUrl = () => (useTableApi ? tableApiIncidentUrl : importSetTableUrl);
   const getUpdateIncidentUrl = (incidentId: string) =>
-    useOldApi ? `${tableApiIncidentUrl}/${incidentId}` : importSetTableUrl;
+    useTableApi ? `${tableApiIncidentUrl}/${incidentId}` : importSetTableUrl;
 
   const getIncidentViewURL = (id: string) => {
     // Based on: https://docs.servicenow.com/bundle/orlando-platform-user-interface/page/use/navigation/reference/r_NavigatingByURLExamples.html
@@ -105,7 +106,7 @@ export const createExternalService: ServiceFactory = (
 
   /**
    * Gets the Elastic SN Application information including the current version.
-   * It should not be used on legacy connectors.
+   * It should not be used on connectors that use the old API.
    */
   const getApplicationInformation = async (): Promise<GetApplicationInfoResponse> => {
     try {
@@ -129,7 +130,7 @@ export const createExternalService: ServiceFactory = (
     logger.debug(`Create incident: Application scope: ${scope}: Application version${version}`);
 
   const checkIfApplicationIsInstalled = async () => {
-    if (!useOldApi) {
+    if (!useTableApi) {
       const { version, scope } = await getApplicationInformation();
       logApplicationInfo(scope, version);
     }
@@ -180,17 +181,17 @@ export const createExternalService: ServiceFactory = (
         url: getCreateIncidentUrl(),
         logger,
         method: 'post',
-        data: prepareIncident(useOldApi, incident),
+        data: prepareIncident(useTableApi, incident),
         configurationUtilities,
       });
 
       checkInstance(res);
 
-      if (!useOldApi) {
+      if (!useTableApi) {
         throwIfImportSetApiResponseIsAnError(res.data);
       }
 
-      const incidentId = useOldApi ? res.data.result.sys_id : res.data.result[0].sys_id;
+      const incidentId = useTableApi ? res.data.result.sys_id : res.data.result[0].sys_id;
       const insertedIncident = await getIncident(incidentId);
 
       return {
@@ -212,23 +213,23 @@ export const createExternalService: ServiceFactory = (
         axios: axiosInstance,
         url: getUpdateIncidentUrl(incidentId),
         // Import Set API supports only POST.
-        method: useOldApi ? 'patch' : 'post',
+        method: useTableApi ? 'patch' : 'post',
         logger,
         data: {
-          ...prepareIncident(useOldApi, incident),
+          ...prepareIncident(useTableApi, incident),
           // elastic_incident_id is used to update the incident when using the Import Set API.
-          ...(useOldApi ? {} : { elastic_incident_id: incidentId }),
+          ...(useTableApi ? {} : { elastic_incident_id: incidentId }),
         },
         configurationUtilities,
       });
 
       checkInstance(res);
 
-      if (!useOldApi) {
+      if (!useTableApi) {
         throwIfImportSetApiResponseIsAnError(res.data);
       }
 
-      const id = useOldApi ? res.data.result.sys_id : res.data.result[0].sys_id;
+      const id = useTableApi ? res.data.result.sys_id : res.data.result[0].sys_id;
       const updatedIncident = await getIncident(id);
 
       return {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
index 7b3f310a99e0e..21bc4894c5717 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.test.ts
@@ -10,7 +10,7 @@ import axios from 'axios';
 import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
 import { Logger } from '../../../../../../src/core/server';
 import { actionsConfigMock } from '../../actions_config.mock';
-import * as utils from '../lib/axios_utils';
+import { request, createAxiosResponse } from '../lib/axios_utils';
 import { createExternalService } from './service';
 import { mappings } from './mocks';
 import { ExternalService } from './types';
@@ -27,7 +27,7 @@ jest.mock('../lib/axios_utils', () => {
 });
 
 axios.create = jest.fn(() => axios);
-const requestMock = utils.request as jest.Mock;
+const requestMock = request as jest.Mock;
 const configurationUtilities = actionsConfigMock.create();
 
 describe('Swimlane Service', () => {
@@ -152,9 +152,7 @@ describe('Swimlane Service', () => {
     };
 
     test('it creates a record correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data,
-      }));
+      requestMock.mockImplementation(() => createAxiosResponse({ data }));
 
       const res = await service.createRecord({
         incident,
@@ -169,9 +167,7 @@ describe('Swimlane Service', () => {
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data,
-      }));
+      requestMock.mockImplementation(() => createAxiosResponse({ data }));
 
       await service.createRecord({
         incident,
@@ -207,6 +203,24 @@ describe('Swimlane Service', () => {
         `[Action][Swimlane]: Unable to create record in application with id ${config.appId}. Status: 500. Error: An error has occurred. Reason: unknown`
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.createRecord({ incident })).rejects.toThrow(
+        `[Action][Swimlane]: Unable to create record in application with id ${config.appId}. Status: 500. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown`
+      );
+    });
+
+    test('it should throw if the required attributes are not there', async () => {
+      requestMock.mockImplementation(() => createAxiosResponse({ data: { notRequired: 'test' } }));
+
+      await expect(service.createRecord({ incident })).rejects.toThrow(
+        `[Action][Swimlane]: Unable to create record in application with id ${config.appId}. Status: 500. Error: Response is missing at least one of the expected fields: id,name,createdDate. Reason: unknown`
+      );
+    });
   });
 
   describe('updateRecord', () => {
@@ -218,9 +232,7 @@ describe('Swimlane Service', () => {
     const incidentId = '123';
 
     test('it updates a record correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data,
-      }));
+      requestMock.mockImplementation(() => createAxiosResponse({ data }));
 
       const res = await service.updateRecord({
         incident,
@@ -236,9 +248,7 @@ describe('Swimlane Service', () => {
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data,
-      }));
+      requestMock.mockImplementation(() => createAxiosResponse({ data }));
 
       await service.updateRecord({
         incident,
@@ -276,6 +286,24 @@ describe('Swimlane Service', () => {
         `[Action][Swimlane]: Unable to update record in application with id ${config.appId}. Status: 500. Error: An error has occurred. Reason: unknown`
       );
     });
+
+    test('it should throw if the request is not a JSON', async () => {
+      requestMock.mockImplementation(() =>
+        createAxiosResponse({ data, headers: { ['content-type']: 'text/html' } })
+      );
+
+      await expect(service.updateRecord({ incident, incidentId })).rejects.toThrow(
+        `[Action][Swimlane]: Unable to update record in application with id ${config.appId}. Status: 500. Error: Unsupported content type: text/html in GET https://example.com. Supported content types: application/json. Reason: unknown`
+      );
+    });
+
+    test('it should throw if the required attributes are not there', async () => {
+      requestMock.mockImplementation(() => createAxiosResponse({ data: { notRequired: 'test' } }));
+
+      await expect(service.updateRecord({ incident, incidentId })).rejects.toThrow(
+        `[Action][Swimlane]: Unable to update record in application with id ${config.appId}. Status: 500. Error: Response is missing at least one of the expected fields: id,name,modifiedDate. Reason: unknown`
+      );
+    });
   });
 
   describe('createComment', () => {
@@ -289,9 +317,7 @@ describe('Swimlane Service', () => {
     const createdDate = '2021-06-01T17:29:51.092Z';
 
     test('it updates a record correctly', async () => {
-      requestMock.mockImplementation(() => ({
-        data,
-      }));
+      requestMock.mockImplementation(() => createAxiosResponse({ data }));
 
       const res = await service.createComment({
         comment,
@@ -306,9 +332,7 @@ describe('Swimlane Service', () => {
     });
 
     test('it should call request with correct arguments', async () => {
-      requestMock.mockImplementation(() => ({
-        data,
-      }));
+      requestMock.mockImplementation(() => createAxiosResponse({ data }));
 
       await service.createComment({
         comment,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.ts b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.ts
index f68d22121dbcc..d917d7f5677bb 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/swimlane/service.ts
@@ -9,7 +9,7 @@ import { Logger } from '@kbn/logging';
 import axios from 'axios';
 
 import { ActionsConfigurationUtilities } from '../../actions_config';
-import { getErrorMessage, request } from '../lib/axios_utils';
+import { getErrorMessage, request, throwIfResponseIsNotValid } from '../lib/axios_utils';
 import { getBodyForEventAction } from './helpers';
 import {
   CreateCommentParams,
@@ -89,6 +89,12 @@ export const createExternalService = (
         method: 'post',
         url: getPostRecordUrl(appId),
       });
+
+      throwIfResponseIsNotValid({
+        res,
+        requiredAttributesToBeInTheResponse: ['id', 'name', 'createdDate'],
+      });
+
       return {
         id: res.data.id,
         title: res.data.name,
@@ -124,6 +130,11 @@ export const createExternalService = (
         url: getPostRecordIdUrl(appId, params.incidentId),
       });
 
+      throwIfResponseIsNotValid({
+        res,
+        requiredAttributesToBeInTheResponse: ['id', 'name', 'modifiedDate'],
+      });
+
       return {
         id: res.data.id,
         title: res.data.name,
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 9f8e62c77e3a7..6c61d9849c72c 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
@@ -166,7 +166,7 @@ describe('successful migrations', () => {
       expect(migratedAction).toEqual(action);
     });
 
-    test('set isLegacy config property for .servicenow', () => {
+    test('set usesTableApi config property for .servicenow', () => {
       const migration716 = getActionsMigrations(encryptedSavedObjectsSetup)['7.16.0'];
       const action = getMockDataForServiceNow();
       const migratedAction = migration716(action, context);
@@ -177,13 +177,13 @@ describe('successful migrations', () => {
           ...action.attributes,
           config: {
             apiUrl: 'https://example.com',
-            isLegacy: true,
+            usesTableApi: true,
           },
         },
       });
     });
 
-    test('set isLegacy config property for .servicenow-sir', () => {
+    test('set usesTableApi config property for .servicenow-sir', () => {
       const migration716 = getActionsMigrations(encryptedSavedObjectsSetup)['7.16.0'];
       const action = getMockDataForServiceNow({ actionTypeId: '.servicenow-sir' });
       const migratedAction = migration716(action, context);
@@ -194,13 +194,13 @@ describe('successful migrations', () => {
           ...action.attributes,
           config: {
             apiUrl: 'https://example.com',
-            isLegacy: true,
+            usesTableApi: true,
           },
         },
       });
     });
 
-    test('it does not set isLegacy config for other connectors', () => {
+    test('it does not set usesTableApi config for other connectors', () => {
       const migration716 = getActionsMigrations(encryptedSavedObjectsSetup)['7.16.0'];
       const action = getMockData();
       const migratedAction = migration716(action, context);
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 688839eb89858..2e5b1b5d916fe 100644
--- a/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts
+++ b/x-pack/plugins/actions/server/saved_objects/actions_migrations.ts
@@ -68,7 +68,7 @@ export function getActionsMigrations(
       doc.attributes.actionTypeId === '.servicenow' ||
       doc.attributes.actionTypeId === '.servicenow-sir' ||
       doc.attributes.actionTypeId === '.email',
-    pipeMigrations(markOldServiceNowITSMConnectorAsLegacy, setServiceConfigIfNotSet)
+    pipeMigrations(addUsesTableApiToServiceNowConnectors, setServiceConfigIfNotSet)
   );
 
   const migrationActions800 = createEsoMigration(
@@ -197,7 +197,7 @@ const addIsMissingSecretsField = (
   };
 };
 
-const markOldServiceNowITSMConnectorAsLegacy = (
+const addUsesTableApiToServiceNowConnectors = (
   doc: SavedObjectUnsanitizedDoc<RawAction>
 ): SavedObjectUnsanitizedDoc<RawAction> => {
   if (
@@ -213,7 +213,7 @@ const markOldServiceNowITSMConnectorAsLegacy = (
       ...doc.attributes,
       config: {
         ...doc.attributes.config,
-        isLegacy: true,
+        usesTableApi: true,
       },
     },
   };
diff --git a/x-pack/plugins/apm/dev_docs/linting.md b/x-pack/plugins/apm/dev_docs/linting.md
index edf3e813a88e9..3dbd7b5b27484 100644
--- a/x-pack/plugins/apm/dev_docs/linting.md
+++ b/x-pack/plugins/apm/dev_docs/linting.md
@@ -19,3 +19,12 @@ yarn prettier  "./x-pack/plugins/apm/**/*.{tsx,ts,js}" --write
 ```
 node scripts/eslint.js x-pack/plugins/apm
 ```
+
+## Install pre-commit hook (optional)
+In case you want to run a couple of checks like linting or check the file casing of the files to commit, we provide a way to install a pre-commit hook. To configure it you just need to run the following:
+
+`node scripts/register_git_hook`
+
+After the script completes the pre-commit hook will be created within the file .git/hooks/pre-commit. If you choose to not install it, don’t worry, we still run a quick CI check to provide feedback earliest as we can about the same checks.
+
+More information about linting can be found in the [Kibana Guide](https://www.elastic.co/guide/en/kibana/current/kibana-linting.html).
\ No newline at end of file
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress_start.ts b/x-pack/plugins/apm/ftr_e2e/cypress_start.ts
index caf87d2627459..0cfc58653801a 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress_start.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress_start.ts
@@ -16,15 +16,10 @@ import { esArchiverLoad, esArchiverUnload } from './cypress/tasks/es_archiver';
 
 export function cypressRunTests(spec?: string) {
   return async ({ getService }: FtrProviderContext) => {
-    try {
-      const result = await cypressStart(getService, cypress.run, spec);
+    const result = await cypressStart(getService, cypress.run, spec);
 
-      if (result && (result.status === 'failed' || result.totalFailed > 0)) {
-        process.exit(1);
-      }
-    } catch (error) {
-      console.error('errors: ', error);
-      process.exit(1);
+    if (result && (result.status === 'failed' || result.totalFailed > 0)) {
+      throw new Error(`APM Cypress tests failed`);
     }
   };
 }
diff --git a/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx b/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx
index fb1a99db0bf5b..2015bf2228b6c 100644
--- a/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/chart_preview/index.tsx
@@ -23,17 +23,21 @@ import { EuiSpacer } from '@elastic/eui';
 import React from 'react';
 import { Coordinate } from '../../../../typings/timeseries';
 import { useTheme } from '../../../hooks/use_theme';
+import { IUiSettingsClient } from '../../../../../../../src/core/public';
+import { getTimeZone } from '../../shared/charts/helper/timezone';
 
 interface ChartPreviewProps {
   yTickFormat?: TickFormatter;
   data?: Coordinate[];
   threshold: number;
+  uiSettings?: IUiSettingsClient;
 }
 
 export function ChartPreview({
   data = [],
   yTickFormat,
   threshold,
+  uiSettings,
 }: ChartPreviewProps) {
   const theme = useTheme();
   const thresholdOpacity = 0.3;
@@ -67,6 +71,8 @@ export function ChartPreview({
     },
   ];
 
+  const timeZone = getTimeZone(uiSettings);
+
   return (
     <>
       <EuiSpacer size="m" />
@@ -99,6 +105,7 @@ export function ChartPreview({
           domain={{ max: yMax, min: NaN }}
         />
         <BarSeries
+          timeZone={timeZone}
           color={theme.eui.euiColorVis1}
           data={data}
           id="chart_preview_bar_series"
diff --git a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
index eac128a7e88c4..1c72d5f104854 100644
--- a/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/error_count_alert_trigger/index.tsx
@@ -120,6 +120,7 @@ export function ErrorCountAlertTrigger(props: Props) {
       data={data?.errorCountChartPreview}
       threshold={params.threshold}
       yTickFormat={asInteger}
+      uiSettings={services.uiSettings}
     />
   );
 
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
index 8957dfc823e44..fa75fcca579e5 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_duration_alert_trigger/index.tsx
@@ -139,6 +139,7 @@ export function TransactionDurationAlertTrigger(props: Props) {
       data={latencyChartPreview}
       threshold={thresholdMs}
       yTickFormat={yTickFormat}
+      uiSettings={services.uiSettings}
     />
   );
 
diff --git a/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx b/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx
index ddddc4bbecbad..a818218cbf3ad 100644
--- a/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/transaction_error_rate_alert_trigger/index.tsx
@@ -131,6 +131,7 @@ export function TransactionErrorRateAlertTrigger(props: Props) {
       data={data?.errorRateChartPreview}
       yTickFormat={(d: number | null) => asPercent(d, 1)}
       threshold={thresholdAsPercent}
+      uiSettings={services.uiSettings}
     />
   );
 
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx
index 4efc00ef71b91..101923a7678fb 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.stories.tsx
@@ -19,14 +19,17 @@ export default {
   component: ErrorDistribution,
   decorators: [
     (Story: ComponentType) => {
-      const apmPluginContextMock = {
-        observabilityRuleTypeRegistry: { getFormatter: () => undefined },
-      } as unknown as ApmPluginContextValue;
-
       const kibanaContextServices = {
         uiSettings: { get: () => {} },
       };
 
+      const apmPluginContextMock = {
+        observabilityRuleTypeRegistry: { getFormatter: () => undefined },
+        core: {
+          uiSettings: kibanaContextServices.uiSettings,
+        },
+      } as unknown as ApmPluginContextValue;
+
       return (
         <ApmPluginContext.Provider value={apmPluginContextMock}>
           <KibanaContextProvider services={kibanaContextServices}>
diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.tsx
index 429ad989b9738..6a3157b3c4b7f 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_details/Distribution/index.tsx
@@ -32,6 +32,7 @@ import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plug
 import { LazyAlertsFlyout } from '../../../../../../observability/public';
 import { useUrlParams } from '../../../../context/url_params_context/use_url_params';
 import { Coordinate } from '../../../../../typings/timeseries';
+import { getTimeZone } from '../../../shared/charts/helper/timezone';
 
 const ALERT_RULE_TYPE_ID: typeof ALERT_RULE_TYPE_ID_TYPED =
   ALERT_RULE_TYPE_ID_NON_TYPED;
@@ -58,6 +59,7 @@ interface Props {
 }
 
 export function ErrorDistribution({ distribution, title, fetchStatus }: Props) {
+  const { core } = useApmPluginContext();
   const theme = useTheme();
   const currentPeriod = getCoordinatedBuckets(distribution.currentPeriod);
   const previousPeriod = getCoordinatedBuckets(distribution.previousPeriod);
@@ -103,6 +105,8 @@ export function ErrorDistribution({ distribution, title, fetchStatus }: Props) {
     undefined
   );
 
+  const timeZone = getTimeZone(core.uiSettings);
+
   return (
     <>
       <EuiTitle size="xs">
@@ -138,6 +142,7 @@ export function ErrorDistribution({ distribution, title, fetchStatus }: Props) {
           {timeseries.map((serie) => {
             return (
               <BarSeries
+                timeZone={timeZone}
                 key={serie.title}
                 id={serie.title}
                 minBarHeight={2}
diff --git a/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx
index 16157071affcd..7f7c163ff1ea1 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx
@@ -44,6 +44,8 @@ import {
   getMaxY,
   getResponseTimeTickFormatter,
 } from '../../../shared/charts/transaction_charts/helper';
+import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
+import { getTimeZone } from '../helper/timezone';
 
 interface Props {
   fetchStatus: FETCH_STATUS;
@@ -66,15 +68,12 @@ export function BreakdownChart({
 }: Props) {
   const history = useHistory();
   const chartTheme = useChartTheme();
-
+  const { core } = useApmPluginContext();
   const { chartRef, setPointerEvent } = useChartPointerEventContext();
-
   const {
     query: { rangeFrom, rangeTo },
   } = useApmParams('/services/{serviceName}');
-
   const theme = useTheme();
-
   const { start, end } = useTimeRange({ rangeFrom, rangeTo });
 
   const min = moment.utc(start).valueOf();
@@ -92,6 +91,8 @@ export function BreakdownChart({
       ? getResponseTimeTickFormatter(getDurationFormatter(maxY))
       : asPercentBound;
 
+  const timeZone = getTimeZone(core.uiSettings);
+
   return (
     <ChartContainer height={height} hasData={!isEmpty} status={fetchStatus}>
       <Chart ref={chartRef}>
@@ -150,6 +151,7 @@ export function BreakdownChart({
           timeseries.map((serie) => {
             return (
               <AreaSeries
+                timeZone={timeZone}
                 key={serie.title}
                 id={serie.title}
                 name={serie.title}
diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts
index 4d72c794d28b2..acf3677af4938 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts
+++ b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts
@@ -6,7 +6,8 @@
  */
 
 import moment from 'moment-timezone';
-import { getDomainTZ, getTimeTicksTZ } from './timezone';
+import { IUiSettingsClient } from '../../../../../../../../src/core/public';
+import { getDomainTZ, getTimeTicksTZ, getTimeZone } from './timezone';
 
 describe('Timezone helper', () => {
   let originalTimezone: moment.MomentZone | null;
@@ -67,4 +68,22 @@ describe('Timezone helper', () => {
       ]);
     });
   });
+
+  describe('getTimeZone', () => {
+    it('returns local when uiSettings is undefined', () => {
+      expect(getTimeZone()).toEqual('local');
+    });
+
+    it('returns local when uiSettings returns Browser', () => {
+      expect(
+        getTimeZone({ get: () => 'Browser' } as unknown as IUiSettingsClient)
+      ).toEqual('local');
+    });
+    it('returns timezone defined on uiSettings', () => {
+      const timezone = 'America/toronto';
+      expect(
+        getTimeZone({ get: () => timezone } as unknown as IUiSettingsClient)
+      ).toEqual(timezone);
+    });
+  });
 });
diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts
index 539c81c61c3ce..f807d83c8977f 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts
+++ b/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts
@@ -7,6 +7,8 @@
 
 import d3 from 'd3';
 import { getTimezoneOffsetInMs } from './get_timezone_offset_in_ms';
+import { IUiSettingsClient } from '../../../../../../../../src/core/public';
+import { UI_SETTINGS } from '../../../../../../../../src/plugins/data/common';
 
 interface Params {
   domain: [number, number];
@@ -31,3 +33,15 @@ export const getDomainTZ = (min: number, max: number): [number, number] => {
   );
   return [xMinZone, xMaxZone];
 };
+
+export function getTimeZone(uiSettings?: IUiSettingsClient) {
+  const kibanaTimeZone = uiSettings?.get<'Browser' | string>(
+    UI_SETTINGS.DATEFORMAT_TZ
+  );
+
+  if (!kibanaTimeZone || kibanaTimeZone === 'Browser') {
+    return 'local';
+  }
+
+  return kibanaTimeZone;
+}
diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx b/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx
index 08e8908d50e7a..bcdfff2678cda 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx
@@ -19,8 +19,8 @@ import {
   RectAnnotation,
   ScaleType,
   Settings,
-  YDomainRange,
   XYBrushEvent,
+  YDomainRange,
 } from '@elastic/charts';
 import { EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
@@ -46,6 +46,7 @@ import { getLatencyChartSelector } from '../../../selectors/latency_chart_select
 import { unit } from '../../../utils/style';
 import { ChartContainer } from './chart_container';
 import { getAlertAnnotations } from './helper/get_alert_annotations';
+import { getTimeZone } from './helper/timezone';
 import { isTimeseriesEmpty, onBrushEnd } from './helper/helper';
 
 interface Props {
@@ -85,7 +86,7 @@ export function TimeseriesChart({
   alerts,
 }: Props) {
   const history = useHistory();
-  const { observabilityRuleTypeRegistry } = useApmPluginContext();
+  const { observabilityRuleTypeRegistry, core } = useApmPluginContext();
   const { getFormatter } = observabilityRuleTypeRegistry;
   const { annotations } = useAnnotationsContext();
   const { setPointerEvent, chartRef } = useChartPointerEventContext();
@@ -97,6 +98,8 @@ export function TimeseriesChart({
 
   const xValues = timeseries.flatMap(({ data }) => data.map(({ x }) => x));
 
+  const timeZone = getTimeZone(core.uiSettings);
+
   const min = Math.min(...xValues);
   const max = Math.max(...xValues);
 
@@ -180,6 +183,7 @@ export function TimeseriesChart({
 
           return (
             <Series
+              timeZone={timeZone}
               key={serie.title}
               id={serie.title}
               xScaleType={ScaleType.Time}
diff --git a/x-pack/plugins/apm/scripts/test/e2e.js b/x-pack/plugins/apm/scripts/test/e2e.js
index 629cdc2498414..b3ce510a8e569 100644
--- a/x-pack/plugins/apm/scripts/test/e2e.js
+++ b/x-pack/plugins/apm/scripts/test/e2e.js
@@ -12,6 +12,11 @@ const yargs = require('yargs');
 const childProcess = require('child_process');
 
 const { argv } = yargs(process.argv.slice(2))
+  .option('kibana-install-dir', {
+    default: '',
+    type: 'string',
+    description: 'Path to the Kibana install directory',
+  })
   .option('server', {
     default: false,
     type: 'boolean',
@@ -30,7 +35,7 @@ const { argv } = yargs(process.argv.slice(2))
   })
   .help();
 
-const { server, runner, open } = argv;
+const { server, runner, open, kibanaInstallDir } = argv;
 
 const e2eDir = path.join(__dirname, '../../ftr_e2e');
 
@@ -44,6 +49,6 @@ if (server) {
 const config = open ? './cypress_open.ts' : './cypress_run.ts';
 
 childProcess.execSync(
-  `node ../../../../scripts/${ftrScript} --config ${config}`,
+  `node ../../../../scripts/${ftrScript} --config ${config} --kibana-install-dir '${kibanaInstallDir}'`,
   { cwd: e2eDir, stdio: 'inherit' }
 );
diff --git a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot
index 8ca3dc2a94d4e..47c536cd1e2ef 100644
--- a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot
@@ -13,6 +13,24 @@ exports[`Storyshots components/Variables/VarConfig default 1`] = `
       <div
         className="euiAccordion__triggerWrapper"
       >
+        <button
+          aria-controls="accordion-variables"
+          aria-expanded={false}
+          aria-labelledby="generated-id"
+          className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiAccordion__iconButton"
+          disabled={false}
+          onClick={[Function]}
+          tabIndex={-1}
+          type="button"
+        >
+          <span
+            aria-hidden="true"
+            className="euiButtonIcon__icon"
+            color="inherit"
+            data-euiicon-type="arrowRight"
+            size="m"
+          />
+        </button>
         <button
           aria-controls="accordion-variables"
           aria-expanded={false}
@@ -22,16 +40,7 @@ exports[`Storyshots components/Variables/VarConfig default 1`] = `
           type="button"
         >
           <span
-            className="euiAccordion__iconWrapper"
-          >
-            <span
-              className="euiAccordion__icon"
-              data-euiicon-type="arrowRight"
-              size="m"
-            />
-          </span>
-          <span
-            className="euiIEFlexWrapFix"
+            className="euiAccordion__buttonContent"
           >
             <span
               className="euiToolTipAnchor"
diff --git a/x-pack/plugins/cases/public/components/add_comment/index.test.tsx b/x-pack/plugins/cases/public/components/add_comment/index.test.tsx
index 06a3897687921..c15722a3ec354 100644
--- a/x-pack/plugins/cases/public/components/add_comment/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/add_comment/index.test.tsx
@@ -120,7 +120,7 @@ describe('AddComment ', () => {
   });
 
   it('should insert a quote', async () => {
-    const sampleQuote = 'what a cool quote';
+    const sampleQuote = 'what a cool quote \n with new lines';
     const ref = React.createRef<AddCommentRefObject>();
     const wrapper = mount(
       <TestProviders>
@@ -138,10 +138,40 @@ describe('AddComment ', () => {
     });
 
     expect(wrapper.find(`[data-test-subj="add-comment"] textarea`).text()).toBe(
-      `${sampleData.comment}\n\n${sampleQuote}`
+      `${sampleData.comment}\n\n> what a cool quote \n>  with new lines \n\n`
     );
   });
 
+  it('should call onFocus when adding a quote', async () => {
+    const ref = React.createRef<AddCommentRefObject>();
+
+    mount(
+      <TestProviders>
+        <AddComment {...addCommentProps} ref={ref} />
+      </TestProviders>
+    );
+
+    ref.current!.editor!.textarea!.focus = jest.fn();
+    await act(async () => {
+      ref.current!.addQuote('a comment');
+    });
+
+    expect(ref.current!.editor!.textarea!.focus).toHaveBeenCalled();
+  });
+
+  it('should NOT call onFocus on mount', async () => {
+    const ref = React.createRef<AddCommentRefObject>();
+
+    mount(
+      <TestProviders>
+        <AddComment {...addCommentProps} ref={ref} />
+      </TestProviders>
+    );
+
+    ref.current!.editor!.textarea!.focus = jest.fn();
+    expect(ref.current!.editor!.textarea!.focus).not.toHaveBeenCalled();
+  });
+
   it('it should insert a timeline', async () => {
     const useInsertTimelineMock = jest.fn();
     let attachTimeline = noop;
diff --git a/x-pack/plugins/cases/public/components/add_comment/index.tsx b/x-pack/plugins/cases/public/components/add_comment/index.tsx
index f788456a30dff..3ee7c1604b24d 100644
--- a/x-pack/plugins/cases/public/components/add_comment/index.tsx
+++ b/x-pack/plugins/cases/public/components/add_comment/index.tsx
@@ -5,14 +5,22 @@
  * 2.0.
  */
 
+import React, {
+  useCallback,
+  useRef,
+  forwardRef,
+  useImperativeHandle,
+  useEffect,
+  useState,
+} from 'react';
 import { EuiButton, EuiFlexItem, EuiFlexGroup, EuiLoadingSpinner } from '@elastic/eui';
-import React, { useCallback, useRef, forwardRef, useImperativeHandle } from 'react';
 import styled from 'styled-components';
+import { isEmpty } from 'lodash';
 
 import { CommentType } from '../../../common';
 import { usePostComment } from '../../containers/use_post_comment';
 import { Case } from '../../containers/types';
-import { MarkdownEditorForm } from '../markdown_editor';
+import { EuiMarkdownEditorRef, MarkdownEditorForm } from '../markdown_editor';
 import { Form, useForm, UseField, useFormData } from '../../common/shared_imports';
 
 import * as i18n from './translations';
@@ -33,6 +41,7 @@ const initialCommentValue: AddCommentFormSchema = {
 export interface AddCommentRefObject {
   addQuote: (quote: string) => void;
   setComment: (newComment: string) => void;
+  editor: EuiMarkdownEditorRef | null;
 }
 
 export interface AddCommentProps {
@@ -61,7 +70,8 @@ export const AddComment = React.memo(
       },
       ref
     ) => {
-      const editorRef = useRef();
+      const editorRef = useRef<EuiMarkdownEditorRef>(null);
+      const [focusOnContext, setFocusOnContext] = useState(false);
       const owner = useOwnerContext();
       const { isLoading, postComment } = usePostComment();
 
@@ -77,7 +87,10 @@ export const AddComment = React.memo(
 
       const addQuote = useCallback(
         (quote) => {
-          setFieldValue(fieldName, `${comment}${comment.length > 0 ? '\n\n' : ''}${quote}`);
+          const addCarrots = quote.replace(new RegExp('\r?\n', 'g'), '\n> ');
+          const val = `> ${addCarrots} \n\n`;
+          setFieldValue(fieldName, `${comment}${comment.length > 0 ? '\n\n' : ''}${val}`);
+          setFocusOnContext(true);
         },
         [comment, setFieldValue]
       );
@@ -111,6 +124,38 @@ export const AddComment = React.memo(
         }
       }, [submit, onCommentSaving, postComment, caseId, owner, onCommentPosted, subCaseId, reset]);
 
+      /**
+       * Focus on the text area when a quote has been added.
+       *
+       * The useEffect will run only when focusOnContext
+       * changes.
+       *
+       * The useEffect is also called once one mount
+       * where the comment is empty. We do not want to focus
+       * in this scenario.
+       *
+       * Ideally we would like to put the
+       * editorRef.current?.textarea?.focus(); inside the if (focusOnContext).
+       * The reason this is not feasible is because when it sets the
+       * focusOnContext to false a render will occur again and the
+       * focus will be lost.
+       *
+       * We do not put the comment in the dependency list
+       * because we do not want to focus when the user
+       * is typing.
+       */
+
+      useEffect(() => {
+        if (!isEmpty(comment)) {
+          editorRef.current?.textarea?.focus();
+        }
+
+        if (focusOnContext) {
+          setFocusOnContext(false);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+      }, [focusOnContext]);
+
       return (
         <span id="add-comment-permLink">
           {isLoading && showLoading && <MySpinner data-test-subj="loading-spinner" size="xl" />}
diff --git a/x-pack/plugins/cases/public/components/configure_cases/connectors.test.tsx b/x-pack/plugins/cases/public/components/configure_cases/connectors.test.tsx
index 4e0f1689bd4d1..9bbddfae2f9bd 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/connectors.test.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/connectors.test.tsx
@@ -123,11 +123,11 @@ describe('Connectors', () => {
     ).toBe('Update My Connector');
   });
 
-  test('it shows the deprecated callout when the connector is legacy', async () => {
+  test('it shows the deprecated callout when the connector is deprecated', async () => {
     render(
       <Connectors
         {...props}
-        selectedConnector={{ id: 'servicenow-legacy', type: ConnectorTypes.serviceNowITSM }}
+        selectedConnector={{ id: 'servicenow-uses-table-api', type: ConnectorTypes.serviceNowITSM }}
       />,
       {
         // wrapper: TestProviders produces a TS error
diff --git a/x-pack/plugins/cases/public/components/configure_cases/connectors.tsx b/x-pack/plugins/cases/public/components/configure_cases/connectors.tsx
index 1b575e3ba9334..b7bf7c322f76e 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/connectors.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/connectors.tsx
@@ -23,7 +23,7 @@ import { ActionConnector, CaseConnectorMapping } from '../../containers/configur
 import { Mapping } from './mapping';
 import { ActionTypeConnector, ConnectorTypes } from '../../../common';
 import { DeprecatedCallout } from '../connectors/deprecated_callout';
-import { isLegacyConnector } from '../utils';
+import { isDeprecatedConnector } from '../utils';
 
 const EuiFormRowExtended = styled(EuiFormRow)`
   .euiFormRow__labelWrapper {
@@ -111,7 +111,7 @@ const ConnectorsComponent: React.FC<Props> = ({
                 appendAddConnectorButton={true}
               />
             </EuiFlexItem>
-            {selectedConnector.type !== ConnectorTypes.none && isLegacyConnector(connector) && (
+            {selectedConnector.type !== ConnectorTypes.none && isDeprecatedConnector(connector) && (
               <EuiFlexItem grow={false}>
                 <DeprecatedCallout />
               </EuiFlexItem>
diff --git a/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.test.tsx b/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.test.tsx
index 6f05f9f940d25..03ed3d6512638 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.test.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.test.tsx
@@ -171,7 +171,7 @@ describe('ConnectorsDropdown', () => {
           "value": "servicenow-sir",
         },
         Object {
-          "data-test-subj": "dropdown-connector-servicenow-legacy",
+          "data-test-subj": "dropdown-connector-servicenow-uses-table-api",
           "inputDisplay": <EuiFlexGroup
             alignItems="center"
             gutterSize="s"
@@ -205,7 +205,7 @@ describe('ConnectorsDropdown', () => {
               />
             </EuiFlexItem>
           </EuiFlexGroup>,
-          "value": "servicenow-legacy",
+          "value": "servicenow-uses-table-api",
         },
       ]
     `);
@@ -288,8 +288,8 @@ describe('ConnectorsDropdown', () => {
     ).not.toThrowError();
   });
 
-  test('it shows the deprecated tooltip when the connector is legacy', () => {
-    render(<ConnectorsDropdown {...props} selectedConnector="servicenow-legacy" />, {
+  test('it shows the deprecated tooltip when the connector is deprecated', () => {
+    render(<ConnectorsDropdown {...props} selectedConnector="servicenow-uses-table-api" />, {
       wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
     });
 
diff --git a/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx b/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx
index c5fe9c7470745..c7ce3c5b3c4b6 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.tsx
@@ -13,7 +13,7 @@ import { ConnectorTypes } from '../../../common';
 import { ActionConnector } from '../../containers/configure/types';
 import * as i18n from './translations';
 import { useKibana } from '../../common/lib/kibana';
-import { getConnectorIcon, isLegacyConnector } from '../utils';
+import { getConnectorIcon, isDeprecatedConnector } from '../utils';
 import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
 
 export interface Props {
@@ -95,10 +95,10 @@ const ConnectorsDropdownComponent: React.FC<Props> = ({
                 <EuiFlexItem grow={false}>
                   <span>
                     {connector.name}
-                    {isLegacyConnector(connector) && ` (${i18n.DEPRECATED_TOOLTIP_TEXT})`}
+                    {isDeprecatedConnector(connector) && ` (${i18n.DEPRECATED_TOOLTIP_TEXT})`}
                   </span>
                 </EuiFlexItem>
-                {isLegacyConnector(connector) && (
+                {isDeprecatedConnector(connector) && (
                   <EuiFlexItem grow={false}>
                     <StyledEuiIconTip
                       aria-label={i18n.DEPRECATED_TOOLTIP_CONTENT}
diff --git a/x-pack/plugins/cases/public/components/connectors/deprecated_callout.test.tsx b/x-pack/plugins/cases/public/components/connectors/deprecated_callout.test.tsx
index 367609df3c887..690a9331c568f 100644
--- a/x-pack/plugins/cases/public/components/connectors/deprecated_callout.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/deprecated_callout.test.tsx
@@ -14,14 +14,14 @@ describe('DeprecatedCallout', () => {
     render(<DeprecatedCallout />);
     expect(screen.getByText('This connector type is deprecated')).toBeInTheDocument();
     expect(screen.getByText('Update this connector, or create a new one.')).toBeInTheDocument();
-    expect(screen.getByTestId('legacy-connector-warning-callout')).toHaveClass(
+    expect(screen.getByTestId('deprecated-connector-warning-callout')).toHaveClass(
       'euiCallOut euiCallOut--warning'
     );
   });
 
   test('it renders a danger flyout correctly', () => {
     render(<DeprecatedCallout type="danger" />);
-    expect(screen.getByTestId('legacy-connector-warning-callout')).toHaveClass(
+    expect(screen.getByTestId('deprecated-connector-warning-callout')).toHaveClass(
       'euiCallOut euiCallOut--danger'
     );
   });
diff --git a/x-pack/plugins/cases/public/components/connectors/deprecated_callout.tsx b/x-pack/plugins/cases/public/components/connectors/deprecated_callout.tsx
index 9337f2843506b..195b2deb84d6e 100644
--- a/x-pack/plugins/cases/public/components/connectors/deprecated_callout.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/deprecated_callout.tsx
@@ -9,15 +9,15 @@ import React from 'react';
 import { EuiCallOut, EuiCallOutProps } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-const LEGACY_CONNECTOR_WARNING_TITLE = i18n.translate(
-  'xpack.cases.connectors.serviceNow.legacyConnectorWarningTitle',
+const DEPRECATED_CONNECTOR_WARNING_TITLE = i18n.translate(
+  'xpack.cases.connectors.serviceNow.deprecatedConnectorWarningTitle',
   {
     defaultMessage: 'This connector type is deprecated',
   }
 );
 
-const LEGACY_CONNECTOR_WARNING_DESC = i18n.translate(
-  'xpack.cases.connectors.serviceNow.legacyConnectorWarningDesc',
+const DEPRECATED_CONNECTOR_WARNING_DESC = i18n.translate(
+  'xpack.cases.connectors.serviceNow.deprecatedConnectorWarningDesc',
   {
     defaultMessage: 'Update this connector, or create a new one.',
   }
@@ -29,12 +29,12 @@ interface Props {
 
 const DeprecatedCalloutComponent: React.FC<Props> = ({ type = 'warning' }) => (
   <EuiCallOut
-    title={LEGACY_CONNECTOR_WARNING_TITLE}
+    title={DEPRECATED_CONNECTOR_WARNING_TITLE}
     color={type}
     iconType="alert"
-    data-test-subj="legacy-connector-warning-callout"
+    data-test-subj="deprecated-connector-warning-callout"
   >
-    {LEGACY_CONNECTOR_WARNING_DESC}
+    {DEPRECATED_CONNECTOR_WARNING_DESC}
   </EuiCallOut>
 );
 
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_itsm_case_fields.test.tsx b/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_itsm_case_fields.test.tsx
index 008340b6b7e97..324dcef8ba397 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_itsm_case_fields.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_itsm_case_fields.test.tsx
@@ -127,15 +127,15 @@ describe('ServiceNowITSM Fields', () => {
     );
   });
 
-  test('it shows the deprecated callout when the connector is legacy', async () => {
-    const legacyConnector = { ...connector, config: { isLegacy: true } };
-    render(<Fields fields={fields} onChange={onChange} connector={legacyConnector} />);
-    expect(screen.getByTestId('legacy-connector-warning-callout')).toBeInTheDocument();
+  test('it shows the deprecated callout when the connector uses the table API', async () => {
+    const tableApiConnector = { ...connector, config: { usesTableApi: true } };
+    render(<Fields fields={fields} onChange={onChange} connector={tableApiConnector} />);
+    expect(screen.getByTestId('deprecated-connector-warning-callout')).toBeInTheDocument();
   });
 
-  test('it does not show the deprecated callout when the connector is not legacy', async () => {
+  test('it does not show the deprecated callout when the connector does not uses the table API', async () => {
     render(<Fields fields={fields} onChange={onChange} connector={connector} />);
-    expect(screen.queryByTestId('legacy-connector-warning-callout')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('deprecated-connector-warning-callout')).not.toBeInTheDocument();
   });
 
   describe('onChange calls', () => {
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_sir_case_fields.test.tsx b/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_sir_case_fields.test.tsx
index aac78b8266fb5..cd8f5f4abf7b5 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_sir_case_fields.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_sir_case_fields.test.tsx
@@ -161,15 +161,15 @@ describe('ServiceNowSIR Fields', () => {
     ]);
   });
 
-  test('it shows the deprecated callout when the connector is legacy', async () => {
-    const legacyConnector = { ...connector, config: { isLegacy: true } };
-    render(<Fields fields={fields} onChange={onChange} connector={legacyConnector} />);
-    expect(screen.getByTestId('legacy-connector-warning-callout')).toBeInTheDocument();
+  test('it shows the deprecated callout when the connector uses the table API', async () => {
+    const tableApiConnector = { ...connector, config: { usesTableApi: true } };
+    render(<Fields fields={fields} onChange={onChange} connector={tableApiConnector} />);
+    expect(screen.getByTestId('deprecated-connector-warning-callout')).toBeInTheDocument();
   });
 
-  test('it does not show the deprecated callout when the connector is not legacy', async () => {
+  test('it does not show the deprecated callout when the connector does not uses the table API', async () => {
     render(<Fields fields={fields} onChange={onChange} connector={connector} />);
-    expect(screen.queryByTestId('legacy-connector-warning-callout')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('deprecated-connector-warning-callout')).not.toBeInTheDocument();
   });
 
   describe('onChange calls', () => {
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/validator.test.ts b/x-pack/plugins/cases/public/components/connectors/servicenow/validator.test.ts
index c098d803276bc..aa643191ac62e 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/validator.test.ts
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/validator.test.ts
@@ -10,24 +10,24 @@ import { connectorValidator } from './validator';
 
 describe('ServiceNow validator', () => {
   describe('connectorValidator', () => {
-    test('it returns an error message if the connector is legacy', () => {
+    test('it returns an error message if the connector uses the table API', () => {
       const invalidConnector = {
         ...connector,
         config: {
           ...connector.config,
-          isLegacy: true,
+          usesTableApi: true,
         },
       };
 
       expect(connectorValidator(invalidConnector)).toEqual({ message: 'Deprecated connector' });
     });
 
-    test('it does not returns an error message if the connector is not legacy', () => {
+    test('it does not returns an error message if the connector does not uses the table API', () => {
       const invalidConnector = {
         ...connector,
         config: {
           ...connector.config,
-          isLegacy: false,
+          usesTableApi: false,
         },
       };
 
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/validator.ts b/x-pack/plugins/cases/public/components/connectors/servicenow/validator.ts
index 3f67f25549343..7d56163c48350 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/validator.ts
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/validator.ts
@@ -9,16 +9,16 @@ import { ValidationConfig } from '../../../common/shared_imports';
 import { CaseActionConnector } from '../../types';
 
 /**
- * The user can not use a legacy connector
+ * The user can not create cases with connectors that use the table API
  */
 
 export const connectorValidator = (
   connector: CaseActionConnector
 ): ReturnType<ValidationConfig['validator']> => {
   const {
-    config: { isLegacy },
+    config: { usesTableApi },
   } = connector;
-  if (isLegacy) {
+  if (usesTableApi) {
     return {
       message: 'Deprecated connector',
     };
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/editor.tsx b/x-pack/plugins/cases/public/components/markdown_editor/editor.tsx
index f2351a2b2d793..4bf25b23403e1 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/editor.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/editor.tsx
@@ -37,7 +37,7 @@ interface MarkdownEditorProps {
   value: string;
 }
 
-type EuiMarkdownEditorRef = ElementRef<typeof EuiMarkdownEditor>;
+export type EuiMarkdownEditorRef = ElementRef<typeof EuiMarkdownEditor>;
 
 export interface MarkdownEditorRef {
   textarea: HTMLTextAreaElement | null;
diff --git a/x-pack/plugins/cases/public/components/user_action_tree/index.test.tsx b/x-pack/plugins/cases/public/components/user_action_tree/index.test.tsx
index dd5c993939b82..5241b0e66fb38 100644
--- a/x-pack/plugins/cases/public/components/user_action_tree/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_action_tree/index.test.tsx
@@ -348,7 +348,7 @@ describe(`UserActionTree`, () => {
       .first()
       .simulate('click');
     await waitFor(() => {
-      expect(setFieldValue).toBeCalledWith('comment', `> ${props.data.description} \n`);
+      expect(setFieldValue).toBeCalledWith('comment', `> ${props.data.description} \n\n`);
     });
   });
 
diff --git a/x-pack/plugins/cases/public/components/user_action_tree/index.tsx b/x-pack/plugins/cases/public/components/user_action_tree/index.tsx
index 7ea415324194c..92640a34548e8 100644
--- a/x-pack/plugins/cases/public/components/user_action_tree/index.tsx
+++ b/x-pack/plugins/cases/public/components/user_action_tree/index.tsx
@@ -226,10 +226,8 @@ export const UserActionTree = React.memo(
 
     const handleManageQuote = useCallback(
       (quote: string) => {
-        const addCarrots = quote.replace(new RegExp('\r?\n', 'g'), '  \n> ');
-
         if (commentRefs.current[NEW_ID]) {
-          commentRefs.current[NEW_ID].addQuote(`> ${addCarrots} \n`);
+          commentRefs.current[NEW_ID].addQuote(quote);
         }
 
         handleOutlineComment('add-comment');
diff --git a/x-pack/plugins/cases/public/components/utils.ts b/x-pack/plugins/cases/public/components/utils.ts
index ac5f4dbdd298e..74137789958a4 100644
--- a/x-pack/plugins/cases/public/components/utils.ts
+++ b/x-pack/plugins/cases/public/components/utils.ts
@@ -78,7 +78,7 @@ export const getConnectorIcon = (
 };
 
 // TODO: Remove when the applications are certified
-export const isLegacyConnector = (connector?: CaseActionConnector) => {
+export const isDeprecatedConnector = (connector?: CaseActionConnector): boolean => {
   if (connector == null) {
     return true;
   }
@@ -91,5 +91,16 @@ export const isLegacyConnector = (connector?: CaseActionConnector) => {
     return true;
   }
 
-  return connector.config.isLegacy;
+  /**
+   * Connector's prior to the Elastic ServiceNow application
+   * use the Table API (https://developer.servicenow.com/dev.do#!/reference/api/rome/rest/c_TableAPI)
+   * Connectors after the Elastic ServiceNow application use the
+   * Import Set API (https://developer.servicenow.com/dev.do#!/reference/api/rome/rest/c_ImportSetAPI)
+   * A ServiceNow connector is considered deprecated if it uses the Table API.
+   *
+   * All other connectors do not have the usesTableApi config property
+   * so the function will always return false for them.
+   */
+
+  return !!connector.config.usesTableApi;
 };
diff --git a/x-pack/plugins/cases/public/containers/configure/mock.ts b/x-pack/plugins/cases/public/containers/configure/mock.ts
index d1ae7f310a719..a5483e524e92d 100644
--- a/x-pack/plugins/cases/public/containers/configure/mock.ts
+++ b/x-pack/plugins/cases/public/containers/configure/mock.ts
@@ -72,12 +72,12 @@ export const connectorsMock: ActionConnector[] = [
     isPreconfigured: false,
   },
   {
-    id: 'servicenow-legacy',
+    id: 'servicenow-uses-table-api',
     actionTypeId: '.servicenow',
     name: 'My Connector',
     config: {
       apiUrl: 'https://instance1.service-now.com',
-      isLegacy: true,
+      usesTableApi: true,
     },
     isPreconfigured: false,
   },
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/domains_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/domains_table.test.tsx
index 78049d5832e9a..76622f9c12822 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/domains_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/domains_table.test.tsx
@@ -87,6 +87,18 @@ describe('DomainsTable', () => {
       expect(tableContent).toContain('elastic.co');
     });
 
+    it('renders a clickable domain url', () => {
+      const basicTable = wrapper.find(EuiInMemoryTable).dive().find(EuiBasicTable).dive();
+      const link = basicTable.find('[data-test-subj="CrawlerDomainURL"]').at(0);
+
+      expect(link.dive().text()).toContain('elastic.co');
+      expect(link.props()).toEqual(
+        expect.objectContaining({
+          to: '/engines/some-engine/crawler/domains/1234',
+        })
+      );
+    });
+
     it('renders a last crawled column', () => {
       expect(tableContent).toContain('Last activity');
       expect(tableContent).toContain('Jan 1, 2020');
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/domains_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/domains_table.tsx
index 7214eace25e2d..1f0f6be22102f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/domains_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/domains_table.tsx
@@ -17,6 +17,7 @@ import { FormattedNumber } from '@kbn/i18n/react';
 
 import { DELETE_BUTTON_LABEL, MANAGE_BUTTON_LABEL } from '../../../../shared/constants';
 import { KibanaLogic } from '../../../../shared/kibana';
+import { EuiLinkTo } from '../../../../shared/react_router_helpers';
 import { AppLogic } from '../../../app_logic';
 import { ENGINE_CRAWLER_DOMAIN_PATH } from '../../../routes';
 import { generateEnginePath } from '../../engine';
@@ -46,6 +47,14 @@ export const DomainsTable: React.FC = () => {
           defaultMessage: 'Domain URL',
         }
       ),
+      render: (_, domain: CrawlerDomain) => (
+        <EuiLinkTo
+          data-test-subj="CrawlerDomainURL"
+          to={generateEnginePath(ENGINE_CRAWLER_DOMAIN_PATH, { domainId: domain.id })}
+        >
+          {domain.url}
+        </EuiLinkTo>
+      ),
     },
     {
       field: 'lastCrawl',
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/curations_table.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/curations_table.tsx
index 183d2b9cb7107..e851a594bc5a2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/curations_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/components/curations_table.tsx
@@ -73,11 +73,8 @@ export const CurationsTable: React.FC = () => {
       truncateText: true,
       mobileOptions: {
         header: true,
-        // Note: the below props are valid props per https://elastic.github.io/eui/#/tabular-content/tables (Responsive tables), but EUI's types have a bug reporting it as an error
-        // @ts-ignore
         enlarge: true,
         width: '100%',
-        truncateText: false,
       },
     },
     {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/suggested_documents_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/suggested_documents_callout.test.tsx
index 29418d09218f4..b1f02b960aa8a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/suggested_documents_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/suggested_documents_callout.test.tsx
@@ -26,6 +26,10 @@ const MOCK_VALUES = {
     },
     queries: ['some query'],
   },
+  // EngineLogic
+  engine: {
+    search_relevance_suggestions_active: true,
+  },
 };
 
 describe('SuggestedDocumentsCallout', () => {
@@ -40,7 +44,7 @@ describe('SuggestedDocumentsCallout', () => {
     expect(wrapper.is(SuggestionsCallout));
   });
 
-  it('is empty when the suggested is undefined', () => {
+  it('is empty when the suggestion is undefined', () => {
     setMockValues({ ...MOCK_VALUES, curation: {} });
 
     const wrapper = shallow(<SuggestedDocumentsCallout />);
@@ -48,6 +52,15 @@ describe('SuggestedDocumentsCallout', () => {
     expect(wrapper.isEmptyRender()).toBe(true);
   });
 
+  it('is empty when suggestions are not active', () => {
+    const values = set('engine.search_relevance_suggestions_active', false, MOCK_VALUES);
+    setMockValues(values);
+
+    const wrapper = shallow(<SuggestedDocumentsCallout />);
+
+    expect(wrapper.isEmptyRender()).toBe(true);
+  });
+
   it('is empty when curation status is not pending', () => {
     const values = set('curation.suggestion.status', 'applied', MOCK_VALUES);
     setMockValues(values);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/suggested_documents_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/suggested_documents_callout.tsx
index e443e77d76190..af76ebee16bad 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/suggested_documents_callout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/suggested_documents_callout.tsx
@@ -11,7 +11,7 @@ import { useValues } from 'kea';
 import { i18n } from '@kbn/i18n';
 
 import { ENGINE_CURATION_SUGGESTION_PATH } from '../../../routes';
-import { generateEnginePath } from '../../engine';
+import { EngineLogic, generateEnginePath } from '../../engine';
 
 import { SuggestionsCallout } from '../components/suggestions_callout';
 
@@ -21,8 +21,15 @@ export const SuggestedDocumentsCallout: React.FC = () => {
   const {
     curation: { suggestion, queries },
   } = useValues(CurationLogic);
-
-  if (typeof suggestion === 'undefined' || suggestion.status !== 'pending') {
+  const {
+    engine: { search_relevance_suggestions_active: searchRelevanceSuggestionsActive },
+  } = useValues(EngineLogic);
+
+  if (
+    typeof suggestion === 'undefined' ||
+    suggestion.status !== 'pending' ||
+    searchRelevanceSuggestionsActive === false
+  ) {
     return null;
   }
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
index 4e09dadc6c836..49d48c8c05ba6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.test.tsx
@@ -14,6 +14,8 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
+import { set } from 'lodash/fp';
+
 import { EuiTab } from '@elastic/eui';
 
 import { getPageHeaderTabs, getPageTitle } from '../../../../test_helpers';
@@ -51,8 +53,10 @@ describe('Curations', () => {
     curationsSettings: {
       enabled: true,
     },
-    // LicensingLogic
-    hasPlatinumLicense: true,
+    // EngineLogic
+    engine: {
+      search_relevance_suggestions_active: true,
+    },
   };
 
   const actions = {
@@ -84,8 +88,8 @@ describe('Curations', () => {
     expect(actions.onSelectPageTab).toHaveBeenNthCalledWith(3, 'settings');
   });
 
-  it('renders less tabs when less than platinum license', () => {
-    setMockValues({ ...values, hasPlatinumLicense: false });
+  it('renders less tabs when suggestions are not active', () => {
+    setMockValues(set('engine.search_relevance_suggestions_active', false, values));
     const wrapper = shallow(<Curations />);
 
     expect(getPageTitle(wrapper)).toEqual('Curated results');
@@ -94,8 +98,8 @@ describe('Curations', () => {
     expect(tabs.length).toBe(2);
   });
 
-  it('renders a New! badge when less than platinum license', () => {
-    setMockValues({ ...values, hasPlatinumLicense: false });
+  it('renders a New! badge  when suggestions are not active', () => {
+    setMockValues(set('engine.search_relevance_suggestions_active', false, values));
     const wrapper = shallow(<Curations />);
 
     expect(getPageTitle(wrapper)).toEqual('Curated results');
@@ -104,29 +108,8 @@ describe('Curations', () => {
     expect(tabs.at(1).prop('append')).not.toBeUndefined();
   });
 
-  it('renders a New! badge when suggestions are disabled', () => {
-    setMockValues({
-      ...values,
-      curationsSettings: {
-        enabled: false,
-      },
-    });
-    const wrapper = shallow(<Curations />);
-
-    expect(getPageTitle(wrapper)).toEqual('Curated results');
-
-    const tabs = getPageHeaderTabs(wrapper).find(EuiTab);
-    expect(tabs.at(2).prop('append')).not.toBeUndefined();
-  });
-
-  it('hides the badge when suggestions are enabled and the user has a platinum license', () => {
-    setMockValues({
-      ...values,
-      hasPlatinumLicense: true,
-      curationsSettings: {
-        enabled: true,
-      },
-    });
+  it('hides the badge when suggestions are active', () => {
+    setMockValues(set('engine.search_relevance_suggestions_active', true, values));
     const wrapper = shallow(<Curations />);
 
     expect(getPageTitle(wrapper)).toEqual('Curated results');
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
index 1cd8313743536..2207555772b5b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
@@ -12,11 +12,10 @@ import { useValues, useActions } from 'kea';
 import { EuiBadge } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { LicensingLogic } from '../../../../shared/licensing';
 import { EuiButtonTo } from '../../../../shared/react_router_helpers';
 
 import { ENGINE_CURATIONS_NEW_PATH } from '../../../routes';
-import { generateEnginePath } from '../../engine';
+import { EngineLogic, generateEnginePath } from '../../engine';
 import { AppSearchPageTemplate } from '../../layout';
 
 import { CURATIONS_OVERVIEW_TITLE, CREATE_NEW_CURATION_TITLE } from '../constants';
@@ -30,13 +29,13 @@ import { CurationsSettings, CurationsSettingsLogic } from './curations_settings'
 export const Curations: React.FC = () => {
   const { dataLoading: curationsDataLoading, meta, selectedPageTab } = useValues(CurationsLogic);
   const { loadCurations, onSelectPageTab } = useActions(CurationsLogic);
-  const { hasPlatinumLicense } = useValues(LicensingLogic);
   const {
-    dataLoading: curationsSettingsDataLoading,
-    curationsSettings: { enabled: curationsSettingsEnabled },
-  } = useValues(CurationsSettingsLogic);
+    engine: { search_relevance_suggestions_active: searchRelevanceSuggestionsActive },
+  } = useValues(EngineLogic);
 
-  const suggestionsEnabled = hasPlatinumLicense && curationsSettingsEnabled;
+  const { dataLoading: curationsSettingsDataLoading } = useValues(CurationsSettingsLogic);
+
+  const suggestionsEnabled = searchRelevanceSuggestionsActive;
 
   const OVERVIEW_TAB = {
     label: i18n.translate(
@@ -75,7 +74,7 @@ export const Curations: React.FC = () => {
     ),
   };
 
-  const pageTabs = hasPlatinumLicense
+  const pageTabs = searchRelevanceSuggestionsActive
     ? [OVERVIEW_TAB, HISTORY_TAB, SETTINGS_TAB]
     : [OVERVIEW_TAB, SETTINGS_TAB];
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_overview.test.tsx
index 809157704a14e..43ef9dfd7ad2b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_overview.test.tsx
@@ -12,6 +12,7 @@ import '../../../__mocks__/engine_logic.mock';
 import React from 'react';
 
 import { shallow } from 'enzyme';
+import { set } from 'lodash/fp';
 
 import { CurationsTable, EmptyState } from '../components';
 
@@ -33,8 +34,10 @@ const MOCK_VALUES = {
       id: 'cur-id-2',
     },
   ],
-  // LicensingLogics
-  hasPlatinumLicense: true,
+  // EngineLogic
+  engine: {
+    search_relevance_suggestions_active: true,
+  },
 };
 
 describe('CurationsOverview', () => {
@@ -67,36 +70,15 @@ describe('CurationsOverview', () => {
     expect(wrapper.find(CurationsTable)).toHaveLength(1);
   });
 
-  it('renders a suggestions table when the user has a platinum license and curations suggestions enabled', () => {
-    setMockValues({
-      ...MOCK_VALUES,
-      hasPlatinumLicense: true,
-      curationsSettings: {
-        enabled: true,
-      },
-    });
+  it('renders a suggestions table when suggestions are active', () => {
+    setMockValues(set('engine.search_relevance_suggestions_active', true, MOCK_VALUES));
     const wrapper = shallow(<CurationsOverview />);
 
     expect(wrapper.find(SuggestionsTable).exists()).toBe(true);
   });
 
-  it('doesn\t render a suggestions table when the user has no platinum license', () => {
-    setMockValues({
-      ...MOCK_VALUES,
-      hasPlatinumLicense: false,
-    });
-    const wrapper = shallow(<CurationsOverview />);
-
-    expect(wrapper.find(SuggestionsTable).exists()).toBe(false);
-  });
-
-  it('doesn\t render a suggestions table when the user has disabled suggestions', () => {
-    setMockValues({
-      ...MOCK_VALUES,
-      curationsSettings: {
-        enabled: false,
-      },
-    });
+  it('doesn\t render a suggestions table when suggestions are not active', () => {
+    setMockValues(set('engine.search_relevance_suggestions_active', false, MOCK_VALUES));
     const wrapper = shallow(<CurationsOverview />);
 
     expect(wrapper.find(SuggestionsTable).exists()).toBe(false);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_overview.tsx
index 00593403b08cf..a611ca88cefd4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_overview.tsx
@@ -11,22 +11,18 @@ import { useValues } from 'kea';
 
 import { EuiSpacer } from '@elastic/eui';
 
-import { LicensingLogic } from '../../../../shared/licensing';
+import { EngineLogic } from '../../engine';
 import { CurationsTable, EmptyState } from '../components';
 import { SuggestionsTable } from '../components/suggestions_table';
 import { CurationsLogic } from '../curations_logic';
 
-import { CurationsSettingsLogic } from './curations_settings';
-
 export const CurationsOverview: React.FC = () => {
   const { curations } = useValues(CurationsLogic);
-  const { hasPlatinumLicense } = useValues(LicensingLogic);
-
   const {
-    curationsSettings: { enabled },
-  } = useValues(CurationsSettingsLogic);
+    engine: { search_relevance_suggestions_active: searchRelevanceSuggestionsActive },
+  } = useValues(EngineLogic);
 
-  const shouldShowSuggestions = enabled && hasPlatinumLicense;
+  const shouldShowSuggestions = searchRelevanceSuggestionsActive;
 
   return (
     <>
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_settings/curations_settings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_settings/curations_settings_logic.test.ts
index 818fac3d0706e..b8aae9c39174d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_settings/curations_settings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_settings/curations_settings_logic.test.ts
@@ -12,8 +12,20 @@ import {
 } from '../../../../../__mocks__/kea_logic';
 import '../../../../__mocks__/engine_logic.mock';
 
+jest.mock('../../curations_logic', () => ({
+  CurationsLogic: {
+    values: {},
+    actions: {
+      loadCurations: jest.fn(),
+    },
+  },
+}));
+
 import { nextTick } from '@kbn/test/jest';
 
+import { CurationsLogic } from '../..';
+import { EngineLogic } from '../../../engine';
+
 import { CurationsSettingsLogic } from './curations_settings_logic';
 
 const DEFAULT_VALUES = {
@@ -205,6 +217,10 @@ describe('CurationsSettingsLogic', () => {
           enabled: true,
           mode: 'automatic',
         });
+
+        // data should have been reloaded
+        expect(EngineLogic.actions.initializeEngine).toHaveBeenCalled();
+        expect(CurationsLogic.actions.loadCurations).toHaveBeenCalled();
       });
 
       it('presents any API errors to the user', async () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_settings/curations_settings_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_settings/curations_settings_logic.ts
index d79ad64a69788..3984cbd024da4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_settings/curations_settings_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curations_settings/curations_settings_logic.ts
@@ -10,6 +10,7 @@ import { kea, MakeLogicType } from 'kea';
 import { flashAPIErrors } from '../../../../../shared/flash_messages';
 import { HttpLogic } from '../../../../../shared/http';
 import { EngineLogic } from '../../../engine';
+import { CurationsLogic } from '../../curations_logic';
 
 export interface CurationsSettings {
   enabled: boolean;
@@ -101,6 +102,10 @@ export const CurationsSettingsLogic = kea<
           }
         );
         actions.onCurationsSettingsLoad(response.curation);
+
+        //  Re-fetch data so that UI updates to new settings
+        CurationsLogic.actions.loadCurations();
+        EngineLogic.actions.initializeEngine();
       } catch (e) {
         flashAPIErrors(e);
       }
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
index 28739a2799332..bb30190833dd3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
@@ -43,6 +43,7 @@ describe('EngineLogic', () => {
     schema: { test: SchemaType.Text },
     apiTokens: [],
     apiKey: 'some-key',
+    search_relevance_suggestions_active: true,
   };
 
   const DEFAULT_VALUES = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/types.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/types.ts
index d4c652ab9c7a7..0bfbc185b85f3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/types.ts
@@ -54,6 +54,7 @@ export interface EngineDetails extends Engine {
   engine_count?: number;
   includedEngines?: EngineDetails[];
   search_relevance_suggestions?: SearchRelevanceSuggestionDetails;
+  search_relevance_suggestions_active: boolean;
 }
 
 interface ResultField {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/suggested_curations_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/suggested_curations_callout.test.tsx
index 58e2cd8cf4c9b..c65d95a5254ee 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/suggested_curations_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/suggested_curations_callout.test.tsx
@@ -18,16 +18,14 @@ import { SuggestionsCallout } from '../../curations/components/suggestions_callo
 import { SuggestedCurationsCallout } from './suggested_curations_callout';
 
 const MOCK_VALUES = {
-  // EngineLogic
   engine: {
     search_relevance_suggestions: {
       curation: {
         pending: 1,
       },
     },
+    search_relevance_suggestions_active: true,
   },
-  // LicensingLogic
-  hasPlatinumLicense: true,
 };
 
 describe('SuggestedCurationsCallout', () => {
@@ -43,15 +41,20 @@ describe('SuggestedCurationsCallout', () => {
   });
 
   it('is empty when the suggestions are undefined', () => {
-    setMockValues({ ...MOCK_VALUES, engine: {} });
+    setMockValues({
+      ...MOCK_VALUES,
+      engine: {
+        search_relevance_suggestions_active: true,
+      },
+    });
 
     const wrapper = shallow(<SuggestedCurationsCallout />);
 
     expect(wrapper.isEmptyRender()).toBe(true);
   });
 
-  it('is empty when no pending curations', () => {
-    const values = set('engine.search_relevance_suggestions.curation.pending', 0, MOCK_VALUES);
+  it('is empty when suggestions are not active', () => {
+    const values = set('engine.search_relevance_suggestions_active', false, MOCK_VALUES);
     setMockValues(values);
 
     const wrapper = shallow(<SuggestedCurationsCallout />);
@@ -59,9 +62,8 @@ describe('SuggestedCurationsCallout', () => {
     expect(wrapper.isEmptyRender()).toBe(true);
   });
 
-  it('is empty when the user has no platinum license', () => {
-    // This would happen if the user *had* suggestions and then downgraded from platinum to gold or something
-    const values = set('hasPlatinumLicense', false, MOCK_VALUES);
+  it('is empty when no pending curations', () => {
+    const values = set('engine.search_relevance_suggestions.curation.pending', 0, MOCK_VALUES);
     setMockValues(values);
 
     const wrapper = shallow(<SuggestedCurationsCallout />);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/suggested_curations_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/suggested_curations_callout.tsx
index 046cc2d744b00..04b2d2b207e94 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/suggested_curations_callout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/suggested_curations_callout.tsx
@@ -10,23 +10,24 @@ import { useValues } from 'kea';
 
 import { i18n } from '@kbn/i18n';
 
-import { LicensingLogic } from '../../../../shared/licensing';
 import { ENGINE_CURATIONS_PATH } from '../../../routes';
 import { SuggestionsCallout } from '../../curations/components/suggestions_callout';
 import { EngineLogic, generateEnginePath } from '../../engine';
 
 export const SuggestedCurationsCallout: React.FC = () => {
   const {
-    engine: { search_relevance_suggestions: searchRelevanceSuggestions },
+    engine: {
+      search_relevance_suggestions: searchRelevanceSuggestions,
+      search_relevance_suggestions_active: searchRelevanceSuggestionsActive,
+    },
   } = useValues(EngineLogic);
-  const { hasPlatinumLicense } = useValues(LicensingLogic);
 
   const pendingCount = searchRelevanceSuggestions?.curation.pending;
 
   if (
     typeof searchRelevanceSuggestions === 'undefined' ||
     pendingCount === 0 ||
-    hasPlatinumLicense === false
+    searchRelevanceSuggestionsActive === false
   ) {
     return null;
   }
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
index 3375b25cdcd6c..2c8fcfdbc54cd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/shared_columns.tsx
@@ -36,11 +36,8 @@ export const NAME_COLUMN: EuiTableFieldDataColumnType<EngineDetails> = {
   truncateText: true,
   mobileOptions: {
     header: true,
-    // Note: the below props are valid props per https://elastic.github.io/eui/#/tabular-content/tables (Responsive tables), but EUI's types have a bug reporting it as an error
-    // @ts-ignore
     enlarge: true,
     width: '100%',
-    truncateText: false,
   },
 };
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
index 29c226ca64f57..e11aaabb4fd95 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
@@ -312,6 +312,34 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
                     />
                   </EuiFormRow>
                 </EuiFlexItem>
+                <EuiFlexItem>
+                  <EuiFormRow
+                    label={
+                      <FormattedMessage
+                        id="xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDataRetentionLabel"
+                        defaultMessage="Data retention settings"
+                      />
+                    }
+                    helpText={
+                      <FormattedMessage
+                        id="xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDataRetentionText"
+                        defaultMessage="By default all logs and metrics data are stored on the hot tier. {learnMore} about changing the data retention policy for this integration."
+                        values={{
+                          learnMore: (
+                            <EuiLink href={docLinks.links.fleet.datastreamsILM} target="_blank">
+                              {i18n.translate(
+                                'xpack.fleet.createPackagePolicy.stepConfigure.packagePolicyDataRetentionLearnMoreLink',
+                                { defaultMessage: 'Learn more' }
+                              )}
+                            </EuiLink>
+                          ),
+                        }}
+                      />
+                    }
+                  >
+                    <div />
+                  </EuiFormRow>
+                </EuiFlexItem>
                 {/* Advanced vars */}
                 {advancedVars.map((varDef) => {
                   const { name: varName, type: varType } = varDef;
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.tsx b/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.tsx
index 48c8fa56fb91b..79175d241c29f 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/header/deployment_details.tsx
@@ -32,7 +32,8 @@ export const DeploymentDetails = () => {
     !(
       cname.endsWith('elastic-cloud.com') ||
       cname.endsWith('found.io') ||
-      cname.endsWith('found.no')
+      cname.endsWith('found.no') ||
+      cname.endsWith('foundit.no')
     )
   ) {
     return null;
diff --git a/x-pack/plugins/fleet/server/mocks/index.ts b/x-pack/plugins/fleet/server/mocks/index.ts
index e6577426974a3..9300e0bb6c3e1 100644
--- a/x-pack/plugins/fleet/server/mocks/index.ts
+++ b/x-pack/plugins/fleet/server/mocks/index.ts
@@ -114,7 +114,6 @@ export const createMockAgentService = (): jest.Mocked<AgentService> => {
   return {
     getAgentStatusById: jest.fn(),
     getAgentStatusForAgentPolicy: jest.fn(),
-    authenticateAgentWithAccessToken: jest.fn(),
     getAgent: jest.fn(),
     listAgents: jest.fn(),
   };
diff --git a/x-pack/plugins/fleet/server/plugin.ts b/x-pack/plugins/fleet/server/plugin.ts
index 8a95065380b69..410682a13733c 100644
--- a/x-pack/plugins/fleet/server/plugin.ts
+++ b/x-pack/plugins/fleet/server/plugin.ts
@@ -74,7 +74,6 @@ import {
 import {
   getAgentStatusById,
   getAgentStatusForAgentPolicy,
-  authenticateAgentWithAccessToken,
   getAgentsByKuery,
   getAgentById,
 } from './services/agents';
@@ -342,7 +341,6 @@ export class FleetPlugin
         listAgents: getAgentsByKuery,
         getAgentStatusById,
         getAgentStatusForAgentPolicy,
-        authenticateAgentWithAccessToken,
       },
       agentPolicyService: {
         get: agentPolicyService.get,
diff --git a/x-pack/plugins/fleet/server/services/agents/authenticate.test.ts b/x-pack/plugins/fleet/server/services/agents/authenticate.test.ts
deleted file mode 100644
index eaa240165e853..0000000000000
--- a/x-pack/plugins/fleet/server/services/agents/authenticate.test.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import type { KibanaRequest } from 'kibana/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
-
-import { authenticateAgentWithAccessToken } from './authenticate';
-
-describe('test agent autenticate services', () => {
-  it('should succeed with a valid API key and an active agent', async () => {
-    const mockEsClient = elasticsearchServiceMock.createInternalClient();
-
-    mockEsClient.search.mockResolvedValue({
-      body: {
-        hits: {
-          hits: [
-            {
-              // @ts-expect-error
-              _id: 'agent1',
-              _source: {
-                // @ts-expect-error
-                active: true,
-                // @ts-expect-error
-                access_api_key_id: 'pedTuHIBTEDt93wW0Fhr',
-              },
-            },
-          ],
-        },
-      },
-    });
-    await authenticateAgentWithAccessToken(mockEsClient, {
-      auth: { isAuthenticated: true },
-      headers: {
-        authorization: 'ApiKey cGVkVHVISUJURUR0OTN3VzBGaHI6TnU1U0JtbHJSeC12Rm9qQWpoSHlUZw==',
-      },
-    } as KibanaRequest);
-  });
-
-  it('should throw if the request is not authenticated', async () => {
-    const mockEsClient = elasticsearchServiceMock.createInternalClient();
-
-    mockEsClient.search.mockResolvedValue({
-      body: {
-        hits: {
-          hits: [
-            {
-              // @ts-expect-error
-              _id: 'agent1',
-              _source: {
-                // @ts-expect-error
-                active: true,
-                // @ts-expect-error
-                access_api_key_id: 'pedTuHIBTEDt93wW0Fhr',
-              },
-            },
-          ],
-        },
-      },
-    });
-    expect(
-      authenticateAgentWithAccessToken(mockEsClient, {
-        auth: { isAuthenticated: false },
-        headers: {
-          authorization: 'ApiKey cGVkVHVISUJURUR0OTN3VzBGaHI6TnU1U0JtbHJSeC12Rm9qQWpoSHlUZw==',
-        },
-      } as KibanaRequest)
-    ).rejects.toThrow(/Request not authenticated/);
-  });
-
-  it('should throw if the ApiKey headers is malformed', async () => {
-    const mockEsClient = elasticsearchServiceMock.createInternalClient();
-
-    const hits = [
-      {
-        _id: 'agent1',
-        _source: {
-          active: true,
-
-          access_api_key_id: 'pedTuHIBTEDt93wW0Fhr',
-        },
-      },
-    ];
-
-    mockEsClient.search.mockResolvedValue({
-      body: {
-        hits: {
-          // @ts-expect-error
-          hits,
-        },
-      },
-    });
-    expect(
-      authenticateAgentWithAccessToken(mockEsClient, {
-        auth: { isAuthenticated: true },
-        headers: {
-          authorization: 'aaaa',
-        },
-      } as KibanaRequest)
-    ).rejects.toThrow(/Authorization header is malformed/);
-  });
-
-  it('should throw if the agent is not active', async () => {
-    const mockEsClient = elasticsearchServiceMock.createInternalClient();
-
-    const hits = [
-      {
-        _id: 'agent1',
-        _source: {
-          active: false,
-          access_api_key_id: 'pedTuHIBTEDt93wW0Fhr',
-        },
-      },
-    ];
-    mockEsClient.search.mockResolvedValue({
-      body: {
-        hits: {
-          // @ts-expect-error
-          hits,
-        },
-      },
-    });
-    expect(
-      authenticateAgentWithAccessToken(mockEsClient, {
-        auth: { isAuthenticated: true },
-        headers: {
-          authorization: 'ApiKey cGVkVHVISUJURUR0OTN3VzBGaHI6TnU1U0JtbHJSeC12Rm9qQWpoSHlUZw==',
-        },
-      } as KibanaRequest)
-    ).rejects.toThrow(/Agent inactive/);
-  });
-
-  it('should throw if there is no agent matching the API key', async () => {
-    const mockEsClient = elasticsearchServiceMock.createInternalClient();
-
-    mockEsClient.search.mockResolvedValue({
-      body: {
-        hits: {
-          // @ts-expect-error
-          hits: [],
-        },
-      },
-    });
-    expect(
-      authenticateAgentWithAccessToken(mockEsClient, {
-        auth: { isAuthenticated: true },
-        headers: {
-          authorization: 'ApiKey cGVkVHVISUJURUR0OTN3VzBGaHI6TnU1U0JtbHJSeC12Rm9qQWpoSHlUZw==',
-        },
-      } as KibanaRequest)
-    ).rejects.toThrow(/Agent not found/);
-  });
-});
diff --git a/x-pack/plugins/fleet/server/services/agents/authenticate.ts b/x-pack/plugins/fleet/server/services/agents/authenticate.ts
deleted file mode 100644
index 0d0d520528dad..0000000000000
--- a/x-pack/plugins/fleet/server/services/agents/authenticate.ts
+++ /dev/null
@@ -1,34 +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 Boom from '@hapi/boom';
-import type { KibanaRequest } from 'src/core/server';
-import type { ElasticsearchClient } from 'src/core/server';
-
-import type { Agent } from '../../types';
-import * as APIKeyService from '../api_keys';
-
-import { getAgentByAccessAPIKeyId } from './crud';
-
-export async function authenticateAgentWithAccessToken(
-  esClient: ElasticsearchClient,
-  request: KibanaRequest
-): Promise<Agent> {
-  if (!request.auth.isAuthenticated) {
-    throw Boom.unauthorized('Request not authenticated');
-  }
-  let res: { apiKey: string; apiKeyId: string };
-  try {
-    res = APIKeyService.parseApiKeyFromHeaders(request.headers);
-  } catch (err) {
-    throw Boom.unauthorized(err.message);
-  }
-
-  const agent = await getAgentByAccessAPIKeyId(esClient, res.apiKeyId);
-
-  return agent;
-}
diff --git a/x-pack/plugins/fleet/server/services/agents/index.ts b/x-pack/plugins/fleet/server/services/agents/index.ts
index ede548c6fd60d..9b2846b68364e 100644
--- a/x-pack/plugins/fleet/server/services/agents/index.ts
+++ b/x-pack/plugins/fleet/server/services/agents/index.ts
@@ -12,5 +12,4 @@ export * from './crud';
 export * from './update';
 export * from './actions';
 export * from './reassign';
-export * from './authenticate';
 export * from './setup';
diff --git a/x-pack/plugins/fleet/server/services/index.ts b/x-pack/plugins/fleet/server/services/index.ts
index 0ec8a1452beb1..ab88e5af18efa 100644
--- a/x-pack/plugins/fleet/server/services/index.ts
+++ b/x-pack/plugins/fleet/server/services/index.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import type { KibanaRequest } from 'kibana/server';
 import type { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
 
-import type { AgentStatus, Agent } from '../types';
+import type { AgentStatus } from '../types';
 
 import type { GetAgentStatusResponse } from '../../common';
 
@@ -48,13 +47,6 @@ export interface AgentService {
    * Get an Agent by id
    */
   getAgent: typeof getAgentById;
-  /**
-   * Authenticate an agent with access toekn
-   */
-  authenticateAgentWithAccessToken(
-    esClient: ElasticsearchClient,
-    request: KibanaRequest
-  ): Promise<Agent>;
   /**
    * Return the status by the Agent's id
    */
diff --git a/x-pack/plugins/fleet/server/services/package_policy.test.ts b/x-pack/plugins/fleet/server/services/package_policy.test.ts
index c25a1db753c73..46747762213f1 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.test.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.test.ts
@@ -578,6 +578,12 @@ describe('Package policy service', () => {
   });
 
   describe('update', () => {
+    beforeEach(() => {
+      appContextService.start(createAppContextStartContractMock());
+    });
+    afterEach(() => {
+      appContextService.stop();
+    });
     it('should fail to update on version conflict', async () => {
       const savedObjectsClient = savedObjectsClientMock.create();
       savedObjectsClient.get.mockResolvedValue({
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index fa9df22eb5e8c..c03ccfc43ebd8 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -9,7 +9,7 @@ import { omit, partition } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import semverLte from 'semver/functions/lte';
 import { getFlattenedObject } from '@kbn/std';
-import type { KibanaRequest } from 'src/core/server';
+import type { KibanaRequest, LogMeta } from 'src/core/server';
 import type {
   ElasticsearchClient,
   RequestHandlerContext,
@@ -84,6 +84,17 @@ export const DATA_STREAM_ALLOWED_INDEX_PRIVILEGES = new Set([
   'read_cross_cluster',
 ]);
 
+interface PackagePolicyUpgradeLogMeta extends LogMeta {
+  package_policy_upgrade: {
+    package_name: string;
+    current_version: string;
+    new_version: string;
+    status: 'success' | 'failure';
+    error?: any[];
+    dryRun?: boolean;
+  };
+}
+
 class PackagePolicyService {
   public async create(
     soClient: SavedObjectsClientContract,
@@ -432,6 +443,23 @@ class PackagePolicyService {
         pkgName: packagePolicy.package.name,
         currentVersion: packagePolicy.package.version,
       });
+
+      const upgradeMeta: PackagePolicyUpgradeLogMeta = {
+        package_policy_upgrade: {
+          package_name: packagePolicy.package.name,
+          new_version: packagePolicy.package.version,
+          current_version: 'unknown',
+          status: 'success',
+          dryRun: false,
+        },
+      };
+
+      appContextService
+        .getLogger()
+        .info<PackagePolicyUpgradeLogMeta>(
+          `Package policy successfully upgraded ${JSON.stringify(upgradeMeta)}`,
+          upgradeMeta
+        );
     }
 
     return newPolicy;
@@ -661,6 +689,27 @@ class PackagePolicyService {
 
       const hasErrors = 'errors' in updatedPackagePolicy;
 
+      if (packagePolicy.package.version !== packageInfo.version) {
+        const upgradeMeta: PackagePolicyUpgradeLogMeta = {
+          package_policy_upgrade: {
+            package_name: packageInfo.name,
+            current_version: packagePolicy.package.version,
+            new_version: packageInfo.version,
+            status: hasErrors ? 'failure' : 'success',
+            error: hasErrors ? updatedPackagePolicy.errors : undefined,
+            dryRun: true,
+          },
+        };
+        appContextService
+          .getLogger()
+          .info<PackagePolicyUpgradeLogMeta>(
+            `Package policy upgrade dry run ${
+              hasErrors ? 'resulted in errors' : 'ran successfully'
+            } ${JSON.stringify(upgradeMeta)}`,
+            upgradeMeta
+          );
+      }
+
       return {
         name: updatedPackagePolicy.name,
         diff: [packagePolicy, updatedPackagePolicy],
diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
index 4576a2e8452ac..b1ea0ce21b3c1 100644
--- a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -5,37 +5,41 @@
  * 2.0.
  */
 
+import { estypes } from '@elastic/elasticsearch';
 import {
   IndicesExistsAlias,
   IndicesGet,
   MlGetBuckets,
 } from '@elastic/elasticsearch/api/requestParams';
 import { TransportRequestParams } from '@elastic/elasticsearch/lib/Transport';
-import { estypes } from '@elastic/elasticsearch';
-import { SavedObjectsClientContract, ElasticsearchClient } from 'src/core/server';
-import {
-  InfraRouteConfig,
-  InfraServerPluginSetupDeps,
-  CallWithRequestParams,
-  InfraDatabaseSearchResponse,
-  InfraDatabaseMultiResponse,
-  InfraDatabaseFieldCapsResponse,
-  InfraDatabaseGetIndicesResponse,
-  InfraDatabaseGetIndicesAliasResponse,
-} from './adapter_types';
-import { TSVBMetricModel } from '../../../../common/inventory_models/types';
+import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
 import {
   CoreSetup,
   IRouter,
   KibanaRequest,
+  RequestHandler,
   RouteMethod,
 } from '../../../../../../../src/core/server';
-import { RequestHandler } from '../../../../../../../src/core/server';
-import { InfraConfig } from '../../../plugin';
-import type { InfraPluginRequestHandlerContext } from '../../../types';
 import { UI_SETTINGS } from '../../../../../../../src/plugins/data/server';
 import { TimeseriesVisData } from '../../../../../../../src/plugins/vis_types/timeseries/server';
-import { InfraServerPluginStartDeps } from './adapter_types';
+import { TSVBMetricModel } from '../../../../common/inventory_models/types';
+import { InfraConfig } from '../../../plugin';
+import type { InfraPluginRequestHandlerContext } from '../../../types';
+import {
+  CallWithRequestParams,
+  InfraDatabaseFieldCapsResponse,
+  InfraDatabaseGetIndicesAliasResponse,
+  InfraDatabaseGetIndicesResponse,
+  InfraDatabaseMultiResponse,
+  InfraDatabaseSearchResponse,
+  InfraRouteConfig,
+  InfraServerPluginSetupDeps,
+  InfraServerPluginStartDeps,
+} from './adapter_types';
+
+interface FrozenIndexParams {
+  ignore_throttled?: boolean;
+}
 
 export class KibanaFramework {
   public router: IRouter<InfraPluginRequestHandlerContext>;
@@ -133,7 +137,7 @@ export class KibanaFramework {
   ) {
     const { elasticsearch, uiSettings } = requestContext.core;
 
-    const includeFrozen = await uiSettings.client.get(UI_SETTINGS.SEARCH_INCLUDE_FROZEN);
+    const includeFrozen = await uiSettings.client.get<boolean>(UI_SETTINGS.SEARCH_INCLUDE_FROZEN);
     if (endpoint === 'msearch') {
       const maxConcurrentShardRequests = await uiSettings.client.get(
         UI_SETTINGS.COURIER_MAX_CONCURRENT_SHARD_REQUESTS
@@ -143,11 +147,17 @@ export class KibanaFramework {
       }
     }
 
-    const frozenIndicesParams = ['search', 'msearch'].includes(endpoint)
-      ? {
-          ignore_throttled: !includeFrozen,
-        }
-      : {};
+    // Only set the "ignore_throttled" value (to false) if the Kibana setting
+    // for "search:includeFrozen" is true (i.e. don't ignore throttled indices, a triple negative!)
+    // More information:
+    // - https://github.com/elastic/kibana/issues/113197
+    // - https://github.com/elastic/elasticsearch/pull/77479
+    //
+    // NOTE: these params only need to be spread onto the search and msearch calls below
+    const frozenIndicesParams: FrozenIndexParams = {};
+    if (includeFrozen) {
+      frozenIndicesParams.ignore_throttled = false;
+    }
 
     let apiResult;
     switch (endpoint) {
@@ -166,37 +176,31 @@ export class KibanaFramework {
       case 'fieldCaps':
         apiResult = elasticsearch.client.asCurrentUser.fieldCaps({
           ...params,
-          ...frozenIndicesParams,
         });
         break;
       case 'indices.existsAlias':
         apiResult = elasticsearch.client.asCurrentUser.indices.existsAlias({
           ...params,
-          ...frozenIndicesParams,
         } as IndicesExistsAlias);
         break;
       case 'indices.getAlias':
         apiResult = elasticsearch.client.asCurrentUser.indices.getAlias({
           ...params,
-          ...frozenIndicesParams,
         });
         break;
       case 'indices.get':
         apiResult = elasticsearch.client.asCurrentUser.indices.get({
           ...params,
-          ...frozenIndicesParams,
         } as IndicesGet);
         break;
       case 'transport.request':
         apiResult = elasticsearch.client.asCurrentUser.transport.request({
           ...params,
-          ...frozenIndicesParams,
         } as TransportRequestParams);
         break;
       case 'ml.getBuckets':
         apiResult = elasticsearch.client.asCurrentUser.ml.getBuckets({
           ...params,
-          ...frozenIndicesParams,
         } as MlGetBuckets<any>);
         break;
     }
diff --git a/x-pack/plugins/lens/common/expressions/xy_chart/xy_args.ts b/x-pack/plugins/lens/common/expressions/xy_chart/xy_args.ts
index fb794eda22dbe..f00608135820a 100644
--- a/x-pack/plugins/lens/common/expressions/xy_chart/xy_args.ts
+++ b/x-pack/plugins/lens/common/expressions/xy_chart/xy_args.ts
@@ -12,8 +12,7 @@ import type { LayerArgs } from './layer_config';
 import type { LegendConfigResult } from './legend_config';
 import type { TickLabelsConfigResult } from './tick_labels_config';
 import type { LabelsOrientationConfigResult } from './labels_orientation_config';
-
-export type ValueLabelConfig = 'hide' | 'inside' | 'outside';
+import type { ValueLabelConfig } from '../../types';
 
 export type XYCurveType = 'LINEAR' | 'CURVE_MONOTONE_X';
 
diff --git a/x-pack/plugins/lens/common/types.ts b/x-pack/plugins/lens/common/types.ts
index 38e198c01e730..307ed856c7c66 100644
--- a/x-pack/plugins/lens/common/types.ts
+++ b/x-pack/plugins/lens/common/types.ts
@@ -62,3 +62,6 @@ export interface CustomPaletteParams {
 export type RequiredPaletteParamTypes = Required<CustomPaletteParams>;
 
 export type LayerType = 'data' | 'referenceLine';
+
+// Shared by XY Chart and Heatmap as for now
+export type ValueLabelConfig = 'hide' | 'inside' | 'outside';
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx b/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx
index 677cb9d20c25b..c999656071ef4 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx
+++ b/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx
@@ -288,6 +288,9 @@ export const HeatmapComponent: FC<HeatmapRenderProps> = ({
       maxHeight: 'fill',
       label: {
         visible: args.gridConfig.isCellLabelVisible ?? false,
+        minFontSize: 8,
+        maxFontSize: 18,
+        useGlobalMinFontSize: true, // override the min if there's a different directive upstream
       },
       border: {
         strokeWidth: 0,
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx b/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
index 80954516f0418..88966acd22691 100644
--- a/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
+++ b/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
@@ -10,7 +10,7 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { Position } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
 import type { VisualizationToolbarProps } from '../types';
-import { LegendSettingsPopover } from '../shared_components';
+import { LegendSettingsPopover, ToolbarPopover, ValueLabelsSettings } from '../shared_components';
 import type { HeatmapVisualizationState } from './types';
 
 const legendOptions: Array<{ id: string; value: 'auto' | 'show' | 'hide'; label: string }> = [
@@ -37,11 +37,29 @@ export const HeatmapToolbar = memo(
     const legendMode = state.legend.isVisible ? 'show' : 'hide';
 
     return (
-      <EuiFlexGroup gutterSize="m" justifyContent="spaceBetween">
+      <EuiFlexGroup gutterSize="m" justifyContent="spaceBetween" responsive={false}>
         <EuiFlexItem>
           <EuiFlexGroup gutterSize="none" responsive={false}>
+            <ToolbarPopover
+              title={i18n.translate('xpack.lens.shared.curveLabel', {
+                defaultMessage: 'Visual options',
+              })}
+              type="visualOptions"
+              groupPosition="left"
+              buttonDataTestSubj="lnsVisualOptionsButton"
+            >
+              <ValueLabelsSettings
+                valueLabels={state?.gridConfig.isCellLabelVisible ? 'inside' : 'hide'}
+                onValueLabelChange={(newMode) => {
+                  setState({
+                    ...state,
+                    gridConfig: { ...state.gridConfig, isCellLabelVisible: newMode === 'inside' },
+                  });
+                }}
+              />
+            </ToolbarPopover>
             <LegendSettingsPopover
-              groupPosition={'none'}
+              groupPosition={'right'}
               legendOptions={legendOptions}
               mode={legendMode}
               onDisplayChange={(optionId) => {
diff --git a/x-pack/plugins/lens/public/index.ts b/x-pack/plugins/lens/public/index.ts
index 84302f25d0a02..9be07a4f44dcd 100644
--- a/x-pack/plugins/lens/public/index.ts
+++ b/x-pack/plugins/lens/public/index.ts
@@ -22,11 +22,11 @@ export type {
   XYLayerConfig,
   LegendConfig,
   SeriesType,
-  ValueLabelConfig,
   YAxisMode,
   XYCurveType,
   YConfig,
 } from '../common/expressions';
+export type { ValueLabelConfig } from '../common/types';
 export type { DatatableVisualizationState } from './datatable_visualization/visualization';
 export type {
   IndexPatternPersistedState,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
index b85652481d5b2..2877094ac81f8 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.test.tsx
@@ -52,7 +52,7 @@ jest.mock('lodash', () => {
 
 const dataPluginMockValue = dataPluginMock.createStartContract();
 // need to overwrite the formatter field first
-dataPluginMockValue.fieldFormats.deserialize = jest.fn().mockImplementation(({ params }) => {
+dataPluginMockValue.fieldFormats.deserialize = jest.fn().mockImplementation(({ id, params }) => {
   return {
     convert: ({ gte, lt }: { gte: string; lt: string }) => {
       if (params?.id === 'custom') {
@@ -61,6 +61,9 @@ dataPluginMockValue.fieldFormats.deserialize = jest.fn().mockImplementation(({ p
       if (params?.id === 'bytes') {
         return `Bytes format: ${gte} - ${lt}`;
       }
+      if (!id) {
+        return 'Error';
+      }
       return `${gte} - ${lt}`;
     },
   };
@@ -476,6 +479,49 @@ describe('ranges', () => {
         expect(instance.find(DragDropBuckets).children).toHaveLength(1);
       });
 
+      it('should use the parentFormat to create the trigger label', () => {
+        const updateLayerSpy = jest.fn();
+
+        const instance = mount(
+          <InlineOptions
+            {...defaultOptions}
+            layer={layer}
+            updateLayer={updateLayerSpy}
+            columnId="col1"
+            currentColumn={layer.columns.col1 as RangeIndexPatternColumn}
+          />
+        );
+
+        expect(
+          instance.find('[data-test-subj="indexPattern-ranges-popover-trigger"]').first().text()
+        ).toBe('0 - 1000');
+      });
+
+      it('should not print error if the parentFormat is not provided', () => {
+        // while in the actual React implementation will print an error, here
+        // we intercept the formatter without an id assigned an print "Error"
+        const updateLayerSpy = jest.fn();
+
+        const instance = mount(
+          <InlineOptions
+            {...defaultOptions}
+            layer={layer}
+            updateLayer={updateLayerSpy}
+            columnId="col1"
+            currentColumn={
+              {
+                ...layer.columns.col1,
+                params: { ...layer.columns.col1.params, parentFormat: undefined },
+              } as RangeIndexPatternColumn
+            }
+          />
+        );
+
+        expect(
+          instance.find('[data-test-subj="indexPattern-ranges-popover-trigger"]').first().text()
+        ).not.toBe('Error');
+      });
+
       it('should add a new range', () => {
         const updateLayerSpy = jest.fn();
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
index 29e7de18ca4ad..6e397a926c7a0 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/ranges/ranges.tsx
@@ -196,7 +196,7 @@ export const rangeOperation: OperationDefinition<RangeIndexPatternColumn, 'field
       supportedFormats[numberFormat.id].decimalsToPattern(numberFormat.params?.decimals || 0);
 
     const rangeFormatter = data.fieldFormats.deserialize({
-      ...currentColumn.params.parentFormat,
+      ...(currentColumn.params.parentFormat || { id: 'range' }),
       params: {
         ...currentColumn.params.parentFormat?.params,
         ...(numberFormat
diff --git a/x-pack/plugins/lens/public/shared_components/index.ts b/x-pack/plugins/lens/public/shared_components/index.ts
index f947ce699dce4..f268d6816910e 100644
--- a/x-pack/plugins/lens/public/shared_components/index.ts
+++ b/x-pack/plugins/lens/public/shared_components/index.ts
@@ -14,4 +14,5 @@ export * from './coloring';
 export { useDebouncedValue } from './debounced_value';
 export * from './helpers';
 export { LegendActionPopover } from './legend_action_popover';
+export { ValueLabelsSettings } from './value_labels_settings';
 export * from './static_header';
diff --git a/x-pack/plugins/lens/public/shared_components/value_labels_settings.test.tsx b/x-pack/plugins/lens/public/shared_components/value_labels_settings.test.tsx
new file mode 100644
index 0000000000000..ae68a40d8cea6
--- /dev/null
+++ b/x-pack/plugins/lens/public/shared_components/value_labels_settings.test.tsx
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { shallowWithIntl as shallow } from '@kbn/test/jest';
+import { ValueLabelsSettings, VisualOptionsProps } from './value_labels_settings';
+
+describe('Value labels Settings', () => {
+  let props: VisualOptionsProps;
+  beforeEach(() => {
+    props = {
+      onValueLabelChange: jest.fn(),
+    };
+  });
+
+  it('should not render the component if not enabled', () => {
+    const component = shallow(<ValueLabelsSettings {...props} isVisible={false} />);
+    expect(component.find('[data-test-subj="lens-value-labels-visibility-btn"]').length).toEqual(0);
+  });
+
+  it('should set hide as default value', () => {
+    const component = shallow(<ValueLabelsSettings {...props} />);
+    expect(
+      component.find('[data-test-subj="lens-value-labels-visibility-btn"]').prop('idSelected')
+    ).toEqual(`value_labels_hide`);
+  });
+
+  it('should have called onValueLabelChange function on ButtonGroup change', () => {
+    const component = shallow(<ValueLabelsSettings {...props} />);
+    component
+      .find('[data-test-subj="lens-value-labels-visibility-btn"]')
+      .simulate('change', 'value_labels_inside');
+    expect(props.onValueLabelChange).toHaveBeenCalled();
+  });
+
+  it('should render the passed value if given', () => {
+    const component = shallow(<ValueLabelsSettings {...props} valueLabels="inside" />);
+    expect(
+      component.find('[data-test-subj="lens-value-labels-visibility-btn"]').prop('idSelected')
+    ).toEqual(`value_labels_inside`);
+  });
+});
diff --git a/x-pack/plugins/lens/public/shared_components/value_labels_settings.tsx b/x-pack/plugins/lens/public/shared_components/value_labels_settings.tsx
new file mode 100644
index 0000000000000..64d9f5475379a
--- /dev/null
+++ b/x-pack/plugins/lens/public/shared_components/value_labels_settings.tsx
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiButtonGroup, EuiFormRow } from '@elastic/eui';
+import { ValueLabelConfig } from '../../common/types';
+
+const valueLabelsOptions: Array<{
+  id: string;
+  value: ValueLabelConfig;
+  label: string;
+  'data-test-subj': string;
+}> = [
+  {
+    id: `value_labels_hide`,
+    value: 'hide',
+    label: i18n.translate('xpack.lens.shared.valueLabelsVisibility.auto', {
+      defaultMessage: 'Hide',
+    }),
+    'data-test-subj': 'lns_valueLabels_hide',
+  },
+  {
+    id: `value_labels_inside`,
+    value: 'inside',
+    label: i18n.translate('xpack.lens.shared.valueLabelsVisibility.inside', {
+      defaultMessage: 'Show',
+    }),
+    'data-test-subj': 'lns_valueLabels_inside',
+  },
+];
+
+export interface VisualOptionsProps {
+  isVisible?: boolean;
+  valueLabels?: ValueLabelConfig;
+  onValueLabelChange: (newMode: ValueLabelConfig) => void;
+}
+
+export const ValueLabelsSettings: FC<VisualOptionsProps> = ({
+  isVisible = true,
+  valueLabels = 'hide',
+  onValueLabelChange,
+}) => {
+  if (!isVisible) {
+    return null;
+  }
+  const label = i18n.translate('xpack.lens.shared.chartValueLabelVisibilityLabel', {
+    defaultMessage: 'Labels',
+  });
+  const isSelected =
+    valueLabelsOptions.find(({ value }) => value === valueLabels)?.id || 'value_labels_hide';
+  return (
+    <EuiFormRow display="columnCompressed" label={<span>{label}</span>}>
+      <EuiButtonGroup
+        isFullWidth
+        legend={label}
+        data-test-subj="lens-value-labels-visibility-btn"
+        name="valueLabelsDisplay"
+        buttonSize="compressed"
+        options={valueLabelsOptions}
+        idSelected={isSelected}
+        onChange={(modeId) => {
+          const newMode = valueLabelsOptions.find(({ id }) => id === modeId);
+          if (newMode) {
+            onValueLabelChange(newMode.value);
+          }
+        }}
+      />
+    </EuiFormRow>
+  );
+};
diff --git a/x-pack/plugins/lens/public/xy_visualization/types.ts b/x-pack/plugins/lens/public/xy_visualization/types.ts
index 4729cfb96f324..475571b2965f6 100644
--- a/x-pack/plugins/lens/public/xy_visualization/types.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/types.ts
@@ -20,7 +20,6 @@ import { LensIconChartLine } from '../assets/chart_line';
 import type { VisualizationType } from '../types';
 import type {
   SeriesType,
-  ValueLabelConfig,
   LegendConfig,
   AxisExtentConfig,
   XYLayerConfig,
@@ -29,6 +28,7 @@ import type {
   FittingFunction,
   LabelsOrientationConfig,
 } from '../../common/expressions';
+import type { ValueLabelConfig } from '../../common/types';
 
 // Persisted parts of the state
 export interface XYState {
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx
index 2a19897445e63..8ea6f9ace6320 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/index.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { ToolbarPopover, TooltipWrapper } from '../../../shared_components';
+import { ToolbarPopover, TooltipWrapper, ValueLabelsSettings } from '../../../shared_components';
 import { MissingValuesOptions } from './missing_values_option';
 import { LineCurveOption } from './line_curve_option';
 import { FillOpacityOption } from './fill_opacity_option';
@@ -102,14 +102,17 @@ export const VisualOptionsPopover: React.FC<VisualOptionsPopoverProps> = ({
           }}
         />
 
-        <MissingValuesOptions
-          isValueLabelsEnabled={isValueLabelsEnabled}
-          isFittingEnabled={isFittingEnabled}
-          valueLabels={state?.valueLabels}
-          fittingFunction={state?.fittingFunction}
+        <ValueLabelsSettings
+          isVisible={isValueLabelsEnabled}
+          valueLabels={state?.valueLabels ?? 'hide'}
           onValueLabelChange={(newMode) => {
             setState({ ...state, valueLabels: newMode });
           }}
+        />
+
+        <MissingValuesOptions
+          isFittingEnabled={isFittingEnabled}
+          fittingFunction={state?.fittingFunction}
           onFittingFnChange={(newVal) => {
             setState({ ...state, fittingFunction: newVal });
           }}
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_value_option.test.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_value_option.test.tsx
index 851b14839d7f7..ce4e05223b5a3 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_value_option.test.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_value_option.test.tsx
@@ -7,70 +7,23 @@
 
 import React from 'react';
 import { shallowWithIntl as shallow, mountWithIntl as mount } from '@kbn/test/jest';
-import { EuiSuperSelect, EuiButtonGroup } from '@elastic/eui';
+import { EuiSuperSelect } from '@elastic/eui';
 import { MissingValuesOptions } from './missing_values_option';
 
 describe('Missing values option', () => {
   it('should show currently selected fitting function', () => {
     const component = shallow(
-      <MissingValuesOptions
-        onFittingFnChange={jest.fn()}
-        onValueLabelChange={jest.fn()}
-        fittingFunction={'Carry'}
-        valueLabels={'hide'}
-      />
+      <MissingValuesOptions onFittingFnChange={jest.fn()} fittingFunction={'Carry'} />
     );
 
     expect(component.find(EuiSuperSelect).prop('valueOfSelected')).toEqual('Carry');
   });
 
-  it('should show currently selected value labels display setting', () => {
-    const component = mount(
-      <MissingValuesOptions
-        onFittingFnChange={jest.fn()}
-        onValueLabelChange={jest.fn()}
-        fittingFunction={'Carry'}
-        valueLabels={'inside'}
-      />
-    );
-
-    expect(component.find(EuiButtonGroup).prop('idSelected')).toEqual('value_labels_inside');
-  });
-
-  it('should show display field when enabled', () => {
-    const component = mount(
-      <MissingValuesOptions
-        onFittingFnChange={jest.fn()}
-        onValueLabelChange={jest.fn()}
-        fittingFunction={'Carry'}
-        valueLabels={'inside'}
-      />
-    );
-
-    expect(component.exists('[data-test-subj="lnsValueLabelsDisplay"]')).toEqual(true);
-  });
-
-  it('should hide in display value label option when disabled', () => {
-    const component = mount(
-      <MissingValuesOptions
-        onFittingFnChange={jest.fn()}
-        onValueLabelChange={jest.fn()}
-        fittingFunction={'Carry'}
-        valueLabels={'inside'}
-        isValueLabelsEnabled={false}
-      />
-    );
-
-    expect(component.exists('[data-test-subj="lnsValueLabelsDisplay"]')).toEqual(false);
-  });
-
   it('should show the fitting option when enabled', () => {
     const component = mount(
       <MissingValuesOptions
         onFittingFnChange={jest.fn()}
-        onValueLabelChange={jest.fn()}
         fittingFunction={'Carry'}
-        valueLabels={'inside'}
         isFittingEnabled={true}
       />
     );
@@ -82,9 +35,7 @@ describe('Missing values option', () => {
     const component = mount(
       <MissingValuesOptions
         onFittingFnChange={jest.fn()}
-        onValueLabelChange={jest.fn()}
         fittingFunction={'Carry'}
-        valueLabels={'inside'}
         isFittingEnabled={false}
       />
     );
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx
index b12e2d2f57112..a858d1c879efe 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/missing_values_option.tsx
@@ -7,85 +7,23 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiButtonGroup, EuiFormRow, EuiIconTip, EuiSuperSelect, EuiText } from '@elastic/eui';
+import { EuiFormRow, EuiIconTip, EuiSuperSelect, EuiText } from '@elastic/eui';
 import { fittingFunctionDefinitions } from '../../../../common/expressions';
-import type { FittingFunction, ValueLabelConfig } from '../../../../common/expressions';
+import type { FittingFunction } from '../../../../common/expressions';
 
 export interface MissingValuesOptionProps {
-  valueLabels?: ValueLabelConfig;
   fittingFunction?: FittingFunction;
-  onValueLabelChange: (newMode: ValueLabelConfig) => void;
   onFittingFnChange: (newMode: FittingFunction) => void;
-  isValueLabelsEnabled?: boolean;
   isFittingEnabled?: boolean;
 }
 
-const valueLabelsOptions: Array<{
-  id: string;
-  value: 'hide' | 'inside' | 'outside';
-  label: string;
-  'data-test-subj': string;
-}> = [
-  {
-    id: `value_labels_hide`,
-    value: 'hide',
-    label: i18n.translate('xpack.lens.xyChart.valueLabelsVisibility.auto', {
-      defaultMessage: 'Hide',
-    }),
-    'data-test-subj': 'lnsXY_valueLabels_hide',
-  },
-  {
-    id: `value_labels_inside`,
-    value: 'inside',
-    label: i18n.translate('xpack.lens.xyChart.valueLabelsVisibility.inside', {
-      defaultMessage: 'Show',
-    }),
-    'data-test-subj': 'lnsXY_valueLabels_inside',
-  },
-];
-
 export const MissingValuesOptions: React.FC<MissingValuesOptionProps> = ({
-  onValueLabelChange,
   onFittingFnChange,
-  valueLabels,
   fittingFunction,
-  isValueLabelsEnabled = true,
   isFittingEnabled = true,
 }) => {
-  const valueLabelsVisibilityMode = valueLabels || 'hide';
-
   return (
     <>
-      {isValueLabelsEnabled && (
-        <EuiFormRow
-          display="columnCompressed"
-          label={
-            <span>
-              {i18n.translate('xpack.lens.shared.chartValueLabelVisibilityLabel', {
-                defaultMessage: 'Labels',
-              })}
-            </span>
-          }
-        >
-          <EuiButtonGroup
-            isFullWidth
-            legend={i18n.translate('xpack.lens.shared.chartValueLabelVisibilityLabel', {
-              defaultMessage: 'Labels',
-            })}
-            data-test-subj="lnsValueLabelsDisplay"
-            name="valueLabelsDisplay"
-            buttonSize="compressed"
-            options={valueLabelsOptions}
-            idSelected={
-              valueLabelsOptions.find(({ value }) => value === valueLabelsVisibilityMode)!.id
-            }
-            onChange={(modeId) => {
-              const newMode = valueLabelsOptions.find(({ id }) => id === modeId)!.value;
-              onValueLabelChange(newMode);
-            }}
-          />
-        </EuiFormRow>
-      )}
       {isFittingEnabled && (
         <EuiFormRow
           display="columnCompressed"
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/visual_options_popover.test.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/visual_options_popover.test.tsx
index 0136612c46705..6b48738e22a60 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/visual_options_popover.test.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel/visual_options_popover/visual_options_popover.test.tsx
@@ -12,7 +12,7 @@ import type { FramePublicAPI } from '../../../types';
 import { createMockDatasource, createMockFramePublicAPI } from '../../../mocks';
 import { State } from '../../types';
 import { VisualOptionsPopover } from '.';
-import { ToolbarPopover } from '../../../shared_components';
+import { ToolbarPopover, ValueLabelsSettings } from '../../../shared_components';
 import { MissingValuesOptions } from './missing_values_option';
 import { FillOpacityOption } from './fill_opacity_option';
 import { layerTypes } from '../../../../common';
@@ -73,7 +73,7 @@ describe('Visual options popover', () => {
       />
     );
 
-    expect(component.find(MissingValuesOptions).prop('isValueLabelsEnabled')).toEqual(false);
+    expect(component.find(ValueLabelsSettings).prop('isVisible')).toEqual(false);
     expect(component.find(MissingValuesOptions).prop('isFittingEnabled')).toEqual(false);
   });
 
@@ -196,7 +196,7 @@ describe('Visual options popover', () => {
       />
     );
 
-    expect(component.find(MissingValuesOptions).prop('isValueLabelsEnabled')).toEqual(true);
+    expect(component.find(ValueLabelsSettings).prop('isVisible')).toEqual(true);
   });
 
   it('should hide in the popover the display option for area and line series', () => {
@@ -213,7 +213,7 @@ describe('Visual options popover', () => {
       />
     );
 
-    expect(component.find(MissingValuesOptions).prop('isValueLabelsEnabled')).toEqual(false);
+    expect(component.find(ValueLabelsSettings).prop('isVisible')).toEqual(false);
   });
 
   it('should keep the display option for bar series with multiple layers', () => {
@@ -245,6 +245,6 @@ describe('Visual options popover', () => {
       />
     );
 
-    expect(component.find(MissingValuesOptions).prop('isValueLabelsEnabled')).toEqual(true);
+    expect(component.find(ValueLabelsSettings).prop('isVisible')).toEqual(true);
   });
 });
diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
index b6b3e636fffeb..42c5b70514000 100644
--- a/x-pack/plugins/maps/common/constants.ts
+++ b/x-pack/plugins/maps/common/constants.ts
@@ -47,14 +47,7 @@ export const CHECK_IS_DRAWING_INDEX = `/${GIS_API_PATH}/checkIsDrawingIndex`;
 
 export const MVT_GETTILE_API_PATH = 'mvt/getTile';
 export const MVT_GETGRIDTILE_API_PATH = 'mvt/getGridTile';
-export const MVT_SOURCE_LAYER_NAME = 'source_layer';
-// Identifies vector tile "too many features" feature.
-// "too many features" feature is a box showing area that contains too many features for single ES search response
-export const KBN_METADATA_FEATURE = '__kbn_metadata_feature__';
-export const KBN_FEATURE_COUNT = '__kbn_feature_count__';
-export const KBN_IS_TILE_COMPLETE = '__kbn_is_tile_complete__';
-export const KBN_VECTOR_SHAPE_TYPE_COUNTS = '__kbn_vector_shape_type_counts__';
-export const KBN_TOO_MANY_FEATURES_IMAGE_ID = '__kbn_too_many_features_image_id__';
+
 // Identifies centroid feature.
 // Centroids are a single point for representing lines, multiLines, polygons, and multiPolygons
 export const KBN_IS_CENTROID_FEATURE = '__kbn_is_centroid_feature__';
@@ -119,7 +112,6 @@ export const DEFAULT_MAX_RESULT_WINDOW = 10000;
 export const DEFAULT_MAX_INNER_RESULT_WINDOW = 100;
 export const DEFAULT_MAX_BUCKETS_LIMIT = 65535;
 
-export const FEATURE_ID_PROPERTY_NAME = '__kbn__feature_id__';
 export const FEATURE_VISIBLE_PROPERTY_NAME = '__kbn_isvisibleduetojoin__';
 
 export const MB_SOURCE_ID_LAYER_ID_PREFIX_DELIMITER = '_';
diff --git a/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts
index 244ebc59efd17..8f681cc9de70d 100644
--- a/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/layer_descriptor_types.ts
@@ -10,21 +10,13 @@
 import { Query } from 'src/plugins/data/public';
 import { Feature } from 'geojson';
 import {
-  FieldMeta,
   HeatmapStyleDescriptor,
   StyleDescriptor,
   VectorStyleDescriptor,
 } from './style_property_descriptor_types';
 import { DataRequestDescriptor } from './data_request_descriptor_types';
 import { AbstractSourceDescriptor, TermJoinSourceDescriptor } from './source_descriptor_types';
-import { VectorShapeTypeCounts } from '../get_geometry_counts';
-import {
-  KBN_FEATURE_COUNT,
-  KBN_IS_TILE_COMPLETE,
-  KBN_METADATA_FEATURE,
-  KBN_VECTOR_SHAPE_TYPE_COUNTS,
-  LAYER_TYPE,
-} from '../constants';
+import { LAYER_TYPE } from '../constants';
 
 export type Attribution = {
   label: string;
@@ -38,11 +30,8 @@ export type JoinDescriptor = {
 
 export type TileMetaFeature = Feature & {
   properties: {
-    [KBN_METADATA_FEATURE]: true;
-    [KBN_IS_TILE_COMPLETE]: boolean;
-    [KBN_FEATURE_COUNT]: number;
-    [KBN_VECTOR_SHAPE_TYPE_COUNTS]: VectorShapeTypeCounts;
-    fieldMeta?: FieldMeta;
+    'hits.total.relation': string;
+    'hits.total.value': number;
   };
 };
 
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/index.ts b/x-pack/plugins/maps/common/elasticsearch_util/index.ts
index 7073a4201f7a5..6febb237cdda7 100644
--- a/x-pack/plugins/maps/common/elasticsearch_util/index.ts
+++ b/x-pack/plugins/maps/common/elasticsearch_util/index.ts
@@ -6,7 +6,6 @@
  */
 
 export * from './es_agg_utils';
-export * from './convert_to_geojson';
 export * from './elasticsearch_geo_utils';
 export * from './spatial_filter_utils';
 export * from './types';
diff --git a/x-pack/plugins/maps/common/get_geometry_counts.ts b/x-pack/plugins/maps/common/get_geometry_counts.ts
deleted file mode 100644
index 2a3368560c762..0000000000000
--- a/x-pack/plugins/maps/common/get_geometry_counts.ts
+++ /dev/null
@@ -1,45 +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 { Feature } from 'geojson';
-import { GEO_JSON_TYPE, VECTOR_SHAPE_TYPE } from './constants';
-
-export interface VectorShapeTypeCounts {
-  [VECTOR_SHAPE_TYPE.POINT]: number;
-  [VECTOR_SHAPE_TYPE.LINE]: number;
-  [VECTOR_SHAPE_TYPE.POLYGON]: number;
-}
-
-export function countVectorShapeTypes(features: Feature[]): VectorShapeTypeCounts {
-  const vectorShapeTypeCounts: VectorShapeTypeCounts = {
-    [VECTOR_SHAPE_TYPE.POINT]: 0,
-    [VECTOR_SHAPE_TYPE.LINE]: 0,
-    [VECTOR_SHAPE_TYPE.POLYGON]: 0,
-  };
-
-  for (let i = 0; i < features.length; i++) {
-    const feature: Feature = features[i];
-    if (
-      feature.geometry.type === GEO_JSON_TYPE.POINT ||
-      feature.geometry.type === GEO_JSON_TYPE.MULTI_POINT
-    ) {
-      vectorShapeTypeCounts[VECTOR_SHAPE_TYPE.POINT] += 1;
-    } else if (
-      feature.geometry.type === GEO_JSON_TYPE.LINE_STRING ||
-      feature.geometry.type === GEO_JSON_TYPE.MULTI_LINE_STRING
-    ) {
-      vectorShapeTypeCounts[VECTOR_SHAPE_TYPE.LINE] += 1;
-    } else if (
-      feature.geometry.type === GEO_JSON_TYPE.POLYGON ||
-      feature.geometry.type === GEO_JSON_TYPE.MULTI_POLYGON
-    ) {
-      vectorShapeTypeCounts[VECTOR_SHAPE_TYPE.POLYGON] += 1;
-    }
-  }
-
-  return vectorShapeTypeCounts;
-}
diff --git a/x-pack/plugins/maps/common/pluck_category_field_meta.ts b/x-pack/plugins/maps/common/pluck_category_field_meta.ts
deleted file mode 100644
index c71316f864a84..0000000000000
--- a/x-pack/plugins/maps/common/pluck_category_field_meta.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Feature } from 'geojson';
-import { CategoryFieldMeta } from './descriptor_types';
-
-export function pluckCategoryFieldMeta(
-  features: Feature[],
-  name: string,
-  size: number
-): CategoryFieldMeta | null {
-  const counts = new Map();
-  for (let i = 0; i < features.length; i++) {
-    const feature = features[i];
-    const term = feature.properties ? feature.properties[name] : undefined;
-    // properties object may be sparse, so need to check if the field is effectively present
-    if (typeof term !== undefined) {
-      if (counts.has(term)) {
-        counts.set(term, counts.get(term) + 1);
-      } else {
-        counts.set(term, 1);
-      }
-    }
-  }
-
-  return trimCategories(counts, size);
-}
-
-export function trimCategories(counts: Map<string, number>, size: number): CategoryFieldMeta {
-  const ordered = [];
-  for (const [key, value] of counts) {
-    ordered.push({ key, count: value });
-  }
-
-  ordered.sort((a, b) => {
-    return b.count - a.count;
-  });
-  const truncated = ordered.slice(0, size);
-  return {
-    categories: truncated,
-  } as CategoryFieldMeta;
-}
diff --git a/x-pack/plugins/maps/common/pluck_range_field_meta.ts b/x-pack/plugins/maps/common/pluck_range_field_meta.ts
deleted file mode 100644
index b0bf03896892f..0000000000000
--- a/x-pack/plugins/maps/common/pluck_range_field_meta.ts
+++ /dev/null
@@ -1,34 +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 { Feature } from 'geojson';
-import { RangeFieldMeta } from './descriptor_types';
-
-export function pluckRangeFieldMeta(
-  features: Feature[],
-  name: string,
-  parseValue: (rawValue: unknown) => number
-): RangeFieldMeta | null {
-  let min = Infinity;
-  let max = -Infinity;
-  for (let i = 0; i < features.length; i++) {
-    const feature = features[i];
-    const newValue = feature.properties ? parseValue(feature.properties[name]) : NaN;
-    if (!isNaN(newValue)) {
-      min = Math.min(min, newValue);
-      max = Math.max(max, newValue);
-    }
-  }
-
-  return min === Infinity || max === -Infinity
-    ? null
-    : ({
-        min,
-        max,
-        delta: max - min,
-      } as RangeFieldMeta);
-}
diff --git a/x-pack/plugins/maps/public/actions/data_request_actions.ts b/x-pack/plugins/maps/public/actions/data_request_actions.ts
index b912e8c52e680..c1a6d05cc0577 100644
--- a/x-pack/plugins/maps/public/actions/data_request_actions.ts
+++ b/x-pack/plugins/maps/public/actions/data_request_actions.ts
@@ -282,10 +282,10 @@ function endDataLoad(
 
     if (dataId === SOURCE_DATA_REQUEST_ID) {
       const features = data && 'features' in data ? (data as FeatureCollection).features : [];
+      const layer = getLayerById(layerId, getState());
 
       const eventHandlers = getEventHandlers(getState());
       if (eventHandlers && eventHandlers.onDataLoadEnd) {
-        const layer = getLayerById(layerId, getState());
         const resultMeta: ResultMeta = {};
         if (layer && layer.getType() === LAYER_TYPE.VECTOR) {
           const featuresWithoutCentroids = features.filter((feature) => {
@@ -301,7 +301,9 @@ function endDataLoad(
         });
       }
 
-      dispatch(updateTooltipStateForLayer(layerId, features));
+      if (layer) {
+        dispatch(updateTooltipStateForLayer(layer, features));
+      }
     }
 
     dispatch({
@@ -344,7 +346,10 @@ function onDataLoadError(
         });
       }
 
-      dispatch(updateTooltipStateForLayer(layerId));
+      const layer = getLayerById(layerId, getState());
+      if (layer) {
+        dispatch(updateTooltipStateForLayer(layer));
+      }
     }
 
     dispatch({
@@ -359,7 +364,10 @@ function onDataLoadError(
 }
 
 export function updateSourceDataRequest(layerId: string, newData: object) {
-  return (dispatch: ThunkDispatch<MapStoreState, void, AnyAction>) => {
+  return (
+    dispatch: ThunkDispatch<MapStoreState, void, AnyAction>,
+    getState: () => MapStoreState
+  ) => {
     dispatch({
       type: UPDATE_SOURCE_DATA_REQUEST,
       dataId: SOURCE_DATA_REQUEST_ID,
@@ -368,7 +376,10 @@ export function updateSourceDataRequest(layerId: string, newData: object) {
     });
 
     if ('features' in newData) {
-      dispatch(updateTooltipStateForLayer(layerId, (newData as FeatureCollection).features));
+      const layer = getLayerById(layerId, getState());
+      if (layer) {
+        dispatch(updateTooltipStateForLayer(layer, (newData as FeatureCollection).features));
+      }
     }
 
     dispatch(updateStyleMeta(layerId));
diff --git a/x-pack/plugins/maps/public/actions/layer_actions.ts b/x-pack/plugins/maps/public/actions/layer_actions.ts
index 9e937d86515e2..c9254df40bcf1 100644
--- a/x-pack/plugins/maps/public/actions/layer_actions.ts
+++ b/x-pack/plugins/maps/public/actions/layer_actions.ts
@@ -51,6 +51,7 @@ import {
 } from '../../common/descriptor_types';
 import { ILayer } from '../classes/layers/layer';
 import { IVectorLayer } from '../classes/layers/vector_layer';
+import { OnSourceChangeArgs } from '../classes/sources/source';
 import { DRAW_MODE, LAYER_STYLE_TYPE, LAYER_TYPE } from '../../common/constants';
 import { IVectorStyle } from '../classes/styles/vector/vector_style';
 import { notifyLicensedFeatureUsage } from '../licensed_features';
@@ -217,7 +218,7 @@ export function setLayerVisibility(layerId: string, makeVisible: boolean) {
     }
 
     if (!makeVisible) {
-      dispatch(updateTooltipStateForLayer(layerId));
+      dispatch(updateTooltipStateForLayer(layer));
     }
 
     dispatch({
@@ -323,18 +324,17 @@ function updateMetricsProp(layerId: string, value: unknown) {
   ) => {
     const layer = getLayerById(layerId, getState());
     const previousFields = await (layer as IVectorLayer).getFields();
-    await dispatch({
+    dispatch({
       type: UPDATE_SOURCE_PROP,
       layerId,
       propName: 'metrics',
       value,
     });
     await dispatch(updateStyleProperties(layerId, previousFields as IESAggField[]));
-    dispatch(syncDataForLayerId(layerId, false));
   };
 }
 
-export function updateSourceProp(
+function updateSourcePropWithoutSync(
   layerId: string,
   propName: string,
   value: unknown,
@@ -356,6 +356,28 @@ export function updateSourceProp(
     if (newLayerType) {
       dispatch(updateLayerType(layerId, newLayerType));
     }
+  };
+}
+
+export function updateSourceProp(
+  layerId: string,
+  propName: string,
+  value: unknown,
+  newLayerType?: LAYER_TYPE
+) {
+  return async (dispatch: ThunkDispatch<MapStoreState, void, AnyAction>) => {
+    await dispatch(updateSourcePropWithoutSync(layerId, propName, value, newLayerType));
+    dispatch(syncDataForLayerId(layerId, false));
+  };
+}
+
+export function updateSourceProps(layerId: string, sourcePropChanges: OnSourceChangeArgs[]) {
+  return async (dispatch: ThunkDispatch<MapStoreState, void, AnyAction>) => {
+    // Using for loop to ensure update completes before starting next update
+    for (let i = 0; i < sourcePropChanges.length; i++) {
+      const { propName, value, newLayerType } = sourcePropChanges[i];
+      await dispatch(updateSourcePropWithoutSync(layerId, propName, value, newLayerType));
+    }
     dispatch(syncDataForLayerId(layerId, false));
   };
 }
@@ -504,7 +526,7 @@ function removeLayerFromLayerList(layerId: string) {
     layerGettingRemoved.getInFlightRequestTokens().forEach((requestToken) => {
       dispatch(cancelRequest(requestToken));
     });
-    dispatch(updateTooltipStateForLayer(layerId));
+    dispatch(updateTooltipStateForLayer(layerGettingRemoved));
     layerGettingRemoved.destroy();
     dispatch({
       type: REMOVE_LAYER,
diff --git a/x-pack/plugins/maps/public/actions/map_actions.ts b/x-pack/plugins/maps/public/actions/map_actions.ts
index cf1e22ab90f88..d921f9748f65c 100644
--- a/x-pack/plugins/maps/public/actions/map_actions.ts
+++ b/x-pack/plugins/maps/public/actions/map_actions.ts
@@ -63,7 +63,7 @@ import { INITIAL_LOCATION } from '../../common/constants';
 import { updateTooltipStateForLayer } from './tooltip_actions';
 import { VectorLayer } from '../classes/layers/vector_layer';
 import { SET_DRAW_MODE } from './ui_actions';
-import { expandToTileBoundaries } from '../../common/geo_tile_utils';
+import { expandToTileBoundaries } from '../classes/util/geo_tile_utils';
 import { getToasts } from '../kibana_services';
 
 export function setMapInitError(errorMessage: string) {
@@ -171,7 +171,7 @@ export function mapExtentChanged(mapExtentState: MapExtentState) {
     if (prevZoom !== nextZoom) {
       getLayerList(getState()).map((layer) => {
         if (!layer.showAtZoomLevel(nextZoom)) {
-          dispatch(updateTooltipStateForLayer(layer.getId()));
+          dispatch(updateTooltipStateForLayer(layer));
         }
       });
     }
diff --git a/x-pack/plugins/maps/public/actions/tooltip_actions.ts b/x-pack/plugins/maps/public/actions/tooltip_actions.ts
index 67b6842caeb46..30213510c8be4 100644
--- a/x-pack/plugins/maps/public/actions/tooltip_actions.ts
+++ b/x-pack/plugins/maps/public/actions/tooltip_actions.ts
@@ -10,9 +10,11 @@ import { Dispatch } from 'redux';
 import { Feature } from 'geojson';
 import { getOpenTooltips } from '../selectors/map_selectors';
 import { SET_OPEN_TOOLTIPS } from './map_action_constants';
-import { FEATURE_ID_PROPERTY_NAME, FEATURE_VISIBLE_PROPERTY_NAME } from '../../common/constants';
+import { FEATURE_VISIBLE_PROPERTY_NAME } from '../../common/constants';
 import { TooltipFeature, TooltipState } from '../../common/descriptor_types';
 import { MapStoreState } from '../reducers/store';
+import { ILayer } from '../classes/layers/layer';
+import { IVectorLayer, getFeatureId, isVectorLayer } from '../classes/layers/vector_layer';
 
 export function closeOnClickTooltip(tooltipId: string) {
   return (dispatch: Dispatch, getState: () => MapStoreState) => {
@@ -62,13 +64,17 @@ export function openOnHoverTooltip(tooltipState: TooltipState) {
   };
 }
 
-export function updateTooltipStateForLayer(layerId: string, layerFeatures: Feature[] = []) {
+export function updateTooltipStateForLayer(layer: ILayer, layerFeatures: Feature[] = []) {
   return (dispatch: Dispatch, getState: () => MapStoreState) => {
+    if (!isVectorLayer(layer)) {
+      return;
+    }
+
     const openTooltips = getOpenTooltips(getState())
       .map((tooltipState) => {
         const nextFeatures: TooltipFeature[] = [];
         tooltipState.features.forEach((tooltipFeature) => {
-          if (tooltipFeature.layerId !== layerId) {
+          if (tooltipFeature.layerId !== layer.getId()) {
             // feature from another layer, keep it
             nextFeatures.push(tooltipFeature);
           }
@@ -79,7 +85,8 @@ export function updateTooltipStateForLayer(layerId: string, layerFeatures: Featu
                 ? layerFeature.properties![FEATURE_VISIBLE_PROPERTY_NAME]
                 : true;
             return (
-              isVisible && layerFeature.properties![FEATURE_ID_PROPERTY_NAME] === tooltipFeature.id
+              isVisible &&
+              getFeatureId(layerFeature, (layer as IVectorLayer).getSource()) === tooltipFeature.id
             );
           });
 
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
index 70d5cea6e4620..acfe6a9055eb6 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
@@ -34,6 +34,10 @@ export class AggField extends CountAggField {
     return !!this._esDocField;
   }
 
+  getMbFieldName(): string {
+    return this._source.isMvt() ? this.getName() + '.value' : this.getName();
+  }
+
   supportsFieldMeta(): boolean {
     // count and sum aggregations are not within field bounds so they do not support field meta.
     return !isMetricCountable(this._getAggType());
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
index 3bd26666005a6..b303dbc342bb2 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
@@ -43,6 +43,10 @@ export class CountAggField implements IESAggField {
     return this._source.getAggKey(this._getAggType(), this.getRootName());
   }
 
+  getMbFieldName(): string {
+    return this._source.isMvt() ? '_count' : this.getName();
+  }
+
   getRootName(): string {
     return '';
   }
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts
index f6cdcf43fe343..227084bfe0cad 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts
@@ -23,6 +23,10 @@ export class TopTermPercentageField implements IESAggField {
     return this._topTermAggField.getSource();
   }
 
+  getMbFieldName(): string {
+    return this.getName();
+  }
+
   getOrigin(): FIELD_ORIGIN {
     return this._topTermAggField.getOrigin();
   }
diff --git a/x-pack/plugins/maps/public/classes/fields/field.ts b/x-pack/plugins/maps/public/classes/fields/field.ts
index 586f9f74da8ac..014d75caf90b6 100644
--- a/x-pack/plugins/maps/public/classes/fields/field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/field.ts
@@ -11,6 +11,7 @@ import { ITooltipProperty, TooltipProperty } from '../tooltips/tooltip_property'
 
 export interface IField {
   getName(): string;
+  getMbFieldName(): string;
   getRootName(): string;
   canValueBeFormatted(): boolean;
   getLabel(): Promise<string>;
@@ -50,6 +51,10 @@ export class AbstractField implements IField {
     return this._fieldName;
   }
 
+  getMbFieldName(): string {
+    return this.getName();
+  }
+
   getRootName(): string {
     return this.getName();
   }
diff --git a/x-pack/plugins/maps/public/classes/layers/layer.tsx b/x-pack/plugins/maps/public/classes/layers/layer.tsx
index e1043a33f28ad..051115a072608 100644
--- a/x-pack/plugins/maps/public/classes/layers/layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/layer.tsx
@@ -63,13 +63,18 @@ export interface ILayer {
   getStyleForEditing(): IStyle;
   getCurrentStyle(): IStyle;
   getImmutableSourceProperties(): Promise<ImmutableSourceProperty[]>;
-  renderSourceSettingsEditor({ onChange }: SourceEditorArgs): ReactElement<any> | null;
+  renderSourceSettingsEditor(sourceEditorArgs: SourceEditorArgs): ReactElement<any> | null;
   isLayerLoading(): boolean;
   isLoadingBounds(): boolean;
   isFilteredByGlobalTime(): Promise<boolean>;
   hasErrors(): boolean;
   getErrors(): string;
+
+  /*
+   * ILayer.getMbLayerIds returns a list of all mapbox layers assoicated with this layer.
+   */
   getMbLayerIds(): string[];
+
   ownsMbLayerId(mbLayerId: string): boolean;
   ownsMbSourceId(mbSourceId: string): boolean;
   syncLayerWithMB(mbMap: MbMap, timeslice?: Timeslice): void;
@@ -77,7 +82,7 @@ export interface ILayer {
   isInitialDataLoadComplete(): boolean;
   getIndexPatternIds(): string[];
   getQueryableIndexPatternIds(): string[];
-  getType(): LAYER_TYPE | undefined;
+  getType(): LAYER_TYPE;
   isVisible(): boolean;
   cloneDescriptor(): Promise<LayerDescriptor>;
   renderStyleEditor(
@@ -325,9 +330,8 @@ export class AbstractLayer implements ILayer {
     return await source.getImmutableProperties();
   }
 
-  renderSourceSettingsEditor({ onChange }: SourceEditorArgs) {
-    const source = this.getSourceForEditing();
-    return source.renderSourceSettingsEditor({ onChange, currentLayerType: this._descriptor.type });
+  renderSourceSettingsEditor(sourceEditorArgs: SourceEditorArgs) {
+    return this.getSourceForEditing().renderSourceSettingsEditor(sourceEditorArgs);
   }
 
   getPrevRequestToken(dataId: string): symbol | undefined {
@@ -437,7 +441,7 @@ export class AbstractLayer implements ILayer {
     mbMap.setLayoutProperty(mbLayerId, 'visibility', this.isVisible() ? 'visible' : 'none');
   }
 
-  getType(): LAYER_TYPE | undefined {
+  getType(): LAYER_TYPE {
     return this._descriptor.type as LAYER_TYPE;
   }
 
diff --git a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/__snapshots__/tiled_vector_layer.test.tsx.snap b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/__snapshots__/tiled_vector_layer.test.tsx.snap
index d3b96936a85a1..8b4911342f841 100644
--- a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/__snapshots__/tiled_vector_layer.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/__snapshots__/tiled_vector_layer.test.tsx.snap
@@ -1,9 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`icon should use no data icon 1`] = `
-<span
-  color="subdued"
-  data-euiicon-type="minusInCircle"
-  size="m"
+exports[`getCustomIconAndTooltipContent Layers with non-elasticsearch sources should display icon 1`] = `
+<PolygonIcon
+  style={
+    Object {
+      "fill": "#54B399",
+      "stroke": "#41937c",
+      "strokeWidth": "1px",
+    }
+  }
 />
 `;
diff --git a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.test.tsx b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.test.tsx
index e1f134cdf2a85..fd78ea2ebde59 100644
--- a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.test.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.test.tsx
@@ -95,8 +95,8 @@ describe('visiblity', () => {
   });
 });
 
-describe('icon', () => {
-  it('should use no data icon', async () => {
+describe('getCustomIconAndTooltipContent', () => {
+  it('Layers with non-elasticsearch sources should display icon', async () => {
     const layer: TiledVectorLayer = createLayer({}, {});
 
     const iconAndTooltipContent = layer.getCustomIconAndTooltipContent();
diff --git a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx
index 9b5298685865a..ece57af7b54ce 100644
--- a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx
@@ -7,39 +7,44 @@
 
 import type {
   Map as MbMap,
+  AnyLayer as MbLayer,
   GeoJSONSource as MbGeoJSONSource,
   VectorSource as MbVectorSource,
 } from '@kbn/mapbox-gl';
 import { Feature } from 'geojson';
+import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
 import { parse as parseUrl } from 'url';
-import { i18n } from '@kbn/i18n';
+import { euiThemeVars } from '@kbn/ui-shared-deps-src/theme';
 import { IVectorStyle, VectorStyle } from '../../styles/vector/vector_style';
+import { LAYER_TYPE, SOURCE_DATA_REQUEST_ID, SOURCE_TYPES } from '../../../../common/constants';
 import {
-  KBN_FEATURE_COUNT,
-  KBN_IS_TILE_COMPLETE,
-  KBN_METADATA_FEATURE,
-  LAYER_TYPE,
-  SOURCE_DATA_REQUEST_ID,
-} from '../../../../common/constants';
-import {
+  NO_RESULTS_ICON_AND_TOOLTIPCONTENT,
   VectorLayer,
   VectorLayerArguments,
-  NO_RESULTS_ICON_AND_TOOLTIPCONTENT,
 } from '../vector_layer';
 import { ITiledSingleLayerVectorSource } from '../../sources/tiled_single_layer_vector_source';
 import { DataRequestContext } from '../../../actions';
 import {
-  Timeslice,
   StyleMetaDescriptor,
+  TileMetaFeature,
+  Timeslice,
   VectorLayerDescriptor,
   VectorSourceRequestMeta,
-  TileMetaFeature,
 } from '../../../../common/descriptor_types';
 import { MVTSingleLayerVectorSourceConfig } from '../../sources/mvt_single_layer_vector_source/types';
+import { ESSearchSource } from '../../sources/es_search_source';
 import { canSkipSourceUpdate } from '../../util/can_skip_fetch';
 import { CustomIconAndTooltipContent } from '../layer';
 
+const ES_MVT_META_LAYER_NAME = 'meta';
+const ES_MVT_HITS_TOTAL_RELATION = 'hits.total.relation';
+const ES_MVT_HITS_TOTAL_VALUE = 'hits.total.value';
+const MAX_RESULT_WINDOW_DATA_REQUEST_ID = 'maxResultWindow';
+
+/*
+ * MVT vector layer
+ */
 export class TiledVectorLayer extends VectorLayer {
   static type = LAYER_TYPE.TILED_VECTOR;
 
@@ -70,13 +75,46 @@ export class TiledVectorLayer extends VectorLayer {
   }
 
   getCustomIconAndTooltipContent(): CustomIconAndTooltipContent {
-    const tileMetas = this._getMetaFromTiles();
-    if (!tileMetas.length) {
+    const icon = this.getCurrentStyle().getIcon();
+    if (!this.getSource().isESSource()) {
+      // Only ES-sources can have a special meta-tile, not 3rd party vector tile sources
+      return {
+        icon,
+        tooltipContent: null,
+        areResultsTrimmed: false,
+      };
+    }
+
+    //
+    // TODO ES MVT specific - move to es_tiled_vector_layer implementation
+    //
+
+    const tileMetaFeatures = this._getMetaFromTiles();
+    if (!tileMetaFeatures.length) {
       return NO_RESULTS_ICON_AND_TOOLTIPCONTENT;
     }
 
-    const totalFeaturesCount: number = tileMetas.reduce((acc: number, tileMeta: Feature) => {
-      const count = tileMeta && tileMeta.properties ? tileMeta.properties[KBN_FEATURE_COUNT] : 0;
+    if (this.getSource().getType() !== SOURCE_TYPES.ES_SEARCH) {
+      // aggregation ES sources are never trimmed
+      return {
+        icon,
+        tooltipContent: null,
+        areResultsTrimmed: false,
+      };
+    }
+
+    const maxResultWindow = this._getMaxResultWindow();
+    if (maxResultWindow === undefined) {
+      return {
+        icon,
+        tooltipContent: null,
+        areResultsTrimmed: false,
+      };
+    }
+
+    const totalFeaturesCount: number = tileMetaFeatures.reduce((acc: number, tileMeta: Feature) => {
+      const count =
+        tileMeta && tileMeta.properties ? tileMeta.properties[ES_MVT_HITS_TOTAL_VALUE] : 0;
       return count + acc;
     }, 0);
 
@@ -84,12 +122,16 @@ export class TiledVectorLayer extends VectorLayer {
       return NO_RESULTS_ICON_AND_TOOLTIPCONTENT;
     }
 
-    const isIncomplete: boolean = tileMetas.some((tileMeta: Feature) => {
-      return !tileMeta?.properties?.[KBN_IS_TILE_COMPLETE];
+    const isIncomplete: boolean = tileMetaFeatures.some((tileMeta: TileMetaFeature) => {
+      if (tileMeta?.properties?.[ES_MVT_HITS_TOTAL_RELATION] === 'gte') {
+        return tileMeta?.properties?.[ES_MVT_HITS_TOTAL_VALUE] >= maxResultWindow + 1;
+      } else {
+        return false;
+      }
     });
 
     return {
-      icon: this.getCurrentStyle().getIcon(),
+      icon,
       tooltipContent: isIncomplete
         ? i18n.translate('xpack.maps.tiles.resultsTrimmedMsg', {
             defaultMessage: `Results limited to {count} documents.`,
@@ -107,6 +149,27 @@ export class TiledVectorLayer extends VectorLayer {
     };
   }
 
+  _getMaxResultWindow(): number | undefined {
+    const dataRequest = this.getDataRequest(MAX_RESULT_WINDOW_DATA_REQUEST_ID);
+    if (!dataRequest) {
+      return;
+    }
+    const data = dataRequest.getData() as { maxResultWindow: number } | undefined;
+    return data ? data.maxResultWindow : undefined;
+  }
+
+  async _syncMaxResultWindow({ startLoading, stopLoading }: DataRequestContext) {
+    const prevDataRequest = this.getDataRequest(MAX_RESULT_WINDOW_DATA_REQUEST_ID);
+    if (prevDataRequest) {
+      return;
+    }
+
+    const requestToken = Symbol(`${this.getId()}-${MAX_RESULT_WINDOW_DATA_REQUEST_ID}`);
+    startLoading(MAX_RESULT_WINDOW_DATA_REQUEST_ID, requestToken);
+    const maxResultWindow = await (this.getSource() as ESSearchSource).getMaxResultWindow();
+    stopLoading(MAX_RESULT_WINDOW_DATA_REQUEST_ID, requestToken, { maxResultWindow });
+  }
+
   async _syncMVTUrlTemplate({
     startLoading,
     stopLoading,
@@ -141,6 +204,7 @@ export class TiledVectorLayer extends VectorLayer {
           },
         });
         const canSkip = noChangesInSourceState && noChangesInSearchState;
+
         if (canSkip) {
           return null;
         }
@@ -180,6 +244,9 @@ export class TiledVectorLayer extends VectorLayer {
   }
 
   async syncData(syncContext: DataRequestContext) {
+    if (this.getSource().getType() === SOURCE_TYPES.ES_SEARCH) {
+      await this._syncMaxResultWindow(syncContext);
+    }
     await this._syncSourceStyleMeta(syncContext, this._source, this._style as IVectorStyle);
     await this._syncSourceFormatters(syncContext, this._source, this._style as IVectorStyle);
     await this._syncMVTUrlTemplate(syncContext);
@@ -213,10 +280,18 @@ export class TiledVectorLayer extends VectorLayer {
     });
   }
 
+  getMbLayerIds() {
+    return [...super.getMbLayerIds(), this._getMbTooManyFeaturesLayerId()];
+  }
+
   ownsMbSourceId(mbSourceId: string): boolean {
     return this._getMbSourceId() === mbSourceId;
   }
 
+  _getMbTooManyFeaturesLayerId() {
+    return this.makeMbLayerId('toomanyfeatures');
+  }
+
   _syncStylePropertiesWithMb(mbMap: MbMap) {
     // @ts-ignore
     const mbSource = mbMap.getSource(this._getMbSourceId());
@@ -236,10 +311,52 @@ export class TiledVectorLayer extends VectorLayer {
 
     this._setMbPointsProperties(mbMap, sourceMeta.layerName);
     this._setMbLinePolygonProperties(mbMap, sourceMeta.layerName);
-    this._setMbCentroidProperties(mbMap, sourceMeta.layerName);
+    this._setMbLabelProperties(mbMap, sourceMeta.layerName);
+    this._syncTooManyFeaturesProperties(mbMap);
+  }
+
+  // TODO ES MVT specific - move to es_tiled_vector_layer implementation
+  _syncTooManyFeaturesProperties(mbMap: MbMap) {
+    if (this.getSource().getType() !== SOURCE_TYPES.ES_SEARCH) {
+      return;
+    }
+
+    const maxResultWindow = this._getMaxResultWindow();
+    if (maxResultWindow === undefined) {
+      return;
+    }
+
+    const tooManyFeaturesLayerId = this._getMbTooManyFeaturesLayerId();
+
+    if (!mbMap.getLayer(tooManyFeaturesLayerId)) {
+      const mbTooManyFeaturesLayer: MbLayer = {
+        id: tooManyFeaturesLayerId,
+        type: 'line',
+        source: this.getId(),
+        paint: {},
+      };
+      mbTooManyFeaturesLayer['source-layer'] = ES_MVT_META_LAYER_NAME;
+      mbMap.addLayer(mbTooManyFeaturesLayer);
+      mbMap.setFilter(tooManyFeaturesLayerId, [
+        'all',
+        ['==', ['get', ES_MVT_HITS_TOTAL_RELATION], 'gte'],
+        ['>=', ['get', ES_MVT_HITS_TOTAL_VALUE], maxResultWindow + 1],
+      ]);
+      mbMap.setPaintProperty(tooManyFeaturesLayerId, 'line-color', euiThemeVars.euiColorWarning);
+      mbMap.setPaintProperty(tooManyFeaturesLayerId, 'line-width', 3);
+      mbMap.setPaintProperty(tooManyFeaturesLayerId, 'line-dasharray', [2, 1]);
+      mbMap.setPaintProperty(tooManyFeaturesLayerId, 'line-opacity', this.getAlpha());
+    }
+
+    this.syncVisibilityWithMb(mbMap, tooManyFeaturesLayerId);
+    mbMap.setLayerZoomRange(tooManyFeaturesLayerId, this.getMinZoom(), this.getMaxZoom());
   }
 
   queryTileMetaFeatures(mbMap: MbMap): TileMetaFeature[] | null {
+    if (!this.getSource().isESSource()) {
+      return null;
+    }
+
     // @ts-ignore
     const mbSource = mbMap.getSource(this._getMbSourceId());
     if (!mbSource) {
@@ -259,26 +376,38 @@ export class TiledVectorLayer extends VectorLayer {
     // querySourceFeatures can return duplicated features when features cross tile boundaries.
     // Tile meta will never have duplicated features since by there nature, tile meta is a feature contained within a single tile
     const mbFeatures = mbMap.querySourceFeatures(this._getMbSourceId(), {
-      sourceLayer: sourceMeta.layerName,
-      filter: ['==', ['get', KBN_METADATA_FEATURE], true],
+      sourceLayer: ES_MVT_META_LAYER_NAME,
     });
 
-    const metaFeatures: TileMetaFeature[] = mbFeatures.map((mbFeature: Feature) => {
+    const metaFeatures: Array<TileMetaFeature | null> = (
+      mbFeatures as unknown as TileMetaFeature[]
+    ).map((mbFeature: TileMetaFeature | null) => {
       const parsedProperties: Record<string, unknown> = {};
-      for (const key in mbFeature.properties) {
-        if (mbFeature.properties.hasOwnProperty(key)) {
-          parsedProperties[key] = JSON.parse(mbFeature.properties[key]); // mvt properties cannot be nested geojson
+      for (const key in mbFeature?.properties) {
+        if (mbFeature?.properties.hasOwnProperty(key)) {
+          parsedProperties[key] =
+            typeof mbFeature.properties[key] === 'string' ||
+            typeof mbFeature.properties[key] === 'number' ||
+            typeof mbFeature.properties[key] === 'boolean'
+              ? mbFeature.properties[key]
+              : JSON.parse(mbFeature.properties[key]); // mvt properties cannot be nested geojson
         }
       }
-      return {
-        type: 'Feature',
-        id: mbFeature.id,
-        geometry: mbFeature.geometry,
-        properties: parsedProperties,
-      } as TileMetaFeature;
+
+      try {
+        return {
+          type: 'Feature',
+          id: mbFeature?.id,
+          geometry: mbFeature?.geometry, // this getter might throw with non-conforming geometries
+          properties: parsedProperties,
+        } as TileMetaFeature;
+      } catch (e) {
+        return null;
+      }
     });
 
-    return metaFeatures as TileMetaFeature[];
+    const filtered = metaFeatures.filter((f) => f !== null);
+    return filtered as TileMetaFeature[];
   }
 
   _requiresPrevSourceCleanup(mbMap: MbMap): boolean {
@@ -317,8 +446,13 @@ export class TiledVectorLayer extends VectorLayer {
       const mbLayer = mbMap.getLayer(layerIds[i]);
       // The mapbox type in the spec is specified with `source-layer`
       // but the programmable JS-object uses camelcase `sourceLayer`
-      // @ts-expect-error
-      if (mbLayer && mbLayer.sourceLayer !== tiledSourceMeta.layerName) {
+      if (
+        mbLayer &&
+        // @ts-expect-error
+        mbLayer.sourceLayer !== tiledSourceMeta.layerName &&
+        // @ts-expect-error
+        mbLayer.sourceLayer !== ES_MVT_META_LAYER_NAME
+      ) {
         // If the source-pointer of one of the layers is stale, they will all be stale.
         // In this case, all the mb-layers need to be removed and re-added.
         return true;
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/assign_feature_ids.test.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/assign_feature_ids.test.ts
index 137d443b39b91..2250e86da0ec2 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/assign_feature_ids.test.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/assign_feature_ids.test.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import { assignFeatureIds } from './assign_feature_ids';
-import { FEATURE_ID_PROPERTY_NAME } from '../../../../common/constants';
+import { assignFeatureIds, GEOJSON_FEATURE_ID_PROPERTY_NAME } from './assign_feature_ids';
 import { FeatureCollection, Feature, Point } from 'geojson';
 
 const featureId = 'myFeature1';
@@ -34,7 +33,7 @@ test('should provide unique id when feature.id is not provided', () => {
   expect(typeof feature1.id).toBe('number');
   expect(typeof feature2.id).toBe('number');
   // @ts-ignore
-  expect(feature1.id).toBe(feature1.properties[FEATURE_ID_PROPERTY_NAME]);
+  expect(feature1.id).toBe(feature1.properties[GEOJSON_FEATURE_ID_PROPERTY_NAME]);
   expect(feature1.id).not.toBe(feature2.id);
 });
 
@@ -53,9 +52,9 @@ test('should preserve feature id when provided', () => {
   const feature1 = updatedFeatureCollection.features[0];
   expect(typeof feature1.id).toBe('number');
   // @ts-ignore
-  expect(feature1.id).not.toBe(feature1.properties[FEATURE_ID_PROPERTY_NAME]);
+  expect(feature1.id).not.toBe(feature1.properties[GEOJSON_FEATURE_ID_PROPERTY_NAME]);
   // @ts-ignore
-  expect(feature1.properties[FEATURE_ID_PROPERTY_NAME]).toBe(featureId);
+  expect(feature1.properties[GEOJSON_FEATURE_ID_PROPERTY_NAME]).toBe(featureId);
 });
 
 test('should preserve feature id for falsy value', () => {
@@ -73,9 +72,9 @@ test('should preserve feature id for falsy value', () => {
   const feature1 = updatedFeatureCollection.features[0];
   expect(typeof feature1.id).toBe('number');
   // @ts-ignore
-  expect(feature1.id).not.toBe(feature1.properties[FEATURE_ID_PROPERTY_NAME]);
+  expect(feature1.id).not.toBe(feature1.properties[GEOJSON_FEATURE_ID_PROPERTY_NAME]);
   // @ts-ignore
-  expect(feature1.properties[FEATURE_ID_PROPERTY_NAME]).toBe(0);
+  expect(feature1.properties[GEOJSON_FEATURE_ID_PROPERTY_NAME]).toBe(0);
 });
 
 test('should not modify original feature properties', () => {
@@ -94,6 +93,6 @@ test('should not modify original feature properties', () => {
   const updatedFeatureCollection = assignFeatureIds(featureCollection);
   const feature1 = updatedFeatureCollection.features[0];
   // @ts-ignore
-  expect(feature1.properties[FEATURE_ID_PROPERTY_NAME]).toBe(featureId);
-  expect(featureProperties).not.toHaveProperty(FEATURE_ID_PROPERTY_NAME);
+  expect(feature1.properties[GEOJSON_FEATURE_ID_PROPERTY_NAME]).toBe(featureId);
+  expect(featureProperties).not.toHaveProperty(GEOJSON_FEATURE_ID_PROPERTY_NAME);
 });
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/assign_feature_ids.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/assign_feature_ids.ts
index c40c8299ad04c..53ce15439e815 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/assign_feature_ids.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/assign_feature_ids.ts
@@ -7,7 +7,11 @@
 
 import _ from 'lodash';
 import { FeatureCollection, Feature } from 'geojson';
-import { FEATURE_ID_PROPERTY_NAME } from '../../../../common/constants';
+import { SOURCE_TYPES } from '../../../../common/constants';
+import { IVectorSource } from '../../sources/vector_source';
+
+export const GEOJSON_FEATURE_ID_PROPERTY_NAME = '__kbn__feature_id__';
+export const ES_MVT_FEATURE_ID_PROPERTY_NAME = '_id';
 
 let idCounter = 0;
 
@@ -43,7 +47,7 @@ export function assignFeatureIds(featureCollection: FeatureCollection): FeatureC
       geometry: feature.geometry, // do not copy geometry, this object can be massive
       properties: {
         // preserve feature id provided by source so features can be referenced across fetches
-        [FEATURE_ID_PROPERTY_NAME]: feature.id == null ? numericId : feature.id,
+        [GEOJSON_FEATURE_ID_PROPERTY_NAME]: feature.id == null ? numericId : feature.id,
         // create new object for properties so original is not polluted with kibana internal props
         ...feature.properties,
       },
@@ -56,3 +60,13 @@ export function assignFeatureIds(featureCollection: FeatureCollection): FeatureC
     features,
   };
 }
+
+export function getFeatureId(feature: Feature, source: IVectorSource): string | number | undefined {
+  if (!source.isMvt()) {
+    return feature.properties?.[GEOJSON_FEATURE_ID_PROPERTY_NAME];
+  }
+
+  return source.getType() === SOURCE_TYPES.ES_SEARCH
+    ? feature.properties?.[ES_MVT_FEATURE_ID_PROPERTY_NAME]
+    : feature.id;
+}
diff --git a/x-pack/plugins/maps/common/get_centroid_features.test.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/get_centroid_features.test.ts
similarity index 93%
rename from x-pack/plugins/maps/common/get_centroid_features.test.ts
rename to x-pack/plugins/maps/public/classes/layers/vector_layer/get_centroid_features.test.ts
index 0fac9dc3a355f..2b8d03a2c3f8c 100644
--- a/x-pack/plugins/maps/common/get_centroid_features.test.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/get_centroid_features.test.ts
@@ -44,35 +44,6 @@ test('should not create centroid feature for point and multipoint', () => {
   expect(centroidFeatures.length).toBe(0);
 });
 
-test('should not create centroid for the metadata polygon', () => {
-  const polygonFeature: Feature = {
-    type: 'Feature',
-    geometry: {
-      type: 'Polygon',
-      coordinates: [
-        [
-          [35, 10],
-          [45, 45],
-          [15, 40],
-          [10, 20],
-          [35, 10],
-        ],
-      ],
-    },
-    properties: {
-      __kbn_metadata_feature__: true,
-      prop0: 'value0',
-      prop1: 0.0,
-    },
-  };
-  const featureCollection: FeatureCollection = {
-    type: 'FeatureCollection',
-    features: [polygonFeature],
-  };
-  const centroidFeatures = getCentroidFeatures(featureCollection);
-  expect(centroidFeatures.length).toBe(0);
-});
-
 test('should create centroid feature for line (even number of points)', () => {
   const lineFeature: Feature = {
     type: 'Feature',
diff --git a/x-pack/plugins/maps/common/get_centroid_features.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/get_centroid_features.ts
similarity index 94%
rename from x-pack/plugins/maps/common/get_centroid_features.ts
rename to x-pack/plugins/maps/public/classes/layers/vector_layer/get_centroid_features.ts
index 8aaeb56576a84..6afe61f8a16b9 100644
--- a/x-pack/plugins/maps/common/get_centroid_features.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/get_centroid_features.ts
@@ -21,18 +21,13 @@ import turfArea from '@turf/area';
 import turfCenterOfMass from '@turf/center-of-mass';
 import turfLength from '@turf/length';
 import { lineString, polygon } from '@turf/helpers';
-import { GEO_JSON_TYPE, KBN_IS_CENTROID_FEATURE, KBN_METADATA_FEATURE } from './constants';
+import { GEO_JSON_TYPE, KBN_IS_CENTROID_FEATURE } from '../../../../common/constants';
 
 export function getCentroidFeatures(featureCollection: FeatureCollection): Feature[] {
   const centroids = [];
   for (let i = 0; i < featureCollection.features.length; i++) {
     const feature = featureCollection.features[i];
 
-    // do not add centroid for kibana added features
-    if (feature.properties?.[KBN_METADATA_FEATURE]) {
-      continue;
-    }
-
     const centroid = getCentroid(feature);
     if (centroid) {
       centroids.push(centroid);
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/index.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/index.ts
index cb964f77613da..80d83996d8fd6 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/index.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/index.ts
@@ -13,3 +13,4 @@ export {
   VectorLayerArguments,
   NO_RESULTS_ICON_AND_TOOLTIPCONTENT,
 } from './vector_layer';
+export { getFeatureId } from './assign_feature_ids';
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/utils.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/utils.tsx
index 8e4eb349036ea..cc30f30fe9898 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/utils.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/utils.tsx
@@ -24,7 +24,7 @@ import { DataRequestContext } from '../../../actions';
 import { IVectorSource } from '../../sources/vector_source';
 import { DataRequestAbortError } from '../../util/data_request';
 import { DataRequest } from '../../util/data_request';
-import { getCentroidFeatures } from '../../../../common/get_centroid_features';
+import { getCentroidFeatures } from './get_centroid_features';
 import { canSkipSourceUpdate } from '../../util/can_skip_fetch';
 import { assignFeatureIds } from './assign_feature_ids';
 
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
index 3faf92715451c..cd1b644e9cfba 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
@@ -21,20 +21,16 @@ import { AbstractLayer } from '../layer';
 import { IVectorStyle, VectorStyle } from '../../styles/vector/vector_style';
 import {
   AGG_TYPE,
-  FEATURE_ID_PROPERTY_NAME,
   SOURCE_META_DATA_REQUEST_ID,
   SOURCE_FORMATTERS_DATA_REQUEST_ID,
   FEATURE_VISIBLE_PROPERTY_NAME,
   EMPTY_FEATURE_COLLECTION,
-  KBN_METADATA_FEATURE,
   LAYER_TYPE,
   FIELD_ORIGIN,
-  KBN_TOO_MANY_FEATURES_IMAGE_ID,
   FieldFormatter,
   SOURCE_TYPES,
   STYLE_TYPE,
   SUPPORTS_FEATURE_EDITING_REQUEST_ID,
-  KBN_IS_TILE_COMPLETE,
   VECTOR_STYLES,
 } from '../../../../common/constants';
 import { JoinTooltipProperty } from '../../tooltips/join_tooltip_property';
@@ -46,7 +42,7 @@ import {
 } from '../../util/can_skip_fetch';
 import { getFeatureCollectionBounds } from '../../util/get_feature_collection_bounds';
 import {
-  getCentroidFilterExpression,
+  getLabelFilterExpression,
   getFillFilterExpression,
   getLineFilterExpression,
   getPointFilterExpression,
@@ -80,6 +76,7 @@ import { addGeoJsonMbSource, getVectorSourceBounds, syncVectorSource } from './u
 import { JoinState, performInnerJoins } from './perform_inner_joins';
 import { buildVectorRequestMeta } from '../build_vector_request_meta';
 import { getJoinAggKey } from '../../../../common/get_agg_key';
+import { getFeatureId } from './assign_feature_ids';
 
 export function isVectorLayer(layer: ILayer) {
   return (layer as IVectorLayer).canShowTooltip !== undefined;
@@ -93,6 +90,12 @@ export interface VectorLayerArguments {
 }
 
 export interface IVectorLayer extends ILayer {
+  /*
+   * IVectorLayer.getMbLayerIds returns a list of mapbox layers assoicated with this layer for identifing features with tooltips.
+   * Must return ILayer.getMbLayerIds or a subset of ILayer.getMbLayerIds.
+   */
+  getMbTooltipLayerIds(): string[];
+
   getFields(): Promise<IField[]>;
   getStyleEditorFields(): Promise<IField[]>;
   getJoins(): InnerJoin[];
@@ -118,6 +121,9 @@ export const NO_RESULTS_ICON_AND_TOOLTIPCONTENT = {
   }),
 };
 
+/*
+ * Geojson vector layer
+ */
 export class VectorLayer extends AbstractLayer implements IVectorLayer {
   static type = LAYER_TYPE.VECTOR;
 
@@ -589,6 +595,7 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
         timeFilters: nextMeta.timeFilters,
         searchSessionId: dataFilters.searchSessionId,
       });
+
       stopLoading(dataRequestId, requestToken, styleMeta, nextMeta);
     } catch (error) {
       if (!(error instanceof DataRequestAbortError)) {
@@ -774,6 +781,9 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
   }
 
   _getSourceFeatureCollection() {
+    if (this.getSource().isMvt()) {
+      return null;
+    }
     const sourceDataRequest = this.getSourceDataRequest();
     return sourceDataRequest ? (sourceDataRequest.getData() as FeatureCollection) : null;
   }
@@ -946,7 +956,6 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
     const sourceId = this.getId();
     const fillLayerId = this._getMbPolygonLayerId();
     const lineLayerId = this._getMbLineLayerId();
-    const tooManyFeaturesLayerId = this._getMbTooManyFeaturesLayerId();
 
     const hasJoins = this.hasJoins();
     if (!mbMap.getLayer(fillLayerId)) {
@@ -973,29 +982,6 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
       }
       mbMap.addLayer(mbLayer);
     }
-    if (!mbMap.getLayer(tooManyFeaturesLayerId)) {
-      const mbLayer: MbLayer = {
-        id: tooManyFeaturesLayerId,
-        type: 'fill',
-        source: sourceId,
-        paint: {},
-      };
-      if (mvtSourceLayer) {
-        mbLayer['source-layer'] = mvtSourceLayer;
-      }
-      mbMap.addLayer(mbLayer);
-      mbMap.setFilter(tooManyFeaturesLayerId, [
-        'all',
-        ['==', ['get', KBN_METADATA_FEATURE], true],
-        ['==', ['get', KBN_IS_TILE_COMPLETE], false],
-      ]);
-      mbMap.setPaintProperty(
-        tooManyFeaturesLayerId,
-        'fill-pattern',
-        KBN_TOO_MANY_FEATURES_IMAGE_ID
-      );
-      mbMap.setPaintProperty(tooManyFeaturesLayerId, 'fill-opacity', this.getAlpha());
-    }
 
     this.getCurrentStyle().setMBPaintProperties({
       alpha: this.getAlpha(),
@@ -1017,21 +1003,18 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
     if (!_.isEqual(lineFilterExpr, mbMap.getFilter(lineLayerId))) {
       mbMap.setFilter(lineLayerId, lineFilterExpr);
     }
-
-    this.syncVisibilityWithMb(mbMap, tooManyFeaturesLayerId);
-    mbMap.setLayerZoomRange(tooManyFeaturesLayerId, this.getMinZoom(), this.getMaxZoom());
   }
 
-  _setMbCentroidProperties(
+  _setMbLabelProperties(
     mbMap: MbMap,
     mvtSourceLayer?: string,
     timesliceMaskConfig?: TimesliceMaskConfig
   ) {
-    const centroidLayerId = this._getMbCentroidLayerId();
-    const centroidLayer = mbMap.getLayer(centroidLayerId);
-    if (!centroidLayer) {
+    const labelLayerId = this._getMbLabelLayerId();
+    const labelLayer = mbMap.getLayer(labelLayerId);
+    if (!labelLayer) {
       const mbLayer: MbLayer = {
-        id: centroidLayerId,
+        id: labelLayerId,
         type: 'symbol',
         source: this.getId(),
       };
@@ -1041,27 +1024,32 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
       mbMap.addLayer(mbLayer);
     }
 
-    const filterExpr = getCentroidFilterExpression(this.hasJoins(), timesliceMaskConfig);
-    if (!_.isEqual(filterExpr, mbMap.getFilter(centroidLayerId))) {
-      mbMap.setFilter(centroidLayerId, filterExpr);
+    const isSourceGeoJson = !this.getSource().isMvt();
+    const filterExpr = getLabelFilterExpression(
+      this.hasJoins(),
+      isSourceGeoJson,
+      timesliceMaskConfig
+    );
+    if (!_.isEqual(filterExpr, mbMap.getFilter(labelLayerId))) {
+      mbMap.setFilter(labelLayerId, filterExpr);
     }
 
     this.getCurrentStyle().setMBPropertiesForLabelText({
       alpha: this.getAlpha(),
       mbMap,
-      textLayerId: centroidLayerId,
+      textLayerId: labelLayerId,
     });
 
-    this.syncVisibilityWithMb(mbMap, centroidLayerId);
-    mbMap.setLayerZoomRange(centroidLayerId, this.getMinZoom(), this.getMaxZoom());
+    this.syncVisibilityWithMb(mbMap, labelLayerId);
+    mbMap.setLayerZoomRange(labelLayerId, this.getMinZoom(), this.getMaxZoom());
   }
 
   _syncStylePropertiesWithMb(mbMap: MbMap, timeslice?: Timeslice) {
     const timesliceMaskConfig = this._getTimesliceMaskConfig(timeslice);
     this._setMbPointsProperties(mbMap, undefined, timesliceMaskConfig);
     this._setMbLinePolygonProperties(mbMap, undefined, timesliceMaskConfig);
-    // centroid layers added after polygon layers to ensure they are on top of polygon layers
-    this._setMbCentroidProperties(mbMap, undefined, timesliceMaskConfig);
+    // label layers added after geometry layers to ensure they are on top
+    this._setMbLabelProperties(mbMap, undefined, timesliceMaskConfig);
   }
 
   _getTimesliceMaskConfig(timeslice?: Timeslice): TimesliceMaskConfig | undefined {
@@ -1092,8 +1080,12 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
     return this.makeMbLayerId('text');
   }
 
-  _getMbCentroidLayerId() {
-    return this.makeMbLayerId('centroid');
+  // _getMbTextLayerId is labels for Points and MultiPoints
+  // _getMbLabelLayerId is labels for not Points and MultiPoints
+  // _getMbLabelLayerId used to be called _getMbCentroidLayerId
+  // TODO merge textLayer and labelLayer into single layer
+  _getMbLabelLayerId() {
+    return this.makeMbLayerId('label');
   }
 
   _getMbSymbolLayerId() {
@@ -1108,22 +1100,21 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
     return this.makeMbLayerId('fill');
   }
 
-  _getMbTooManyFeaturesLayerId() {
-    return this.makeMbLayerId('toomanyfeatures');
-  }
-
-  getMbLayerIds() {
+  getMbTooltipLayerIds() {
     return [
       this._getMbPointLayerId(),
       this._getMbTextLayerId(),
-      this._getMbCentroidLayerId(),
+      this._getMbLabelLayerId(),
       this._getMbSymbolLayerId(),
       this._getMbLineLayerId(),
       this._getMbPolygonLayerId(),
-      this._getMbTooManyFeaturesLayerId(),
     ];
   }
 
+  getMbLayerIds() {
+    return this.getMbTooltipLayerIds();
+  }
+
   ownsMbLayerId(mbLayerId: string) {
     return this.getMbLayerIds().includes(mbLayerId);
   }
@@ -1170,7 +1161,7 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
     }
 
     const targetFeature = featureCollection.features.find((feature) => {
-      return feature.properties?.[FEATURE_ID_PROPERTY_NAME] === id;
+      return getFeatureId(feature, this.getSource()) === id;
     });
     return targetFeature ? targetFeature : null;
   }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
index 78bc2592182d8..dc9637c7a7637 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts
@@ -134,14 +134,14 @@ export abstract class AbstractESAggSource extends AbstractESSource implements IE
     return valueAggsDsl;
   }
 
-  async getTooltipProperties(properties: GeoJsonProperties): Promise<ITooltipProperty[]> {
+  async getTooltipProperties(mbProperties: GeoJsonProperties): Promise<ITooltipProperty[]> {
     const metricFields = await this.getFields();
     const promises: Array<Promise<ITooltipProperty>> = [];
     metricFields.forEach((metricField) => {
       let value;
-      for (const key in properties) {
-        if (properties.hasOwnProperty(key) && metricField.getName() === key) {
-          value = properties[key];
+      for (const key in mbProperties) {
+        if (mbProperties.hasOwnProperty(key) && metricField.getMbFieldName() === key) {
+          value = mbProperties[key];
           break;
         }
       }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/resolution_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/resolution_editor.test.tsx.snap
index ca9775594a9d7..6a1dbf9e1590b 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/resolution_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/resolution_editor.test.tsx.snap
@@ -1,73 +1,77 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`resolution editor should add super-fine option 1`] = `
-<EuiFormRow
-  describedByIds={Array []}
-  display="columnCompressed"
-  fullWidth={false}
-  hasChildLabel={true}
-  hasEmptyLabelSpace={false}
-  label="Grid resolution"
-  labelType="label"
->
-  <EuiSelect
-    compressed={true}
-    onChange={[Function]}
-    options={
-      Array [
-        Object {
-          "text": "coarse",
-          "value": "COARSE",
-        },
-        Object {
-          "text": "fine",
-          "value": "FINE",
-        },
-        Object {
-          "text": "finest",
-          "value": "MOST_FINE",
-        },
-        Object {
-          "text": "super fine (beta)",
-          "value": "SUPER_FINE",
-        },
-      ]
-    }
-    value="COARSE"
-  />
-</EuiFormRow>
+<Fragment>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="columnCompressed"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    label="Grid resolution"
+    labelType="label"
+  >
+    <EuiSelect
+      compressed={true}
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "text": "coarse",
+            "value": "COARSE",
+          },
+          Object {
+            "text": "fine",
+            "value": "FINE",
+          },
+          Object {
+            "text": "finest",
+            "value": "MOST_FINE",
+          },
+          Object {
+            "text": "super fine",
+            "value": "SUPER_FINE",
+          },
+        ]
+      }
+      value="COARSE"
+    />
+  </EuiFormRow>
+</Fragment>
 `;
 
 exports[`resolution editor should omit super-fine option 1`] = `
-<EuiFormRow
-  describedByIds={Array []}
-  display="columnCompressed"
-  fullWidth={false}
-  hasChildLabel={true}
-  hasEmptyLabelSpace={false}
-  label="Grid resolution"
-  labelType="label"
->
-  <EuiSelect
-    compressed={true}
-    onChange={[Function]}
-    options={
-      Array [
-        Object {
-          "text": "coarse",
-          "value": "COARSE",
-        },
-        Object {
-          "text": "fine",
-          "value": "FINE",
-        },
-        Object {
-          "text": "finest",
-          "value": "MOST_FINE",
-        },
-      ]
-    }
-    value="COARSE"
-  />
-</EuiFormRow>
+<Fragment>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="columnCompressed"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    label="Grid resolution"
+    labelType="label"
+  >
+    <EuiSelect
+      compressed={true}
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "text": "coarse",
+            "value": "COARSE",
+          },
+          Object {
+            "text": "fine",
+            "value": "FINE",
+          },
+          Object {
+            "text": "finest",
+            "value": "MOST_FINE",
+          },
+        ]
+      }
+      value="COARSE"
+    />
+  </EuiFormRow>
+</Fragment>
 `;
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/update_source_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/update_source_editor.test.tsx.snap
index dfce6b36396a7..0d4467792e636 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/update_source_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/__snapshots__/update_source_editor.test.tsx.snap
@@ -19,9 +19,9 @@ exports[`source editor geo_grid_source default vector layer config should allow
     />
     <MetricsEditor
       allowMultipleMetrics={true}
-      fields={null}
+      fields={Array []}
+      key="12345"
       metrics={Array []}
-      metricsFilter={null}
       onChange={[Function]}
     />
   </EuiPanel>
@@ -45,6 +45,7 @@ exports[`source editor geo_grid_source default vector layer config should allow
     />
     <ResolutionEditor
       includeSuperFine={true}
+      metrics={Array []}
       onChange={[Function]}
       resolution="COARSE"
     />
@@ -79,7 +80,8 @@ exports[`source editor geo_grid_source should put limitations based on heatmap-r
     />
     <MetricsEditor
       allowMultipleMetrics={false}
-      fields={null}
+      fields={Array []}
+      key="12345"
       metrics={Array []}
       metricsFilter={[Function]}
       onChange={[Function]}
@@ -105,6 +107,7 @@ exports[`source editor geo_grid_source should put limitations based on heatmap-r
     />
     <ResolutionEditor
       includeSuperFine={false}
+      metrics={Array []}
       onChange={[Function]}
       resolution="COARSE"
     />
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/convert_to_geojson.d.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.d.ts
similarity index 89%
rename from x-pack/plugins/maps/common/elasticsearch_util/convert_to_geojson.d.ts
rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.d.ts
index 3bb2e165fa740..9452620447259 100644
--- a/x-pack/plugins/maps/common/elasticsearch_util/convert_to_geojson.d.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.d.ts
@@ -6,7 +6,7 @@
  */
 
 import { Feature } from 'geojson';
-import { RENDER_AS } from '../constants';
+import { RENDER_AS } from '../../../../common/constants';
 
 export function convertCompositeRespToGeoJson(esResponse: any, renderAs: RENDER_AS): Feature[];
 export function convertRegularRespToGeoJson(esResponse: any, renderAs: RENDER_AS): Feature[];
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/convert_to_geojson.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.js
similarity index 89%
rename from x-pack/plugins/maps/common/elasticsearch_util/convert_to_geojson.js
rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.js
index f416847941a8a..87fb0d53efa62 100644
--- a/x-pack/plugins/maps/common/elasticsearch_util/convert_to_geojson.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.js
@@ -6,10 +6,13 @@
  */
 
 import _ from 'lodash';
-import { RENDER_AS, GEOTILE_GRID_AGG_NAME, GEOCENTROID_AGG_NAME } from '../constants';
-import { getTileBoundingBox } from '../geo_tile_utils';
-import { extractPropertiesFromBucket } from './es_agg_utils';
-import { clamp } from './elasticsearch_geo_utils';
+import {
+  RENDER_AS,
+  GEOTILE_GRID_AGG_NAME,
+  GEOCENTROID_AGG_NAME,
+} from '../../../../common/constants';
+import { getTileBoundingBox } from '../../util/geo_tile_utils';
+import { clamp, extractPropertiesFromBucket } from '../../../../common/elasticsearch_util';
 
 const GRID_BUCKET_KEYS_TO_IGNORE = ['key', GEOCENTROID_AGG_NAME];
 
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/convert_to_geojson.test.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.test.ts
similarity index 98%
rename from x-pack/plugins/maps/common/elasticsearch_util/convert_to_geojson.test.ts
rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.test.ts
index 2dc96038d931d..d6de17bef710b 100644
--- a/x-pack/plugins/maps/common/elasticsearch_util/convert_to_geojson.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.test.ts
@@ -7,7 +7,7 @@
 
 // @ts-ignore
 import { convertCompositeRespToGeoJson, convertRegularRespToGeoJson } from './convert_to_geojson';
-import { RENDER_AS } from '../constants';
+import { RENDER_AS } from '../../../../common/constants';
 
 describe('convertCompositeRespToGeoJson', () => {
   const esResponse = {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
index 41d5715e47b8e..8eebf01a550dd 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
@@ -296,7 +296,7 @@ describe('ESGeoGridSource', () => {
     );
 
     it('getLayerName', () => {
-      expect(mvtGeogridSource.getLayerName()).toBe('source_layer');
+      expect(mvtGeogridSource.getLayerName()).toBe('aggs');
     });
 
     it('getMinZoom', () => {
@@ -312,28 +312,13 @@ describe('ESGeoGridSource', () => {
         vectorSourceRequestMeta
       );
 
-      expect(urlTemplateWithMeta.layerName).toBe('source_layer');
+      expect(urlTemplateWithMeta.layerName).toBe('aggs');
       expect(urlTemplateWithMeta.minSourceZoom).toBe(0);
       expect(urlTemplateWithMeta.maxSourceZoom).toBe(24);
       expect(urlTemplateWithMeta.urlTemplate).toEqual(
-        "rootdir/api/maps/mvt/getGridTile/{z}/{x}/{y}.pbf?geometryFieldName=bar&index=undefined&requestBody=(foobar:ES_DSL_PLACEHOLDER,params:('0':('0':index,'1':(fields:())),'1':('0':size,'1':0),'2':('0':filter,'1':!()),'3':('0':query),'4':('0':index,'1':(fields:())),'5':('0':query,'1':(language:KQL,query:'')),'6':('0':aggs,'1':(gridSplit:(aggs:(gridCentroid:(geo_centroid:(field:bar))),geotile_grid:(bounds:!n,field:bar,precision:!n,shard_size:65535,size:65535))))))&requestType=heatmap&geoFieldType=geo_point"
+        "rootdir/api/maps/mvt/getGridTile/{z}/{x}/{y}.pbf?geometryFieldName=bar&index=undefined&requestBody=(foobar:ES_DSL_PLACEHOLDER,params:('0':('0':index,'1':(fields:())),'1':('0':size,'1':0),'2':('0':filter,'1':!()),'3':('0':query),'4':('0':index,'1':(fields:())),'5':('0':query,'1':(language:KQL,query:'')),'6':('0':aggs,'1':())))&requestType=heatmap"
       );
     });
-
-    it('should include searchSourceId in urlTemplateWithMeta', async () => {
-      const urlTemplateWithMeta = await mvtGeogridSource.getUrlTemplateWithMeta({
-        ...vectorSourceRequestMeta,
-        searchSessionId: '1',
-      });
-
-      expect(
-        urlTemplateWithMeta.urlTemplate.startsWith(
-          "rootdir/api/maps/mvt/getGridTile/{z}/{x}/{y}.pbf?geometryFieldName=bar&index=undefined&requestBody=(foobar:ES_DSL_PLACEHOLDER,params:('0':('0':index,'1':(fields:())),'1':('0':size,'1':0),'2':('0':filter,'1':!()),'3':('0':query),'4':('0':index,'1':(fields:())),'5':('0':query,'1':(language:KQL,query:'')),'6':('0':aggs,'1':(gridSplit:(aggs:(gridCentroid:(geo_centroid:(field:bar))),geotile_grid:(bounds:!n,field:bar,precision:!n,shard_size:65535,size:65535))))))&requestType=heatmap&geoFieldType=geo_point&searchSessionId=1"
-        )
-      ).toBe(true);
-
-      expect(urlTemplateWithMeta.urlTemplate.endsWith('&searchSessionId=1')).toBe(true);
-    });
   });
 
   describe('Gold+ usage', () => {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
index 7bd1e4dfd75f3..d038c139a1667 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx
@@ -11,12 +11,8 @@ import { i18n } from '@kbn/i18n';
 import rison from 'rison-node';
 import { Feature } from 'geojson';
 import type { estypes } from '@elastic/elasticsearch';
-import {
-  convertCompositeRespToGeoJson,
-  convertRegularRespToGeoJson,
-  makeESBbox,
-} from '../../../../common/elasticsearch_util';
-// @ts-expect-error
+import { makeESBbox } from '../../../../common/elasticsearch_util';
+import { convertCompositeRespToGeoJson, convertRegularRespToGeoJson } from './convert_to_geojson';
 import { UpdateSourceEditor } from './update_source_editor';
 import {
   DEFAULT_MAX_BUCKETS_LIMIT,
@@ -26,7 +22,6 @@ import {
   GIS_API_PATH,
   GRID_RESOLUTION,
   MVT_GETGRIDTILE_API_PATH,
-  MVT_SOURCE_LAYER_NAME,
   MVT_TOKEN_PARAM_NAME,
   RENDER_AS,
   SOURCE_TYPES,
@@ -55,6 +50,8 @@ import { ITiledSingleLayerMvtParams } from '../tiled_single_layer_vector_source/
 
 type ESGeoGridSourceSyncMeta = Pick<ESGeoGridSourceDescriptor, 'requestType'>;
 
+const ES_MVT_AGGS_LAYER_NAME = 'aggs';
+
 export const MAX_GEOTILE_LEVEL = 29;
 
 export const clustersTitle = i18n.translate('xpack.maps.source.esGridClustersTitle', {
@@ -140,6 +137,10 @@ export class ESGeoGridSource extends AbstractESAggSource implements ITiledSingle
     ];
   }
 
+  isMvt() {
+    return this._descriptor.resolution === GRID_RESOLUTION.SUPER_FINE;
+  }
+
   getFieldNames() {
     return this.getMetricFields().map((esAggMetricField) => esAggMetricField.getName());
   }
@@ -305,8 +306,8 @@ export class ESGeoGridSource extends AbstractESAggSource implements ITiledSingle
   _addNonCompositeAggsToSearchSource(
     searchSource: ISearchSource,
     indexPattern: IndexPattern,
-    precision: number | null,
-    bufferedExtent?: MapExtent | null
+    precision: number,
+    bufferedExtent?: MapExtent
   ) {
     searchSource.setField('aggs', {
       [GEOTILE_GRID_AGG_NAME]: {
@@ -419,7 +420,7 @@ export class ESGeoGridSource extends AbstractESAggSource implements ITiledSingle
   }
 
   getLayerName(): string {
-    return MVT_SOURCE_LAYER_NAME;
+    return ES_MVT_AGGS_LAYER_NAME;
   }
 
   async getUrlTemplateWithMeta(
@@ -427,14 +428,7 @@ export class ESGeoGridSource extends AbstractESAggSource implements ITiledSingle
   ): Promise<ITiledSingleLayerMvtParams> {
     const indexPattern = await this.getIndexPattern();
     const searchSource = await this.makeSearchSource(searchFilters, 0);
-
-    this._addNonCompositeAggsToSearchSource(
-      searchSource,
-      indexPattern,
-      null, // needs to be set server-side
-      null // needs to be stripped server-side
-    );
-
+    searchSource.setField('aggs', this.getValueAggsDsl(indexPattern));
     const dsl = searchSource.getSearchRequestBody();
 
     const risonDsl = rison.encode(dsl);
@@ -443,22 +437,18 @@ export class ESGeoGridSource extends AbstractESAggSource implements ITiledSingle
       `/${GIS_API_PATH}/${MVT_GETGRIDTILE_API_PATH}/{z}/{x}/{y}.pbf`
     );
 
-    const geoField = await this._getGeoField();
     const urlTemplate = `${mvtUrlServicePath}\
 ?geometryFieldName=${this._descriptor.geoField}\
 &index=${indexPattern.title}\
 &requestBody=${risonDsl}\
-&requestType=${this._descriptor.requestType}\
-&geoFieldType=${geoField.type}`;
+&requestType=${this._descriptor.requestType}`;
 
     return {
       refreshTokenParamName: MVT_TOKEN_PARAM_NAME,
       layerName: this.getLayerName(),
       minSourceZoom: this.getMinZoom(),
       maxSourceZoom: this.getMaxZoom(),
-      urlTemplate: searchFilters.searchSessionId
-        ? urlTemplate + `&searchSessionId=${searchFilters.searchSessionId}`
-        : urlTemplate,
+      urlTemplate,
     };
   }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.js
deleted file mode 100644
index 52f4e4c9b7b88..0000000000000
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { GRID_RESOLUTION } from '../../../../common/constants';
-import { EuiSelect, EuiFormRow } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-
-const BASE_OPTIONS = [
-  {
-    value: GRID_RESOLUTION.COARSE,
-    text: i18n.translate('xpack.maps.source.esGrid.coarseDropdownOption', {
-      defaultMessage: 'coarse',
-    }),
-  },
-  {
-    value: GRID_RESOLUTION.FINE,
-    text: i18n.translate('xpack.maps.source.esGrid.fineDropdownOption', {
-      defaultMessage: 'fine',
-    }),
-  },
-  {
-    value: GRID_RESOLUTION.MOST_FINE,
-    text: i18n.translate('xpack.maps.source.esGrid.finestDropdownOption', {
-      defaultMessage: 'finest',
-    }),
-  },
-];
-
-export function ResolutionEditor({ resolution, onChange, includeSuperFine }) {
-  const options = [...BASE_OPTIONS];
-
-  if (includeSuperFine) {
-    options.push({
-      value: GRID_RESOLUTION.SUPER_FINE,
-      text: i18n.translate('xpack.maps.source.esGrid.superFineDropDownOption', {
-        defaultMessage: 'super fine (beta)',
-      }),
-    });
-  }
-
-  return (
-    <EuiFormRow
-      label={i18n.translate('xpack.maps.geoGrid.resolutionLabel', {
-        defaultMessage: 'Grid resolution',
-      })}
-      display="columnCompressed"
-    >
-      <EuiSelect
-        options={options}
-        value={resolution}
-        onChange={(e) => onChange(e.target.value)}
-        compressed
-      />
-    </EuiFormRow>
-  );
-}
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.test.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.test.tsx
index 0066160402fa3..a642bbe41449f 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.test.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.test.tsx
@@ -8,7 +8,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-// @ts-expect-error
 import { ResolutionEditor } from './resolution_editor';
 import { GRID_RESOLUTION } from '../../../../common/constants';
 
@@ -16,6 +15,7 @@ const defaultProps = {
   resolution: GRID_RESOLUTION.COARSE,
   onChange: () => {},
   includeSuperFine: false,
+  metrics: [],
 };
 
 describe('resolution editor', () => {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.tsx
new file mode 100644
index 0000000000000..55ce46e121273
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.tsx
@@ -0,0 +1,161 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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, { ChangeEvent, Component } from 'react';
+import { EuiConfirmModal, EuiSelect, EuiFormRow } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { AggDescriptor } from '../../../../common/descriptor_types';
+import { AGG_TYPE, GRID_RESOLUTION } from '../../../../common/constants';
+
+const BASE_OPTIONS = [
+  {
+    value: GRID_RESOLUTION.COARSE,
+    text: i18n.translate('xpack.maps.source.esGrid.coarseDropdownOption', {
+      defaultMessage: 'coarse',
+    }),
+  },
+  {
+    value: GRID_RESOLUTION.FINE,
+    text: i18n.translate('xpack.maps.source.esGrid.fineDropdownOption', {
+      defaultMessage: 'fine',
+    }),
+  },
+  {
+    value: GRID_RESOLUTION.MOST_FINE,
+    text: i18n.translate('xpack.maps.source.esGrid.finestDropdownOption', {
+      defaultMessage: 'finest',
+    }),
+  },
+];
+
+function isUnsupportedVectorTileMetric(metric: AggDescriptor) {
+  return metric.type === AGG_TYPE.TERMS;
+}
+
+interface Props {
+  includeSuperFine: boolean;
+  resolution: GRID_RESOLUTION;
+  onChange: (resolution: GRID_RESOLUTION, metrics: AggDescriptor[]) => void;
+  metrics: AggDescriptor[];
+}
+
+interface State {
+  showModal: boolean;
+}
+
+export class ResolutionEditor extends Component<Props, State> {
+  private readonly _options = [...BASE_OPTIONS];
+
+  constructor(props: Props) {
+    super(props);
+
+    this.state = {
+      showModal: false,
+    };
+
+    if (props.includeSuperFine) {
+      this._options.push({
+        value: GRID_RESOLUTION.SUPER_FINE,
+        text: i18n.translate('xpack.maps.source.esGrid.superFineDropDownOption', {
+          defaultMessage: 'super fine',
+        }),
+      });
+    }
+  }
+
+  _onResolutionChange = (e: ChangeEvent<HTMLSelectElement>) => {
+    const resolution = e.target.value as GRID_RESOLUTION;
+    if (resolution === GRID_RESOLUTION.SUPER_FINE) {
+      const hasUnsupportedMetrics = this.props.metrics.find(isUnsupportedVectorTileMetric);
+      if (hasUnsupportedMetrics) {
+        this.setState({ showModal: true });
+        return;
+      }
+    }
+
+    this.props.onChange(resolution, this.props.metrics);
+  };
+
+  _closeModal = () => {
+    this.setState({
+      showModal: false,
+    });
+  };
+
+  _acceptModal = () => {
+    this._closeModal();
+    const supportedMetrics = this.props.metrics.filter((metric) => {
+      return !isUnsupportedVectorTileMetric(metric);
+    });
+    this.props.onChange(
+      GRID_RESOLUTION.SUPER_FINE,
+      supportedMetrics.length ? supportedMetrics : [{ type: AGG_TYPE.COUNT }]
+    );
+  };
+
+  _renderModal() {
+    return this.state.showModal ? (
+      <EuiConfirmModal
+        title={i18n.translate('xpack.maps.source.esGrid.vectorTileModal.title', {
+          defaultMessage: `'Top terms' metrics not supported`,
+        })}
+        onCancel={this._closeModal}
+        onConfirm={this._acceptModal}
+        cancelButtonText={i18n.translate(
+          'xpack.maps.source.esGrid.vectorTileModal.cancelBtnLabel',
+          {
+            defaultMessage: 'Cancel',
+          }
+        )}
+        confirmButtonText={i18n.translate(
+          'xpack.maps.source.esGrid.vectorTileModal.confirmBtnLabel',
+          {
+            defaultMessage: 'Accept',
+          }
+        )}
+        buttonColor="danger"
+        defaultFocusedButton="cancel"
+      >
+        <p>
+          <FormattedMessage
+            id="xpack.maps.source.esGrid.vectorTileModal.message"
+            defaultMessage="Super fine grid resolution uses vector tiles from the Elasticsearch vector tile API. Elasticsearch vector tile API does not support 'Top terms' metric. Switching to super fine grid resolution will remove all 'Top terms' metrics from your layer configuration."
+          />
+        </p>
+      </EuiConfirmModal>
+    ) : null;
+  }
+
+  render() {
+    const helpText =
+      this.props.resolution === GRID_RESOLUTION.SUPER_FINE
+        ? i18n.translate('xpack.maps.source.esGrid.superFineHelpText', {
+            defaultMessage: 'Super fine grid resolution uses vector tiles.',
+          })
+        : undefined;
+    return (
+      <>
+        {this._renderModal()}
+        <EuiFormRow
+          label={i18n.translate('xpack.maps.geoGrid.resolutionLabel', {
+            defaultMessage: 'Grid resolution',
+          })}
+          helpText={helpText}
+          display="columnCompressed"
+        >
+          <EuiSelect
+            options={this._options}
+            value={this.props.resolution}
+            onChange={this._onResolutionChange}
+            compressed
+          />
+        </EuiFormRow>
+      </>
+    );
+  }
+}
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.test.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.test.tsx
index 18a263143afea..9dab6698b73f0 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.test.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.test.tsx
@@ -8,14 +8,19 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-// @ts-expect-error
 import { UpdateSourceEditor } from './update_source_editor';
 import { GRID_RESOLUTION, LAYER_TYPE, RENDER_AS } from '../../../../common/constants';
 
+jest.mock('uuid/v4', () => {
+  return function () {
+    return '12345';
+  };
+});
+
 const defaultProps = {
   currentLayerType: LAYER_TYPE.VECTOR,
   indexPatternId: 'foobar',
-  onChange: () => {},
+  onChange: async () => {},
   metrics: [],
   renderAs: RENDER_AS.POINT,
   resolution: GRID_RESOLUTION.COARSE,
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx
similarity index 61%
rename from x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js
rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx
index c2a0935c23719..03b5e1fe3c794 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.tsx
@@ -7,20 +7,40 @@
 
 import React, { Fragment, Component } from 'react';
 
+import uuid from 'uuid/v4';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiPanel, EuiSpacer, EuiComboBoxOptionOption, EuiTitle } from '@elastic/eui';
 import { getDataViewNotFoundMessage } from '../../../../common/i18n_getters';
-import { GRID_RESOLUTION, LAYER_TYPE } from '../../../../common/constants';
+import { AGG_TYPE, GRID_RESOLUTION, LAYER_TYPE, RENDER_AS } from '../../../../common/constants';
 import { MetricsEditor } from '../../../components/metrics_editor';
 import { getIndexPatternService } from '../../../kibana_services';
 import { ResolutionEditor } from './resolution_editor';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { isMetricCountable } from '../../util/is_metric_countable';
-import { indexPatterns } from '../../../../../../../src/plugins/data/public';
+import { IndexPatternField, indexPatterns } from '../../../../../../../src/plugins/data/public';
 import { RenderAsSelect } from './render_as_select';
+import { AggDescriptor } from '../../../../common/descriptor_types';
+import { OnSourceChangeArgs } from '../source';
+
+interface Props {
+  currentLayerType?: string;
+  indexPatternId: string;
+  onChange: (...args: OnSourceChangeArgs[]) => Promise<void>;
+  metrics: AggDescriptor[];
+  renderAs: RENDER_AS;
+  resolution: GRID_RESOLUTION;
+}
 
-export class UpdateSourceEditor extends Component {
-  state = {
-    fields: null,
+interface State {
+  metricsEditorKey: string;
+  fields: IndexPatternField[];
+  loadError?: string;
+}
+
+export class UpdateSourceEditor extends Component<Props, State> {
+  private _isMounted?: boolean;
+  state: State = {
+    fields: [],
+    metricsEditorKey: uuid(),
   };
 
   componentDidMount() {
@@ -54,11 +74,11 @@ export class UpdateSourceEditor extends Component {
     });
   }
 
-  _onMetricsChange = (metrics) => {
+  _onMetricsChange = (metrics: AggDescriptor[]) => {
     this.props.onChange({ propName: 'metrics', value: metrics });
   };
 
-  _onResolutionChange = (resolution) => {
+  _onResolutionChange = async (resolution: GRID_RESOLUTION, metrics: AggDescriptor[]) => {
     let newLayerType;
     if (
       this.props.currentLayerType === LAYER_TYPE.VECTOR ||
@@ -76,22 +96,36 @@ export class UpdateSourceEditor extends Component {
       throw new Error('Unexpected layer-type');
     }
 
-    this.props.onChange({ propName: 'resolution', value: resolution, newLayerType });
+    await this.props.onChange(
+      { propName: 'metrics', value: metrics },
+      { propName: 'resolution', value: resolution, newLayerType }
+    );
+
+    // Metrics editor persists metrics in state.
+    // Reset metricsEditorKey to force new instance and new internal state with latest metrics
+    this.setState({ metricsEditorKey: uuid() });
   };
 
-  _onRequestTypeSelect = (requestType) => {
+  _onRequestTypeSelect = (requestType: RENDER_AS) => {
     this.props.onChange({ propName: 'requestType', value: requestType });
   };
 
+  _getMetricsFilter() {
+    if (this.props.currentLayerType === LAYER_TYPE.HEATMAP) {
+      return (metric: EuiComboBoxOptionOption<AGG_TYPE>) => {
+        // these are countable metrics, where blending heatmap color blobs make sense
+        return metric.value ? isMetricCountable(metric.value) : false;
+      };
+    }
+
+    if (this.props.resolution === GRID_RESOLUTION.SUPER_FINE) {
+      return (metric: EuiComboBoxOptionOption<AGG_TYPE>) => {
+        return metric.value !== AGG_TYPE.TERMS;
+      };
+    }
+  }
+
   _renderMetricsPanel() {
-    const metricsFilter =
-      this.props.currentLayerType === LAYER_TYPE.HEATMAP
-        ? (metric) => {
-            //these are countable metrics, where blending heatmap color blobs make sense
-            return isMetricCountable(metric.value);
-          }
-        : null;
-    const allowMultipleMetrics = this.props.currentLayerType !== LAYER_TYPE.HEATMAP;
     return (
       <EuiPanel>
         <EuiTitle size="xs">
@@ -101,8 +135,9 @@ export class UpdateSourceEditor extends Component {
         </EuiTitle>
         <EuiSpacer size="m" />
         <MetricsEditor
-          allowMultipleMetrics={allowMultipleMetrics}
-          metricsFilter={metricsFilter}
+          key={this.state.metricsEditorKey}
+          allowMultipleMetrics={this.props.currentLayerType !== LAYER_TYPE.HEATMAP}
+          metricsFilter={this._getMetricsFilter()}
           fields={this.state.fields}
           metrics={this.props.metrics}
           onChange={this._onMetricsChange}
@@ -131,6 +166,7 @@ export class UpdateSourceEditor extends Component {
             includeSuperFine={this.props.currentLayerType !== LAYER_TYPE.HEATMAP}
             resolution={this.props.resolution}
             onChange={this._onResolutionChange}
+            metrics={this.props.metrics}
           />
           <RenderAsSelect
             isColumnCompressed
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js
index 2137706bec4a8..628230285a3e0 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js
@@ -155,6 +155,8 @@ export class CreateSourceEditor extends Component {
                 )
               : null
           }
+          hasJoins={false}
+          clearJoins={() => {}}
         />
       </Fragment>
     );
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
index 6359abd06d3be..aad377ef53649 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
@@ -31,7 +31,7 @@ describe('ESSearchSource', () => {
       const esSearchSource = new ESSearchSource(mockDescriptor);
       expect(esSearchSource.getMinZoom()).toBe(0);
       expect(esSearchSource.getMaxZoom()).toBe(24);
-      expect(esSearchSource.getLayerName()).toBe('source_layer');
+      expect(esSearchSource.getLayerName()).toBe('hits');
     });
 
     describe('getUrlTemplateWithMeta', () => {
@@ -117,21 +117,7 @@ describe('ESSearchSource', () => {
         });
         const urlTemplateWithMeta = await esSearchSource.getUrlTemplateWithMeta(searchFilters);
         expect(urlTemplateWithMeta.urlTemplate).toBe(
-          `rootdir/api/maps/mvt/getTile/{z}/{x}/{y}.pbf?geometryFieldName=bar&index=foobar-title-*&requestBody=(foobar:ES_DSL_PLACEHOLDER,params:('0':('0':index,'1':(fields:(),title:'foobar-title-*')),'1':('0':size,'1':1000),'2':('0':filter,'1':!()),'3':('0':query),'4':('0':index,'1':(fields:(),title:'foobar-title-*')),'5':('0':query,'1':(language:KQL,query:'tooltipField: foobar')),'6':('0':fieldsFromSource,'1':!(tooltipField,styleField)),'7':('0':source,'1':!(tooltipField,styleField))))&geoFieldType=geo_shape`
-        );
-      });
-
-      it('should include searchSourceId in urlTemplateWithMeta', async () => {
-        const esSearchSource = new ESSearchSource({
-          geoField: geoFieldName,
-          indexPatternId: 'ipId',
-        });
-        const urlTemplateWithMeta = await esSearchSource.getUrlTemplateWithMeta({
-          ...searchFilters,
-          searchSessionId: '1',
-        });
-        expect(urlTemplateWithMeta.urlTemplate).toBe(
-          `rootdir/api/maps/mvt/getTile/{z}/{x}/{y}.pbf?geometryFieldName=bar&index=foobar-title-*&requestBody=(foobar:ES_DSL_PLACEHOLDER,params:('0':('0':index,'1':(fields:(),title:'foobar-title-*')),'1':('0':size,'1':1000),'2':('0':filter,'1':!()),'3':('0':query),'4':('0':index,'1':(fields:(),title:'foobar-title-*')),'5':('0':query,'1':(language:KQL,query:'tooltipField: foobar')),'6':('0':fieldsFromSource,'1':!(tooltipField,styleField)),'7':('0':source,'1':!(tooltipField,styleField))))&geoFieldType=geo_shape&searchSessionId=1`
+          `rootdir/api/maps/mvt/getTile/{z}/{x}/{y}.pbf?geometryFieldName=bar&index=foobar-title-*&requestBody=(foobar:ES_DSL_PLACEHOLDER,params:('0':('0':index,'1':(fields:(),title:'foobar-title-*')),'1':('0':size,'1':1000),'2':('0':filter,'1':!()),'3':('0':query),'4':('0':index,'1':(fields:(),title:'foobar-title-*')),'5':('0':query,'1':(language:KQL,query:'tooltipField: foobar')),'6':('0':fieldsFromSource,'1':!(tooltipField,styleField)),'7':('0':source,'1':!(tooltipField,styleField))))`
         );
       });
     });
@@ -162,7 +148,7 @@ describe('ESSearchSource', () => {
         scalingType: SCALING_TYPES.MVT,
       });
       expect(esSearchSource.getJoinsDisabledReason()).toBe(
-        'Joins are not supported when scaling by mvt vector tiles'
+        'Joins are not supported when scaling by vector tiles'
       );
     });
   });
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
index 75ec128f5a8aa..31cc07d03549a 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx
@@ -9,8 +9,8 @@ import _ from 'lodash';
 import React, { ReactElement } from 'react';
 import rison from 'rison-node';
 import { i18n } from '@kbn/i18n';
-import type { Filter, IndexPatternField, IndexPattern } from 'src/plugins/data/public';
 import { GeoJsonProperties, Geometry, Position } from 'geojson';
+import type { Filter, IndexPatternField, IndexPattern } from 'src/plugins/data/public';
 import { esFilters } from '../../../../../../../src/plugins/data/public';
 import { AbstractESSource } from '../es_source';
 import {
@@ -35,7 +35,6 @@ import {
   FIELD_ORIGIN,
   GIS_API_PATH,
   MVT_GETTILE_API_PATH,
-  MVT_SOURCE_LAYER_NAME,
   MVT_TOKEN_PARAM_NAME,
   SCALING_TYPES,
   SOURCE_TYPES,
@@ -54,14 +53,17 @@ import {
   VectorSourceRequestMeta,
 } from '../../../../common/descriptor_types';
 import { Adapters } from '../../../../../../../src/plugins/inspector/common/adapters';
-import { TimeRange } from '../../../../../../../src/plugins/data/common';
+import {
+  SortDirection,
+  SortDirectionNumeric,
+  TimeRange,
+} from '../../../../../../../src/plugins/data/common';
 import { ImmutableSourceProperty, SourceEditorArgs } from '../source';
 import { IField } from '../../fields/field';
 import { GeoJsonWithMeta, SourceTooltipConfig } from '../vector_source';
 import { ITiledSingleLayerVectorSource } from '../tiled_single_layer_vector_source';
 import { ITooltipProperty } from '../../tooltips/tooltip_property';
 import { DataRequest } from '../../util/data_request';
-import { SortDirection, SortDirectionNumeric } from '../../../../../../../src/plugins/data/common';
 import { isValidStringConfig } from '../../util/valid_string_config';
 import { TopHitsUpdateSourceEditor } from './top_hits';
 import { getDocValueAndSourceFields, ScriptField } from './util/get_docvalue_source_fields';
@@ -83,6 +85,8 @@ type ESSearchSourceSyncMeta = Pick<
   | 'topHitsSize'
 >;
 
+const ES_MVT_HITS_LAYER_NAME = 'hits';
+
 export function timerangeToTimeextent(timerange: TimeRange): Timeslice | undefined {
   const timeRangeBounds = getTimeFilter().calculateBounds(timerange);
   return timeRangeBounds.min !== undefined && timeRangeBounds.max !== undefined
@@ -185,6 +189,8 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
         sortOrder={this._descriptor.sortOrder}
         scalingType={this._descriptor.scalingType}
         filterByMapBounds={this.isFilterByMapBounds()}
+        hasJoins={sourceEditorArgs.hasJoins}
+        clearJoins={sourceEditorArgs.clearJoins}
       />
     );
   }
@@ -211,6 +217,10 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
     return [this._descriptor.geoField];
   }
 
+  isMvt() {
+    return this._descriptor.scalingType === SCALING_TYPES.MVT;
+  }
+
   async getImmutableProperties(): Promise<ImmutableSourceProperty[]> {
     let indexPatternName = this.getIndexPatternId();
     let geoFieldType = '';
@@ -748,7 +758,7 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
       });
     } else if (this._descriptor.scalingType === SCALING_TYPES.MVT) {
       reason = i18n.translate('xpack.maps.source.esSearch.joinsDisabledReasonMvt', {
-        defaultMessage: 'Joins are not supported when scaling by mvt vector tiles',
+        defaultMessage: 'Joins are not supported when scaling by vector tiles',
       });
     } else {
       reason = null;
@@ -757,7 +767,7 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
   }
 
   getLayerName(): string {
-    return MVT_SOURCE_LAYER_NAME;
+    return ES_MVT_HITS_LAYER_NAME;
   }
 
   async _getEditableIndex(): Promise<string> {
@@ -828,22 +838,17 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye
       `/${GIS_API_PATH}/${MVT_GETTILE_API_PATH}/{z}/{x}/{y}.pbf`
     );
 
-    const geoField = await this._getGeoField();
-
     const urlTemplate = `${mvtUrlServicePath}\
 ?geometryFieldName=${this._descriptor.geoField}\
 &index=${indexPattern.title}\
-&requestBody=${risonDsl}\
-&geoFieldType=${geoField.type}`;
+&requestBody=${risonDsl}`;
 
     return {
       refreshTokenParamName: MVT_TOKEN_PARAM_NAME,
       layerName: this.getLayerName(),
       minSourceZoom: this.getMinZoom(),
       maxSourceZoom: this.getMaxZoom(),
-      urlTemplate: searchFilters.searchSessionId
-        ? urlTemplate + `&searchSessionId=${searchFilters.searchSessionId}`
-        : urlTemplate,
+      urlTemplate,
     };
   }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
index c28c8bedafaf9..ad0e03c2fe09d 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
@@ -35,6 +35,8 @@ export class UpdateSourceEditor extends Component {
     sortOrder: PropTypes.string.isRequired,
     scalingType: PropTypes.string.isRequired,
     source: PropTypes.object,
+    hasJoins: PropTypes.bool.isRequired,
+    clearJoins: PropTypes.func.isRequired,
   };
 
   state = {
@@ -205,6 +207,8 @@ export class UpdateSourceEditor extends Component {
           scalingType={this.props.scalingType}
           supportsClustering={this.state.supportsClustering}
           clusteringDisabledReason={this.state.clusteringDisabledReason}
+          hasJoins={this.props.hasJoins}
+          clearJoins={this.props.clearJoins}
         />
       </EuiPanel>
     );
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap
index 749d55aeb5da7..bafb3172bbc11 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/__snapshots__/scaling_form.test.tsx.snap
@@ -46,17 +46,7 @@ exports[`scaling form should disable clusters option when clustering is not supp
         />
       </EuiToolTip>
       <EuiToolTip
-        content={
-          <React.Fragment>
-            <EuiBetaBadge
-              label="beta"
-            />
-            <EuiHorizontalRule
-              margin="xs"
-            />
-            Use vector tiles for faster display of large datasets.
-          </React.Fragment>
-        }
+        content="Use vector tiles for faster display of large datasets."
         delay="regular"
         display="inlineBlock"
         position="left"
@@ -127,17 +117,7 @@ exports[`scaling form should render 1`] = `
         onChange={[Function]}
       />
       <EuiToolTip
-        content={
-          <React.Fragment>
-            <EuiBetaBadge
-              label="beta"
-            />
-            <EuiHorizontalRule
-              margin="xs"
-            />
-            Use vector tiles for faster display of large datasets.
-          </React.Fragment>
-        }
+        content="Use vector tiles for faster display of large datasets."
         delay="regular"
         display="inlineBlock"
         position="left"
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.test.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.test.tsx
index c02d855f13aa4..aa3c7b51df5bb 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.test.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.test.tsx
@@ -26,6 +26,8 @@ const defaultProps = {
   scalingType: SCALING_TYPES.LIMIT,
   supportsClustering: true,
   termFields: [],
+  hasJoins: false,
+  clearJoins: () => {},
 };
 
 describe('scaling form', () => {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.tsx
index 2d202e934cea9..896b493507322 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/scaling_form.tsx
@@ -7,15 +7,14 @@
 
 import React, { Component, Fragment } from 'react';
 import {
+  EuiConfirmModal,
   EuiFormRow,
-  EuiHorizontalRule,
   EuiRadio,
   EuiSpacer,
   EuiSwitch,
   EuiSwitchEvent,
   EuiTitle,
   EuiToolTip,
-  EuiBetaBadge,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -35,15 +34,20 @@ interface Props {
   scalingType: SCALING_TYPES;
   supportsClustering: boolean;
   clusteringDisabledReason?: string | null;
+  hasJoins: boolean;
+  clearJoins: () => void;
 }
 
 interface State {
+  nextScalingType?: SCALING_TYPES;
   maxResultWindow: string;
+  showModal: boolean;
 }
 
 export class ScalingForm extends Component<Props, State> {
-  state = {
+  state: State = {
     maxResultWindow: DEFAULT_MAX_RESULT_WINDOW.toLocaleString(),
+    showModal: false,
   };
   _isMounted = false;
 
@@ -68,7 +72,15 @@ export class ScalingForm extends Component<Props, State> {
     }
   }
 
-  _onScalingTypeChange = (optionId: string): void => {
+  _onScalingTypeSelect = (optionId: SCALING_TYPES): void => {
+    if (this.props.hasJoins && optionId !== SCALING_TYPES.LIMIT) {
+      this._openModal(optionId);
+    } else {
+      this._onScalingTypeChange(optionId);
+    }
+  };
+
+  _onScalingTypeChange = (optionId: SCALING_TYPES): void => {
     let layerType;
     if (optionId === SCALING_TYPES.CLUSTERS) {
       layerType = LAYER_TYPE.BLENDED_VECTOR;
@@ -85,6 +97,69 @@ export class ScalingForm extends Component<Props, State> {
     this.props.onChange({ propName: 'filterByMapBounds', value: event.target.checked });
   };
 
+  _openModal = (optionId: SCALING_TYPES) => {
+    this.setState({
+      nextScalingType: optionId,
+      showModal: true,
+    });
+  };
+
+  _closeModal = () => {
+    this.setState({
+      nextScalingType: undefined,
+      showModal: false,
+    });
+  };
+
+  _acceptModal = () => {
+    this.props.clearJoins();
+    this._onScalingTypeChange(this.state.nextScalingType!);
+    this._closeModal();
+  };
+
+  _renderModal() {
+    if (!this.state.showModal || this.state.nextScalingType === undefined) {
+      return null;
+    }
+
+    const scalingOptionLabel =
+      this.state.nextScalingType === SCALING_TYPES.CLUSTERS
+        ? i18n.translate('xpack.maps.source.esSearch.scalingModal.clusters', {
+            defaultMessage: `clusters`,
+          })
+        : i18n.translate('xpack.maps.source.esSearch.scalingModal.vectorTiles', {
+            defaultMessage: `vector tiles`,
+          });
+    return (
+      <EuiConfirmModal
+        title={i18n.translate('xpack.maps.source.esSearch.scalingModal.title', {
+          defaultMessage: `Term joins not supported`,
+        })}
+        onCancel={this._closeModal}
+        onConfirm={this._acceptModal}
+        cancelButtonText={i18n.translate('xpack.maps.source.esSearch.scalingModal.cancelBtnLabel', {
+          defaultMessage: 'Cancel',
+        })}
+        confirmButtonText={i18n.translate(
+          'xpack.maps.source.esSearch.scalingModal.confirmBtnLabel',
+          {
+            defaultMessage: 'Accept',
+          }
+        )}
+        buttonColor="danger"
+        defaultFocusedButton="cancel"
+      >
+        <p>
+          <FormattedMessage
+            id="xpack.maps.source.esSearch.scalingModal.message"
+            defaultMessage="Scaling option {scalingOptionLabel} does not support term joins. Switching to {scalingOptionLabel} will remove all term joins from your layer configuration."
+            values={{ scalingOptionLabel }}
+          />
+        </p>
+      </EuiConfirmModal>
+    );
+  }
+
   _renderClusteringRadio() {
     const clusteringRadio = (
       <EuiRadio
@@ -94,7 +169,7 @@ export class ScalingForm extends Component<Props, State> {
           values: { maxResultWindow: this.state.maxResultWindow },
         })}
         checked={this.props.scalingType === SCALING_TYPES.CLUSTERS}
-        onChange={() => this._onScalingTypeChange(SCALING_TYPES.CLUSTERS)}
+        onChange={() => this._onScalingTypeSelect(SCALING_TYPES.CLUSTERS)}
         disabled={!this.props.supportsClustering}
       />
     );
@@ -108,36 +183,6 @@ export class ScalingForm extends Component<Props, State> {
     );
   }
 
-  _renderMVTRadio() {
-    const labelText = i18n.translate('xpack.maps.source.esSearch.useMVTVectorTiles', {
-      defaultMessage: 'Use vector tiles',
-    });
-    const mvtRadio = (
-      <EuiRadio
-        id={SCALING_TYPES.MVT}
-        label={labelText}
-        checked={this.props.scalingType === SCALING_TYPES.MVT}
-        onChange={() => this._onScalingTypeChange(SCALING_TYPES.MVT)}
-      />
-    );
-
-    const enabledInfo = (
-      <>
-        <EuiBetaBadge label={'beta'} />
-        <EuiHorizontalRule margin="xs" />
-        {i18n.translate('xpack.maps.source.esSearch.mvtDescription', {
-          defaultMessage: 'Use vector tiles for faster display of large datasets.',
-        })}
-      </>
-    );
-
-    return (
-      <EuiToolTip position="left" content={enabledInfo}>
-        {mvtRadio}
-      </EuiToolTip>
-    );
-  }
-
   render() {
     let filterByBoundsSwitch;
     if (this.props.scalingType === SCALING_TYPES.LIMIT) {
@@ -157,6 +202,7 @@ export class ScalingForm extends Component<Props, State> {
 
     return (
       <Fragment>
+        {this._renderModal()}
         <EuiTitle size="xs">
           <h5>
             <FormattedMessage id="xpack.maps.esSearch.scaleTitle" defaultMessage="Scaling" />
@@ -174,10 +220,24 @@ export class ScalingForm extends Component<Props, State> {
                 values: { maxResultWindow: this.state.maxResultWindow },
               })}
               checked={this.props.scalingType === SCALING_TYPES.LIMIT}
-              onChange={() => this._onScalingTypeChange(SCALING_TYPES.LIMIT)}
+              onChange={() => this._onScalingTypeSelect(SCALING_TYPES.LIMIT)}
             />
             {this._renderClusteringRadio()}
-            {this._renderMVTRadio()}
+            <EuiToolTip
+              position="left"
+              content={i18n.translate('xpack.maps.source.esSearch.mvtDescription', {
+                defaultMessage: 'Use vector tiles for faster display of large datasets.',
+              })}
+            >
+              <EuiRadio
+                id={SCALING_TYPES.MVT}
+                label={i18n.translate('xpack.maps.source.esSearch.useMVTVectorTiles', {
+                  defaultMessage: 'Use vector tiles',
+                })}
+                checked={this.props.scalingType === SCALING_TYPES.MVT}
+                onChange={() => this._onScalingTypeSelect(SCALING_TYPES.MVT)}
+              />
+            </EuiToolTip>
           </div>
         </EuiFormRow>
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts
index 0fa6335c1e0d9..ed95fdbb022fd 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts
@@ -20,7 +20,7 @@ import { getDataViewNotFoundMessage } from '../../../../common/i18n_getters';
 import { createExtentFilter } from '../../../../common/elasticsearch_util';
 import { copyPersistentState } from '../../../reducers/copy_persistent_state';
 import { DataRequestAbortError } from '../../util/data_request';
-import { expandToTileBoundaries } from '../../../../common/geo_tile_utils';
+import { expandToTileBoundaries } from '../../util/geo_tile_utils';
 import { IVectorSource } from '../vector_source';
 import { TimeRange } from '../../../../../../../src/plugins/data/common';
 import {
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_field_config_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_field_config_editor.test.tsx.snap
index f6d0129e85abf..b8f7af8b3844e 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_field_config_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_field_config_editor.test.tsx.snap
@@ -5,7 +5,6 @@ exports[`should render error for dupes 1`] = `
   <EuiFlexGroup
     alignItems="center"
     gutterSize="xs"
-    key="0"
   >
     <EuiFlexItem>
       <EuiFieldText
@@ -88,7 +87,6 @@ exports[`should render error for dupes 1`] = `
   <EuiFlexGroup
     alignItems="center"
     gutterSize="xs"
-    key="1"
   >
     <EuiFlexItem>
       <EuiFieldText
@@ -196,7 +194,6 @@ exports[`should render error for empty name 1`] = `
   <EuiFlexGroup
     alignItems="center"
     gutterSize="xs"
-    key="0"
   >
     <EuiFlexItem>
       <EuiFieldText
@@ -304,7 +301,6 @@ exports[`should render field editor 1`] = `
   <EuiFlexGroup
     alignItems="center"
     gutterSize="xs"
-    key="0"
   >
     <EuiFlexItem>
       <EuiFieldText
@@ -387,7 +383,6 @@ exports[`should render field editor 1`] = `
   <EuiFlexGroup
     alignItems="center"
     gutterSize="xs"
-    key="1"
   >
     <EuiFlexItem>
       <EuiFieldText
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_field_config_editor.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_field_config_editor.tsx
index 77ff783f72e95..8924e346c94dc 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_field_config_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_field_config_editor.tsx
@@ -178,14 +178,14 @@ export class MVTFieldConfigEditor extends Component<Props, State> {
   _renderFieldConfig() {
     return this.state.currentFields.map((mvtFieldConfig: MVTFieldDescriptor, index: number) => {
       return (
-        <>
-          <EuiFlexGroup key={index} gutterSize="xs" alignItems="center">
+        <Fragment key={index}>
+          <EuiFlexGroup gutterSize="xs" alignItems="center">
             <EuiFlexItem>{this._renderFieldNameInput(mvtFieldConfig, index)}</EuiFlexItem>
             <EuiFlexItem>{this._renderFieldTypeDropDown(mvtFieldConfig, index)}</EuiFlexItem>
             <EuiFlexItem grow={false}>{this._renderFieldButtonDelete(index)}</EuiFlexItem>
           </EuiFlexGroup>
           <EuiSpacer size={'xs'} />
-        </>
+        </Fragment>
       );
     });
   }
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
index 34a30ae9ec977..387bb9c3ca1ff 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
@@ -82,6 +82,10 @@ export class MVTSingleLayerVectorSource
       .filter((f) => f !== null) as MVTField[];
   }
 
+  isMvt() {
+    return true;
+  }
+
   async supportsFitToBounds() {
     return false;
   }
diff --git a/x-pack/plugins/maps/public/classes/sources/source.ts b/x-pack/plugins/maps/public/classes/sources/source.ts
index 4c2cffcf8b070..0ecca16fde07b 100644
--- a/x-pack/plugins/maps/public/classes/sources/source.ts
+++ b/x-pack/plugins/maps/public/classes/sources/source.ts
@@ -29,8 +29,10 @@ export type OnSourceChangeArgs = {
 };
 
 export type SourceEditorArgs = {
-  onChange: (...args: OnSourceChangeArgs[]) => void;
-  currentLayerType?: string;
+  clearJoins: () => void;
+  currentLayerType: string;
+  hasJoins: boolean;
+  onChange: (...args: OnSourceChangeArgs[]) => Promise<void>;
 };
 
 export type ImmutableSourceProperty = {
@@ -43,6 +45,7 @@ export interface ISource {
   destroy(): void;
   getDisplayName(): Promise<string>;
   getInspectorAdapters(): Adapters | undefined;
+  getType(): string;
   isFieldAware(): boolean;
   isFilterByMapBounds(): boolean;
   isGeoGridPrecisionAware(): boolean;
@@ -101,6 +104,10 @@ export class AbstractSource implements ISource {
     return this._inspectorAdapters;
   }
 
+  getType(): string {
+    return this._descriptor.type;
+  }
+
   async getDisplayName(): Promise<string> {
     return '';
   }
diff --git a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
index 3c0adf64216e6..7042374296bbe 100644
--- a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.tsx
@@ -9,7 +9,7 @@ import type { Query } from 'src/plugins/data/common';
 import { FeatureCollection, GeoJsonProperties, Geometry, Position } from 'geojson';
 import { Filter, TimeRange } from 'src/plugins/data/public';
 import { VECTOR_SHAPE_TYPE } from '../../../../common/constants';
-import { TooltipProperty, ITooltipProperty } from '../../tooltips/tooltip_property';
+import { ITooltipProperty, TooltipProperty } from '../../tooltips/tooltip_property';
 import { AbstractSource, ISource } from '../source';
 import { IField } from '../../fields/field';
 import {
@@ -44,6 +44,7 @@ export interface BoundsRequestMeta {
 }
 
 export interface IVectorSource extends ISource {
+  isMvt(): boolean;
   getTooltipProperties(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
   getBoundsForFilters(
     layerDataFilters: BoundsRequestMeta,
@@ -89,6 +90,10 @@ export class AbstractVectorSource extends AbstractSource implements IVectorSourc
     return [];
   }
 
+  isMvt() {
+    return false;
+  }
+
   createField({ fieldName }: { fieldName: string }): IField {
     throw new Error('Not implemented');
   }
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
index 64da5777988d1..be8c9b0750b94 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
@@ -384,546 +384,6 @@ exports[`should render 1`] = `
 </Fragment>
 `;
 
-exports[`should render line-style with label properties when ES-source is rendered as mvt 1`] = `
-<Fragment>
-  <VectorStyleColorEditor
-    defaultDynamicStyleOptions={
-      Object {
-        "color": "Blues",
-        "colorCategory": "palette_0",
-        "field": undefined,
-        "fieldMetaOptions": Object {
-          "isEnabled": true,
-          "sigma": 3,
-        },
-      }
-    }
-    defaultStaticStyleOptions={
-      Object {
-        "color": "#41937c",
-      }
-    }
-    disabled={false}
-    disabledBy="lineWidth"
-    fields={
-      Array [
-        Object {
-          "label": "field0",
-          "name": "field0",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-        Object {
-          "label": "field1",
-          "name": "field1",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-      ]
-    }
-    onDynamicStyleChange={[Function]}
-    onStaticStyleChange={[Function]}
-    styleProperty={
-      StaticColorProperty {
-        "_options": Object {
-          "color": "#41937c",
-        },
-        "_styleName": "lineColor",
-      }
-    }
-    swatches={
-      Array [
-        "#41937c",
-        "#4379aa",
-        "#c83868",
-        "#7751a4",
-        "#ba6b95",
-        "#c9ad31",
-        "#a69168",
-        "#c57127",
-        "#885145",
-        "#e1401f",
-        "#000",
-        "#FFF",
-      ]
-    }
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <VectorStyleSizeEditor
-    defaultDynamicStyleOptions={
-      Object {
-        "field": undefined,
-        "fieldMetaOptions": Object {
-          "isEnabled": true,
-          "sigma": 3,
-        },
-        "maxSize": 10,
-        "minSize": 1,
-      }
-    }
-    defaultStaticStyleOptions={
-      Object {
-        "size": 1,
-      }
-    }
-    disabled={false}
-    disabledBy="iconSize"
-    fields={Array []}
-    onDynamicStyleChange={[Function]}
-    onStaticStyleChange={[Function]}
-    styleProperty={
-      StaticSizeProperty {
-        "_options": Object {
-          "size": 1,
-        },
-        "_styleName": "lineWidth",
-      }
-    }
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <VectorStyleLabelEditor
-    defaultDynamicStyleOptions={
-      Object {
-        "field": undefined,
-      }
-    }
-    defaultStaticStyleOptions={
-      Object {
-        "value": "",
-      }
-    }
-    fields={
-      Array [
-        Object {
-          "label": "field0",
-          "name": "field0",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-        Object {
-          "label": "field1",
-          "name": "field1",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-      ]
-    }
-    onDynamicStyleChange={[Function]}
-    onStaticStyleChange={[Function]}
-    styleProperty={
-      StaticTextProperty {
-        "_options": Object {
-          "value": "",
-        },
-        "_styleName": "labelText",
-      }
-    }
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <VectorStyleColorEditor
-    defaultDynamicStyleOptions={
-      Object {
-        "color": "Blues",
-        "colorCategory": "palette_0",
-        "field": undefined,
-        "fieldMetaOptions": Object {
-          "isEnabled": true,
-          "sigma": 3,
-        },
-      }
-    }
-    defaultStaticStyleOptions={
-      Object {
-        "color": "#000000",
-      }
-    }
-    disabled={true}
-    disabledBy="labelText"
-    fields={
-      Array [
-        Object {
-          "label": "field0",
-          "name": "field0",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-        Object {
-          "label": "field1",
-          "name": "field1",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-      ]
-    }
-    onDynamicStyleChange={[Function]}
-    onStaticStyleChange={[Function]}
-    styleProperty={
-      StaticColorProperty {
-        "_options": Object {
-          "color": "#000000",
-        },
-        "_styleName": "labelColor",
-      }
-    }
-    swatches={
-      Array [
-        "#41937c",
-        "#4379aa",
-        "#c83868",
-        "#7751a4",
-        "#ba6b95",
-        "#c9ad31",
-        "#a69168",
-        "#c57127",
-        "#885145",
-        "#e1401f",
-        "#000",
-        "#FFF",
-      ]
-    }
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <VectorStyleSizeEditor
-    defaultDynamicStyleOptions={
-      Object {
-        "field": undefined,
-        "fieldMetaOptions": Object {
-          "isEnabled": true,
-          "sigma": 3,
-        },
-        "maxSize": 32,
-        "minSize": 7,
-      }
-    }
-    defaultStaticStyleOptions={
-      Object {
-        "size": 14,
-      }
-    }
-    disabled={true}
-    disabledBy="labelText"
-    fields={Array []}
-    onDynamicStyleChange={[Function]}
-    onStaticStyleChange={[Function]}
-    styleProperty={
-      StaticSizeProperty {
-        "_options": Object {
-          "size": 14,
-        },
-        "_styleName": "labelSize",
-      }
-    }
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <VectorStyleColorEditor
-    defaultDynamicStyleOptions={
-      Object {
-        "color": "Blues",
-        "colorCategory": "palette_0",
-        "field": undefined,
-        "fieldMetaOptions": Object {
-          "isEnabled": true,
-          "sigma": 3,
-        },
-      }
-    }
-    defaultStaticStyleOptions={
-      Object {
-        "color": "#FFFFFF",
-      }
-    }
-    disabled={true}
-    disabledBy="labelText"
-    fields={
-      Array [
-        Object {
-          "label": "field0",
-          "name": "field0",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-        Object {
-          "label": "field1",
-          "name": "field1",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-      ]
-    }
-    onDynamicStyleChange={[Function]}
-    onStaticStyleChange={[Function]}
-    styleProperty={
-      StaticColorProperty {
-        "_options": Object {
-          "color": "#FFFFFF",
-        },
-        "_styleName": "labelBorderColor",
-      }
-    }
-    swatches={
-      Array [
-        "#41937c",
-        "#4379aa",
-        "#c83868",
-        "#7751a4",
-        "#ba6b95",
-        "#c9ad31",
-        "#a69168",
-        "#c57127",
-        "#885145",
-        "#e1401f",
-        "#000",
-        "#FFF",
-      ]
-    }
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <VectorStyleLabelBorderSizeEditor
-    disabled={true}
-    disabledBy="labelText"
-    handlePropertyChange={[Function]}
-    styleProperty={
-      LabelBorderSizeProperty {
-        "_labelSizeProperty": StaticSizeProperty {
-          "_options": Object {
-            "size": 14,
-          },
-          "_styleName": "labelSize",
-        },
-        "_options": Object {
-          "size": "SMALL",
-        },
-        "_styleName": "labelBorderSize",
-      }
-    }
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <EuiFormRow
-    describedByIds={Array []}
-    display="columnCompressedSwitch"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={true}
-      compressed={true}
-      label="Apply global time to style metadata requests"
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-</Fragment>
-`;
-
-exports[`should render polygon-style without label properties when 3rd party mvt 1`] = `
-<Fragment>
-  <VectorStyleColorEditor
-    defaultDynamicStyleOptions={
-      Object {
-        "color": "Blues",
-        "colorCategory": "palette_0",
-        "field": undefined,
-        "fieldMetaOptions": Object {
-          "isEnabled": true,
-          "sigma": 3,
-        },
-      }
-    }
-    defaultStaticStyleOptions={
-      Object {
-        "color": "#54B399",
-      }
-    }
-    disabled={false}
-    disabledBy="iconSize"
-    fields={
-      Array [
-        Object {
-          "label": "field0",
-          "name": "field0",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-        Object {
-          "label": "field1",
-          "name": "field1",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-      ]
-    }
-    onDynamicStyleChange={[Function]}
-    onStaticStyleChange={[Function]}
-    styleProperty={
-      StaticColorProperty {
-        "_options": Object {
-          "color": "#54B399",
-        },
-        "_styleName": "fillColor",
-      }
-    }
-    swatches={
-      Array [
-        "#54B399",
-        "#6092C0",
-        "#D36086",
-        "#9170B8",
-        "#CA8EAE",
-        "#D6BF57",
-        "#B9A888",
-        "#DA8B45",
-        "#AA6556",
-        "#E7664C",
-      ]
-    }
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <VectorStyleColorEditor
-    defaultDynamicStyleOptions={
-      Object {
-        "color": "Blues",
-        "colorCategory": "palette_0",
-        "field": undefined,
-        "fieldMetaOptions": Object {
-          "isEnabled": true,
-          "sigma": 3,
-        },
-      }
-    }
-    defaultStaticStyleOptions={
-      Object {
-        "color": "#41937c",
-      }
-    }
-    disabled={false}
-    disabledBy="lineWidth"
-    fields={
-      Array [
-        Object {
-          "label": "field0",
-          "name": "field0",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-        Object {
-          "label": "field1",
-          "name": "field1",
-          "origin": "source",
-          "supportsAutoDomain": true,
-          "type": "string",
-        },
-      ]
-    }
-    onDynamicStyleChange={[Function]}
-    onStaticStyleChange={[Function]}
-    styleProperty={
-      StaticColorProperty {
-        "_options": Object {
-          "color": "#41937c",
-        },
-        "_styleName": "lineColor",
-      }
-    }
-    swatches={
-      Array [
-        "#41937c",
-        "#4379aa",
-        "#c83868",
-        "#7751a4",
-        "#ba6b95",
-        "#c9ad31",
-        "#a69168",
-        "#c57127",
-        "#885145",
-        "#e1401f",
-        "#000",
-        "#FFF",
-      ]
-    }
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <VectorStyleSizeEditor
-    defaultDynamicStyleOptions={
-      Object {
-        "field": undefined,
-        "fieldMetaOptions": Object {
-          "isEnabled": true,
-          "sigma": 3,
-        },
-        "maxSize": 10,
-        "minSize": 1,
-      }
-    }
-    defaultStaticStyleOptions={
-      Object {
-        "size": 1,
-      }
-    }
-    disabled={false}
-    disabledBy="iconSize"
-    fields={Array []}
-    onDynamicStyleChange={[Function]}
-    onStaticStyleChange={[Function]}
-    styleProperty={
-      StaticSizeProperty {
-        "_options": Object {
-          "size": 1,
-        },
-        "_styleName": "lineWidth",
-      }
-    }
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <EuiFormRow
-    describedByIds={Array []}
-    display="columnCompressedSwitch"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={true}
-      compressed={true}
-      label="Apply global time to style metadata requests"
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-</Fragment>
-`;
-
 exports[`should render with no style fields 1`] = `
 <Fragment>
   <VectorStyleColorEditor
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx
index a53b5019a7587..4ec4948170c9c 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.test.tsx
@@ -14,7 +14,6 @@ import { IVectorSource } from '../../../sources/vector_source';
 import {
   FIELD_ORIGIN,
   LAYER_STYLE_TYPE,
-  LAYER_TYPE,
   VECTOR_SHAPE_TYPE,
   VECTOR_STYLES,
 } from '../../../../../common/constants';
@@ -31,12 +30,7 @@ jest.mock('../../../../kibana_services', () => {
 
 class MockField extends AbstractField {}
 
-function createLayerMock(
-  numFields: number,
-  supportedShapeTypes: VECTOR_SHAPE_TYPE[],
-  layerType: LAYER_TYPE = LAYER_TYPE.VECTOR,
-  isESSource: boolean = false
-) {
+function createLayerMock(numFields: number, supportedShapeTypes: VECTOR_SHAPE_TYPE[]) {
   const fields: IField[] = [];
   for (let i = 0; i < numFields; i++) {
     fields.push(new MockField({ fieldName: `field${i}`, origin: FIELD_ORIGIN.SOURCE }));
@@ -45,17 +39,11 @@ function createLayerMock(
     getStyleEditorFields: async () => {
       return fields;
     },
-    getType() {
-      return layerType;
-    },
     getSource: () => {
       return {
         getSupportedShapeTypes: async () => {
           return supportedShapeTypes;
         },
-        isESSource() {
-          return isESSource;
-        },
       } as unknown as IVectorSource;
     },
   } as unknown as IVectorLayer;
@@ -111,35 +99,3 @@ test('should render with no style fields', async () => {
 
   expect(component).toMatchSnapshot();
 });
-
-test('should render polygon-style without label properties when 3rd party mvt', async () => {
-  const component = shallow(
-    <VectorStyleEditor
-      {...defaultProps}
-      layer={createLayerMock(2, [VECTOR_SHAPE_TYPE.POLYGON], LAYER_TYPE.TILED_VECTOR, false)}
-    />
-  );
-
-  // Ensure all promises resolve
-  await new Promise((resolve) => process.nextTick(resolve));
-  // Ensure the state changes are reflected
-  component.update();
-
-  expect(component).toMatchSnapshot();
-});
-
-test('should render line-style with label properties when ES-source is rendered as mvt', async () => {
-  const component = shallow(
-    <VectorStyleEditor
-      {...defaultProps}
-      layer={createLayerMock(2, [VECTOR_SHAPE_TYPE.LINE], LAYER_TYPE.TILED_VECTOR, true)}
-    />
-  );
-
-  // Ensure all promises resolve
-  await new Promise((resolve) => process.nextTick(resolve));
-  // Ensure the state changes are reflected
-  component.update();
-
-  expect(component).toMatchSnapshot();
-});
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx
index d909f31315e7d..e11a560c8755f 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx
@@ -25,7 +25,6 @@ import { DEFAULT_FILL_COLORS, DEFAULT_LINE_COLORS } from '../../color_palettes';
 
 import {
   LABEL_BORDER_SIZES,
-  LAYER_TYPE,
   STYLE_TYPE,
   VECTOR_SHAPE_TYPE,
   VECTOR_STYLES,
@@ -258,18 +257,7 @@ export class VectorStyleEditor extends Component<Props, State> {
     );
   }
 
-  _renderLabelProperties(isPoints: boolean) {
-    if (
-      !isPoints &&
-      this.props.layer.getType() === LAYER_TYPE.TILED_VECTOR &&
-      !this.props.layer.getSource().isESSource()
-    ) {
-      // This handles and edge-case
-      // 3rd party lines and polygons from mvt sources cannot be labeled, because they do not have label-centroid geometries inside the tile.
-      // These label-centroids are only added for ES-sources
-      return;
-    }
-
+  _renderLabelProperties() {
     const hasLabel = this._hasLabel();
     const hasLabelBorder = this._hasLabelBorder();
     return (
@@ -468,7 +456,7 @@ export class VectorStyleEditor extends Component<Props, State> {
         />
         <EuiSpacer size="m" />
 
-        {this._renderLabelProperties(true)}
+        {this._renderLabelProperties()}
       </Fragment>
     );
   }
@@ -482,7 +470,7 @@ export class VectorStyleEditor extends Component<Props, State> {
         {this._renderLineWidth()}
         <EuiSpacer size="m" />
 
-        {this._renderLabelProperties(false)}
+        {this._renderLabelProperties()}
       </Fragment>
     );
   }
@@ -499,7 +487,7 @@ export class VectorStyleEditor extends Component<Props, State> {
         {this._renderLineWidth()}
         <EuiSpacer size="m" />
 
-        {this._renderLabelProperties(false)}
+        {this._renderLabelProperties()}
       </Fragment>
     );
   }
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx
index 73f8736750656..bff053fc469a0 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx
@@ -135,7 +135,7 @@ export class DynamicColorProperty extends DynamicStyleProperty<ColorDynamicOptio
   }
 
   _getMbColor() {
-    if (!this.getFieldName()) {
+    if (!this.getMbFieldName()) {
       return null;
     }
 
@@ -145,7 +145,7 @@ export class DynamicColorProperty extends DynamicStyleProperty<ColorDynamicOptio
   }
 
   _getOrdinalColorMbExpression() {
-    const targetName = this.getFieldName();
+    const targetName = this.getMbFieldName();
     if (this._options.useCustomColorRamp) {
       if (!this._options.customColorRamp || !this._options.customColorRamp.length) {
         // custom color ramp config is not complete
@@ -321,7 +321,7 @@ export class DynamicColorProperty extends DynamicStyleProperty<ColorDynamicOptio
     }
 
     mbStops.push(defaultColor); // last color is default color
-    return ['match', ['to-string', ['get', this.getFieldName()]], ...mbStops];
+    return ['match', ['to-string', ['get', this.getMbFieldName()]], ...mbStops];
   }
 
   _getOrdinalBreaks(symbolId?: string): Break[] {
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.tsx
index 56d7c8597e151..15672bda941be 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.tsx
@@ -86,7 +86,7 @@ export class DynamicIconProperty extends DynamicStyleProperty<IconDynamicOptions
     if (fallbackSymbolId) {
       mbStops.push(getMakiIconId(fallbackSymbolId, iconPixelSize)); // last item is fallback style for anything that does not match provided stops
     }
-    return ['match', ['to-string', ['get', this.getFieldName()]], ...mbStops];
+    return ['match', ['to-string', ['get', this.getMbFieldName()]], ...mbStops];
   }
 
   _getMbIconAnchorExpression() {
@@ -106,7 +106,7 @@ export class DynamicIconProperty extends DynamicStyleProperty<IconDynamicOptions
     if (fallbackSymbolId) {
       mbStops.push(getMakiSymbolAnchor(fallbackSymbolId)); // last item is fallback style for anything that does not match provided stops
     }
-    return ['match', ['to-string', ['get', this.getFieldName()]], ...mbStops];
+    return ['match', ['to-string', ['get', this.getMbFieldName()]], ...mbStops];
   }
 
   _isIconDynamicConfigComplete() {
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.tsx
index 8599adef33f01..3dc44c171d415 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.tsx
@@ -66,7 +66,7 @@ export class DynamicSizeProperty extends DynamicStyleProperty<SizeDynamicOptions
     const rangeFieldMeta = this.getRangeFieldMeta();
     if (this._isSizeDynamicConfigComplete() && rangeFieldMeta) {
       const halfIconPixels = this.getIconPixelSize() / 2;
-      const targetName = this.getFieldName();
+      const targetName = this.getMbFieldName();
       // Using property state instead of feature-state because layout properties do not support feature-state
       mbMap.setLayoutProperty(symbolLayerId, 'icon-size', [
         'interpolate',
@@ -115,7 +115,7 @@ export class DynamicSizeProperty extends DynamicStyleProperty<SizeDynamicOptions
     }
 
     return this._getMbDataDrivenSize({
-      targetName: this.getFieldName(),
+      targetName: this.getMbFieldName(),
       minSize: this._options.minSize,
       maxSize: this._options.maxSize,
       minValue: rangeFieldMeta.min,
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
index f37c3a9d0f141..54e3744472fa1 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
@@ -27,7 +27,6 @@ import {
   OrdinalDataMappingPopover,
 } from '../components/data_mapping';
 import {
-  Category,
   CategoryFieldMeta,
   FieldMetaOptions,
   PercentilesFieldMeta,
@@ -40,16 +39,12 @@ import { IVectorLayer } from '../../../layers/vector_layer';
 import { InnerJoin } from '../../../joins/inner_join';
 import { IVectorStyle } from '../vector_style';
 import { getComputedFieldName } from '../style_util';
-import { pluckRangeFieldMeta } from '../../../../../common/pluck_range_field_meta';
-import {
-  pluckCategoryFieldMeta,
-  trimCategories,
-} from '../../../../../common/pluck_category_field_meta';
 
 export interface IDynamicStyleProperty<T> extends IStyleProperty<T> {
   getFieldMetaOptions(): FieldMetaOptions;
   getField(): IField | null;
   getFieldName(): string;
+  getMbFieldName(): string;
   getFieldOrigin(): FIELD_ORIGIN | null;
   getRangeFieldMeta(): RangeFieldMeta | null;
   getCategoryFieldMeta(): CategoryFieldMeta | null;
@@ -63,7 +58,7 @@ export interface IDynamicStyleProperty<T> extends IStyleProperty<T> {
   getFieldMetaRequest(): Promise<unknown | null>;
   pluckOrdinalStyleMetaFromFeatures(features: Feature[]): RangeFieldMeta | null;
   pluckCategoricalStyleMetaFromFeatures(features: Feature[]): CategoryFieldMeta | null;
-  pluckOrdinalStyleMetaFromTileMetaFeatures(features: TileMetaFeature[]): RangeFieldMeta | null;
+  pluckOrdinalStyleMetaFromTileMetaFeatures(metaFeatures: TileMetaFeature[]): RangeFieldMeta | null;
   pluckCategoricalStyleMetaFromTileMetaFeatures(
     features: TileMetaFeature[]
   ): CategoryFieldMeta | null;
@@ -213,6 +208,10 @@ export class DynamicStyleProperty<T>
     return this._field ? this._field.getName() : '';
   }
 
+  getMbFieldName() {
+    return this._field ? this._field.getMbFieldName() : '';
+  }
+
   isDynamic() {
     return true;
   }
@@ -314,54 +313,36 @@ export class DynamicStyleProperty<T>
       return null;
     }
 
-    const name = this.getFieldName();
+    const mbFieldName = this.getMbFieldName();
     let min = Infinity;
     let max = -Infinity;
     for (let i = 0; i < metaFeatures.length; i++) {
-      const fieldMeta = metaFeatures[i].properties.fieldMeta;
-      if (fieldMeta && fieldMeta[name] && fieldMeta[name].range) {
-        min = Math.min(fieldMeta[name].range?.min as number, min);
-        max = Math.max(fieldMeta[name].range?.max as number, max);
+      const fieldMeta = metaFeatures[i].properties;
+      const minField = `aggregations.${mbFieldName}.min`;
+      const maxField = `aggregations.${mbFieldName}.max`;
+      if (
+        fieldMeta &&
+        typeof fieldMeta[minField] === 'number' &&
+        typeof fieldMeta[maxField] === 'number'
+      ) {
+        min = Math.min(fieldMeta[minField] as number, min);
+        max = Math.max(fieldMeta[maxField] as number, max);
       }
     }
-    return {
-      min,
-      max,
-      delta: max - min,
-    };
+
+    return min === Infinity || max === -Infinity
+      ? null
+      : {
+          min,
+          max,
+          delta: max - min,
+        };
   }
 
   pluckCategoricalStyleMetaFromTileMetaFeatures(
     metaFeatures: TileMetaFeature[]
   ): CategoryFieldMeta | null {
-    const size = this.getNumberOfCategories();
-    if (!this.isCategorical() || size <= 0) {
-      return null;
-    }
-
-    const name = this.getFieldName();
-
-    const counts = new Map<string, number>();
-    for (let i = 0; i < metaFeatures.length; i++) {
-      const fieldMeta = metaFeatures[i].properties.fieldMeta;
-      if (fieldMeta && fieldMeta[name] && fieldMeta[name].categories) {
-        const categoryFieldMeta: CategoryFieldMeta = fieldMeta[name]
-          .categories as CategoryFieldMeta;
-        for (let c = 0; c < categoryFieldMeta.categories.length; c++) {
-          const category: Category = categoryFieldMeta.categories[c];
-          // properties object may be sparse, so need to check if the field is effectively present
-          if (typeof category.key !== undefined) {
-            if (counts.has(category.key)) {
-              counts.set(category.key, (counts.get(category.key) as number) + category.count);
-            } else {
-              counts.set(category.key, category.count);
-            }
-          }
-        }
-      }
-    }
-
-    return trimCategories(counts, size);
+    return null;
   }
 
   pluckOrdinalStyleMetaFromFeatures(features: Feature[]): RangeFieldMeta | null {
@@ -370,9 +351,24 @@ export class DynamicStyleProperty<T>
     }
 
     const name = this.getFieldName();
-    return pluckRangeFieldMeta(features, name, (rawValue: unknown) => {
-      return parseFloat(rawValue as string);
-    });
+    let min = Infinity;
+    let max = -Infinity;
+    for (let i = 0; i < features.length; i++) {
+      const feature = features[i];
+      const newValue = feature.properties ? parseFloat(feature.properties[name]) : NaN;
+      if (!isNaN(newValue)) {
+        min = Math.min(min, newValue);
+        max = Math.max(max, newValue);
+      }
+    }
+
+    return min === Infinity || max === -Infinity
+      ? null
+      : {
+          min,
+          max,
+          delta: max - min,
+        };
   }
 
   pluckCategoricalStyleMetaFromFeatures(features: Feature[]): CategoryFieldMeta | null {
@@ -381,7 +377,32 @@ export class DynamicStyleProperty<T>
       return null;
     }
 
-    return pluckCategoryFieldMeta(features, this.getFieldName(), size);
+    const counts = new Map();
+    for (let i = 0; i < features.length; i++) {
+      const feature = features[i];
+      const term = feature.properties ? feature.properties[this.getFieldName()] : undefined;
+      // properties object may be sparse, so need to check if the field is effectively present
+      if (typeof term !== undefined) {
+        if (counts.has(term)) {
+          counts.set(term, counts.get(term) + 1);
+        } else {
+          counts.set(term, 1);
+        }
+      }
+    }
+
+    const ordered = [];
+    for (const [key, value] of counts) {
+      ordered.push({ key, count: value });
+    }
+
+    ordered.sort((a, b) => {
+      return b.count - a.count;
+    });
+    const truncated = ordered.slice(0, size);
+    return {
+      categories: truncated,
+    } as CategoryFieldMeta;
   }
 
   _pluckOrdinalStyleMetaFromFieldMetaData(styleMetaData: StyleMetaData): RangeFieldMeta | null {
@@ -487,7 +508,7 @@ export class DynamicStyleProperty<T>
         targetName = getComputedFieldName(this.getStyleName(), this._field.getName());
       } else {
         // Non-geojson sources (e.g. 3rd party mvt or ES-source as mvt)
-        targetName = this._field.getName();
+        targetName = this._field.getMbFieldName();
       }
     }
     return targetName;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
index 1e7267b9e1e32..058ee0db08d35 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx
@@ -16,7 +16,6 @@ import {
   FIELD_ORIGIN,
   GEO_JSON_TYPE,
   KBN_IS_CENTROID_FEATURE,
-  KBN_VECTOR_SHAPE_TYPE_COUNTS,
   LAYER_STYLE_TYPE,
   SOURCE_FORMATTERS_DATA_REQUEST_ID,
   STYLE_TYPE,
@@ -76,7 +75,6 @@ import { IVectorLayer } from '../../layers/vector_layer';
 import { IVectorSource } from '../../sources/vector_source';
 import { createStyleFieldsHelper, StyleFieldsHelper } from './style_fields_helper';
 import { IESAggField } from '../../fields/agg';
-import { VectorShapeTypeCounts } from '../../../../common/get_geometry_counts';
 
 const POINTS = [GEO_JSON_TYPE.POINT, GEO_JSON_TYPE.MULTI_POINT];
 const LINES = [GEO_JSON_TYPE.LINE_STRING, GEO_JSON_TYPE.MULTI_LINE_STRING];
@@ -92,9 +90,8 @@ export interface IVectorStyle extends IStyle {
     previousFields: IField[],
     mapColors: string[]
   ): Promise<{ hasChanges: boolean; nextStyleDescriptor?: VectorStyleDescriptor }>;
-  isTimeAware: () => boolean;
-  getIcon: () => ReactElement<any>;
-  getIconFromGeometryTypes: (isLinesOnly: boolean, isPointsOnly: boolean) => ReactElement<any>;
+  isTimeAware(): boolean;
+  getIcon(): ReactElement<any>;
   hasLegendDetails: () => Promise<boolean>;
   renderLegendDetails: () => ReactElement<any>;
   clearFeatureState: (featureCollection: FeatureCollection, mbMap: MbMap, sourceId: string) => void;
@@ -492,50 +489,16 @@ export class VectorStyle implements IVectorStyle {
   }
 
   async pluckStyleMetaFromTileMeta(metaFeatures: TileMetaFeature[]): Promise<StyleMetaDescriptor> {
-    const shapeTypeCountMeta: VectorShapeTypeCounts = metaFeatures.reduce(
-      (accumulator: VectorShapeTypeCounts, tileMeta: TileMetaFeature) => {
-        if (
-          !tileMeta ||
-          !tileMeta.properties ||
-          !tileMeta.properties[KBN_VECTOR_SHAPE_TYPE_COUNTS]
-        ) {
-          return accumulator;
-        }
-
-        accumulator[VECTOR_SHAPE_TYPE.POINT] +=
-          tileMeta.properties[KBN_VECTOR_SHAPE_TYPE_COUNTS][VECTOR_SHAPE_TYPE.POINT];
-        accumulator[VECTOR_SHAPE_TYPE.LINE] +=
-          tileMeta.properties[KBN_VECTOR_SHAPE_TYPE_COUNTS][VECTOR_SHAPE_TYPE.LINE];
-        accumulator[VECTOR_SHAPE_TYPE.POLYGON] +=
-          tileMeta.properties[KBN_VECTOR_SHAPE_TYPE_COUNTS][VECTOR_SHAPE_TYPE.POLYGON];
-
-        return accumulator;
-      },
-      {
-        [VECTOR_SHAPE_TYPE.POLYGON]: 0,
-        [VECTOR_SHAPE_TYPE.LINE]: 0,
-        [VECTOR_SHAPE_TYPE.POINT]: 0,
-      }
-    );
-
-    const isLinesOnly =
-      shapeTypeCountMeta[VECTOR_SHAPE_TYPE.LINE] > 0 &&
-      shapeTypeCountMeta[VECTOR_SHAPE_TYPE.POINT] === 0 &&
-      shapeTypeCountMeta[VECTOR_SHAPE_TYPE.POLYGON] === 0;
-    const isPointsOnly =
-      shapeTypeCountMeta[VECTOR_SHAPE_TYPE.LINE] === 0 &&
-      shapeTypeCountMeta[VECTOR_SHAPE_TYPE.POINT] > 0 &&
-      shapeTypeCountMeta[VECTOR_SHAPE_TYPE.POLYGON] === 0;
-    const isPolygonsOnly =
-      shapeTypeCountMeta[VECTOR_SHAPE_TYPE.LINE] === 0 &&
-      shapeTypeCountMeta[VECTOR_SHAPE_TYPE.POINT] === 0 &&
-      shapeTypeCountMeta[VECTOR_SHAPE_TYPE.POLYGON] > 0;
-
+    const supportedShapeTypes = await this._source.getSupportedShapeTypes();
     const styleMeta: StyleMetaDescriptor = {
       geometryTypes: {
-        isPointsOnly,
-        isLinesOnly,
-        isPolygonsOnly,
+        isPointsOnly:
+          supportedShapeTypes.length === 1 && supportedShapeTypes.includes(VECTOR_SHAPE_TYPE.POINT),
+        isLinesOnly:
+          supportedShapeTypes.length === 1 && supportedShapeTypes.includes(VECTOR_SHAPE_TYPE.LINE),
+        isPolygonsOnly:
+          supportedShapeTypes.length === 1 &&
+          supportedShapeTypes.includes(VECTOR_SHAPE_TYPE.POLYGON),
       },
       fieldMeta: {},
     };
@@ -737,7 +700,7 @@ export class VectorStyle implements IVectorStyle {
       : (this._iconStyleProperty as StaticIconProperty).getOptions().value;
   }
 
-  getIconFromGeometryTypes(isLinesOnly: boolean, isPointsOnly: boolean) {
+  _getIconFromGeometryTypes(isLinesOnly: boolean, isPointsOnly: boolean) {
     let strokeColor;
     if (isLinesOnly) {
       strokeColor = extractColorFromStyleProperty(
@@ -771,7 +734,7 @@ export class VectorStyle implements IVectorStyle {
   getIcon() {
     const isLinesOnly = this._getIsLinesOnly();
     const isPointsOnly = this._getIsPointsOnly();
-    return this.getIconFromGeometryTypes(isLinesOnly, isPointsOnly);
+    return this._getIconFromGeometryTypes(isLinesOnly, isPointsOnly);
   }
 
   _getLegendDetailStyleProperties = () => {
diff --git a/x-pack/plugins/maps/common/geo_tile_utils.test.js b/x-pack/plugins/maps/public/classes/util/geo_tile_utils.test.ts
similarity index 100%
rename from x-pack/plugins/maps/common/geo_tile_utils.test.js
rename to x-pack/plugins/maps/public/classes/util/geo_tile_utils.test.ts
diff --git a/x-pack/plugins/maps/common/geo_tile_utils.ts b/x-pack/plugins/maps/public/classes/util/geo_tile_utils.ts
similarity index 95%
rename from x-pack/plugins/maps/common/geo_tile_utils.ts
rename to x-pack/plugins/maps/public/classes/util/geo_tile_utils.ts
index 1a8ac3cbe17ae..6e82d3b509565 100644
--- a/x-pack/plugins/maps/common/geo_tile_utils.ts
+++ b/x-pack/plugins/maps/public/classes/util/geo_tile_utils.ts
@@ -6,9 +6,9 @@
  */
 
 import _ from 'lodash';
-import { DECIMAL_DEGREES_PRECISION } from './constants';
-import { clampToLatBounds } from './elasticsearch_util';
-import { MapExtent } from './descriptor_types';
+import { DECIMAL_DEGREES_PRECISION } from '../../../common/constants';
+import { clampToLatBounds } from '../../../common/elasticsearch_util';
+import { MapExtent } from '../../../common/descriptor_types';
 
 const ZOOM_TILE_KEY_INDEX = 0;
 const X_TILE_KEY_INDEX = 1;
diff --git a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
index 68efd416718fd..544b2697cab43 100644
--- a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
+++ b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
@@ -9,7 +9,6 @@ import {
   GEO_JSON_TYPE,
   FEATURE_VISIBLE_PROPERTY_NAME,
   KBN_IS_CENTROID_FEATURE,
-  KBN_METADATA_FEATURE,
 } from '../../../common/constants';
 
 import { Timeslice } from '../../../common/descriptor_types';
@@ -19,7 +18,6 @@ export interface TimesliceMaskConfig {
   timeslice: Timeslice;
 }
 
-export const EXCLUDE_TOO_MANY_FEATURES_BOX = ['!=', ['get', KBN_METADATA_FEATURE], true];
 export const EXCLUDE_CENTROID_FEATURES = ['!=', ['get', KBN_IS_CENTROID_FEATURE], true];
 
 function getFilterExpression(
@@ -56,7 +54,6 @@ export function getFillFilterExpression(
 ): unknown[] {
   return getFilterExpression(
     [
-      EXCLUDE_TOO_MANY_FEATURES_BOX,
       EXCLUDE_CENTROID_FEATURES,
       [
         'any',
@@ -75,7 +72,6 @@ export function getLineFilterExpression(
 ): unknown[] {
   return getFilterExpression(
     [
-      EXCLUDE_TOO_MANY_FEATURES_BOX,
       EXCLUDE_CENTROID_FEATURES,
       [
         'any',
@@ -96,7 +92,6 @@ export function getPointFilterExpression(
 ): unknown[] {
   return getFilterExpression(
     [
-      EXCLUDE_TOO_MANY_FEATURES_BOX,
       EXCLUDE_CENTROID_FEATURES,
       [
         'any',
@@ -109,13 +104,17 @@ export function getPointFilterExpression(
   );
 }
 
-export function getCentroidFilterExpression(
+export function getLabelFilterExpression(
   hasJoins: boolean,
+  isSourceGeoJson: boolean,
   timesliceMaskConfig?: TimesliceMaskConfig
 ): unknown[] {
-  return getFilterExpression(
-    [EXCLUDE_TOO_MANY_FEATURES_BOX, ['==', ['get', KBN_IS_CENTROID_FEATURE], true]],
-    hasJoins,
-    timesliceMaskConfig
-  );
+  const filters: unknown[] = [];
+
+  // centroids added for geojson sources only
+  if (isSourceGeoJson) {
+    filters.push(['==', ['get', KBN_IS_CENTROID_FEATURE], true]);
+  }
+
+  return getFilterExpression(filters, hasJoins, timesliceMaskConfig);
 }
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap
index 5fb1cc6f72585..03e8b4a90c0ca 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/__snapshots__/edit_layer_panel.test.tsx.snap
@@ -55,6 +55,8 @@ exports[`EditLayerPanel is rendered 1`] = `
         <EuiAccordion
           arrowDisplay="left"
           buttonContent="Source details"
+          buttonElement="button"
+          element="div"
           id="accordion1"
           initialIsOpen={false}
           isLoading={false}
@@ -98,7 +100,9 @@ exports[`EditLayerPanel is rendered 1`] = `
               "getId": [Function],
               "getImmutableSourceProperties": [Function],
               "getLayerTypeIconName": [Function],
+              "getType": [Function],
               "hasErrors": [Function],
+              "hasJoins": [Function],
               "renderSourceSettingsEditor": [Function],
               "showJoinEditor": [Function],
               "supportsElasticsearchFilters": [Function],
@@ -119,7 +123,9 @@ exports[`EditLayerPanel is rendered 1`] = `
                 "getId": [Function],
                 "getImmutableSourceProperties": [Function],
                 "getLayerTypeIconName": [Function],
+                "getType": [Function],
                 "hasErrors": [Function],
+                "hasJoins": [Function],
                 "renderSourceSettingsEditor": [Function],
                 "showJoinEditor": [Function],
                 "supportsElasticsearchFilters": [Function],
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx
index e66dc8a10948f..82795b8bd9317 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.test.tsx
@@ -48,6 +48,7 @@ jest.mock('../../kibana_services', () => {
 
 import React from 'react';
 import { shallow } from 'enzyme';
+import { LAYER_TYPE } from '../../../common/constants';
 import { ILayer } from '../../classes/layers/layer';
 import { EditLayerPanel } from './edit_layer_panel';
 
@@ -55,6 +56,9 @@ const mockLayer = {
   getId: () => {
     return '1';
   },
+  getType: () => {
+    return LAYER_TYPE.VECTOR;
+  },
   getDisplayName: () => {
     return 'layer 1';
   },
@@ -79,6 +83,9 @@ const mockLayer = {
   hasErrors: () => {
     return false;
   },
+  hasJoins: () => {
+    return false;
+  },
   supportsFitToBounds: () => {
     return true;
   },
@@ -87,7 +94,8 @@ const mockLayer = {
 const defaultProps = {
   selectedLayer: mockLayer,
   fitToBounds: () => {},
-  updateSourceProp: () => {},
+  updateSourceProps: async () => {},
+  clearJoins: () => {},
 };
 
 describe('EditLayerPanel', () => {
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx
index 424c4b8e16bec..7ba2f74ddc7d9 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/edit_layer_panel.tsx
@@ -30,7 +30,6 @@ import { StyleSettings } from './style_settings';
 
 import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
-import { LAYER_TYPE } from '../../../common/constants';
 import { getData, getCore } from '../../kibana_services';
 import { ILayer } from '../../classes/layers/layer';
 import { isVectorLayer, IVectorLayer } from '../../classes/layers/vector_layer';
@@ -40,13 +39,9 @@ import { IField } from '../../classes/fields/field';
 const localStorage = new Storage(window.localStorage);
 
 export interface Props {
+  clearJoins: (layer: ILayer) => void;
   selectedLayer?: ILayer;
-  updateSourceProp: (
-    layerId: string,
-    propName: string,
-    value: unknown,
-    newLayerType?: LAYER_TYPE
-  ) => void;
+  updateSourceProps: (layerId: string, sourcePropChanges: OnSourceChangeArgs[]) => Promise<void>;
 }
 
 interface State {
@@ -141,9 +136,12 @@ export class EditLayerPanel extends Component<Props, State> {
   }
 
   _onSourceChange = (...args: OnSourceChangeArgs[]) => {
-    for (let i = 0; i < args.length; i++) {
-      const { propName, value, newLayerType } = args[i];
-      this.props.updateSourceProp(this.props.selectedLayer!.getId(), propName, value, newLayerType);
+    return this.props.updateSourceProps(this.props.selectedLayer!.getId(), args);
+  };
+
+  _clearJoins = () => {
+    if (this.props.selectedLayer) {
+      this.props.clearJoins(this.props.selectedLayer);
     }
   };
 
@@ -279,6 +277,11 @@ export class EditLayerPanel extends Component<Props, State> {
               />
 
               {this.props.selectedLayer.renderSourceSettingsEditor({
+                clearJoins: this._clearJoins,
+                currentLayerType: this.props.selectedLayer.getType(),
+                hasJoins: isVectorLayer(this.props.selectedLayer)
+                  ? (this.props.selectedLayer as IVectorLayer).hasJoins()
+                  : false,
                 onChange: this._onSourceChange,
               })}
 
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/index.ts b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/index.ts
index 84caa45741a62..5f9a920d38494 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/index.ts
@@ -9,11 +9,12 @@ import { AnyAction } from 'redux';
 import { ThunkDispatch } from 'redux-thunk';
 import { connect } from 'react-redux';
 import { EditLayerPanel } from './edit_layer_panel';
-import { LAYER_TYPE } from '../../../common/constants';
 import { getSelectedLayer } from '../../selectors/map_selectors';
-import { updateSourceProp } from '../../actions';
+import { setJoinsForLayer, updateSourceProps } from '../../actions';
 import { MapStoreState } from '../../reducers/store';
+import { ILayer } from '../../classes/layers/layer';
 import { isVectorLayer, IVectorLayer } from '../../classes/layers/vector_layer';
+import { OnSourceChangeArgs } from '../../classes/sources/source';
 
 function mapStateToProps(state: MapStoreState) {
   const selectedLayer = getSelectedLayer(state);
@@ -31,8 +32,11 @@ function mapStateToProps(state: MapStoreState) {
 
 function mapDispatchToProps(dispatch: ThunkDispatch<MapStoreState, void, AnyAction>) {
   return {
-    updateSourceProp: (id: string, propName: string, value: unknown, newLayerType?: LAYER_TYPE) =>
-      dispatch(updateSourceProp(id, propName, value, newLayerType)),
+    clearJoins: (layer: ILayer) => {
+      dispatch(setJoinsForLayer(layer, []));
+    },
+    updateSourceProps: async (id: string, sourcePropChanges: OnSourceChangeArgs[]) =>
+      await dispatch(updateSourceProps(id, sourcePropChanges)),
   };
 }
 
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.tsx
index e99ec6a688092..24cdd9b7dc813 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/join_editor.tsx
@@ -90,9 +90,7 @@ export function JoinEditor({ joins, layer, onChange, leftJoinFields, layerDispla
     ) : (
       <Fragment>
         {renderJoins()}
-
         <EuiSpacer size="s" />
-
         <EuiTextAlign textAlign="center">
           <EuiButtonEmpty
             onClick={addJoin}
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
index 0ebd145545a6c..6c7fe9f0ad213 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx
@@ -18,10 +18,7 @@ import { getToasts } from '../../../../kibana_services';
 import { DrawControl } from '../';
 import { DRAW_MODE, DRAW_SHAPE } from '../../../../../common/constants';
 import { ILayer } from '../../../../classes/layers/layer';
-import {
-  EXCLUDE_CENTROID_FEATURES,
-  EXCLUDE_TOO_MANY_FEATURES_BOX,
-} from '../../../../classes/util/mb_filter_expressions';
+import { EXCLUDE_CENTROID_FEATURES } from '../../../../classes/util/mb_filter_expressions';
 
 const geoJSONReader = new jsts.io.GeoJSONReader();
 
@@ -105,7 +102,7 @@ export class DrawFeatureControl extends Component<Props, {}> {
     ] as [MbPoint, MbPoint];
     const selectedFeatures = this.props.mbMap.queryRenderedFeatures(mbBbox, {
       layers: mbEditLayerIds,
-      filter: ['all', EXCLUDE_TOO_MANY_FEATURES_BOX, EXCLUDE_CENTROID_FEATURES],
+      filter: ['all', EXCLUDE_CENTROID_FEATURES],
     });
     if (!selectedFeatures.length) {
       return;
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
index 053e410b8c712..93dfebecd1c34 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx
@@ -33,7 +33,6 @@ import {
 } from '../../../common/descriptor_types';
 import {
   DECIMAL_DEGREES_PRECISION,
-  KBN_TOO_MANY_FEATURES_IMAGE_ID,
   LAYER_TYPE,
   RawValue,
   ZOOM_PRECISION,
@@ -209,14 +208,6 @@ export class MbMap extends Component<Props, State> {
         },
       });
 
-      const tooManyFeaturesImageSrc =
-        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAA7DgAAOw4BzLahgwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAARLSURBVHic7ZnPbxRVAMe/7735sWO3293ZlUItJsivCxEE0oTYRgu1FqTQoFSwKTYx8SAH/wHjj4vRozGGi56sMcW2UfqTEuOhppE0KJc2GIuKQFDY7qzdtrudX88D3YTUdFuQN8+k87ltZt7uZz958/bNLAGwBWsYKltANmEA2QKyCQPIFpBNGEC2gGzCALIFZBMGkC0gmzCAbAHZhAFkC8gmDCBbQDZhANkCslnzARQZH6oDpNs0D5UDSUIInePcOpPLfdfnODNBuwQWIAWwNOABwHZN0x8npE6hNLJ4DPWRyFSf40wE5VOEQPBjcR0g3YlE4ybGmtK+/1NzJtOZA/xSYwZMs3nG962T2ez3It2AANaA/kSidYuivOQBs5WM1fUnk6f0u+GXJUqIuUtVXx00zRbRfkIDfBqL7a1WlIYbjvNtTTr99jXXHVpH6dMjK0R4cXq6c9rzxjcx9sKX8XitSEdhAToMI7VP10/97fsTh7PZrgWAN1lW72KE2vOm2b5chDTgtWQyn93x/bEEIetEOQIC14CxVOr1CkKefH929t0v8vn0vcdGEoljGxXl4C3PGz2YyXy+AHARDqtByAxoUdWKBKV70r4/vvTLA0CjZfX+5nkDGxirKzUTgkBIgNaysh3gnF627R+XO+dQJvP1ddcdrmSsbtA020pF+CAW21qrqmUiXIUEqGRsIwD0FQq/lzqv0bJ6rrvucBVjzwyb5ivLRTiiaW+8VV7eIEBVTAANiIIQd9RxZlc6t9Gyem647vn1jD07ZJonl4sQASoevqmgABzwwHnJzc69PGdZ3X+47sgGxuqHTPPE0ggeVtg5/QeEBMhxPg1Aa1DV2GrHPG9ZXy1G2D+wNALn9jyQEeHKAJgP+033Kgrdqij7AFwZtu3bqx3XWShMHtV1o1pRGo4YxiNd+fyEB2DKdX/4aG5u0hbwcylkBryTy/3scT6zW9Nq7ndso2Wdvea6Q1WUHuiPx1/WAXLBcWZXun94UMRcAoD/p+ddTFK6u8MwUvc7vsmyem+67oVqVT0wkEgcF+FYRNhW+L25uX6f84XThtHxIBudE5bVY/t++jFVrU/dvVSFICzAqG3PX/S8rihj2/61qK1AOUB7ksl2jdLUL7Z9rvgcQQRCFsEi5wqFmw26XnhCUQ63GcZmCly95Lrzpca0G0byk3j8tEnpU1c975tmyxoU5QcE8EAEAM5WVOzfoarHAeC2749dcpzxMwsLv07Ztg0AOzVNf03Ttu/S9T2PMlbjc25fdpyutmx2TLRbIAEA4M1otKo1EjmaoHQn4ZwBgA/kAVAK6MXXdzxv/ONcrq/HcbJBeAUWoEizqsaORaPbKglZrxMSZZyrM76f/ovzWx/m85PFWREUgQf4v7Hm/xcIA8gWkE0YQLaAbMIAsgVkEwaQLSCbMIBsAdmEAWQLyCYMIFtANmEA2QKyCQPIFpDNmg/wD3OFdEybUvJjAAAAAElFTkSuQmCC';
-      const tooManyFeaturesImage = new Image();
-      tooManyFeaturesImage.onload = () => {
-        mbMap.addImage(KBN_TOO_MANY_FEATURES_IMAGE_ID, tooManyFeaturesImage);
-      };
-      tooManyFeaturesImage.src = tooManyFeaturesImageSrc;
-
       let emptyImage: HTMLImageElement;
       mbMap.on('styleimagemissing', (e: unknown) => {
         if (emptyImage) {
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.test.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.test.tsx
index 7e79113d6b242..04b1d2205644f 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.test.tsx
@@ -36,6 +36,19 @@ const mockLayer = {
   canShowTooltip: () => {
     return true;
   },
+  getMbTooltipLayerIds: () => {
+    return ['foo', 'bar'];
+  },
+  getSource: () => {
+    return {
+      isMvt: () => {
+        return false;
+      },
+      isESSource: () => {
+        return false;
+      },
+    };
+  },
   getFeatureById: () => {
     return {
       geometry: {
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx
index c2ad75d9cb335..c2b89e64a449b 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.tsx
@@ -19,12 +19,7 @@ import uuid from 'uuid/v4';
 import { Geometry } from 'geojson';
 import { Filter } from 'src/plugins/data/public';
 import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
-import {
-  FEATURE_ID_PROPERTY_NAME,
-  GEO_JSON_TYPE,
-  LON_INDEX,
-  RawValue,
-} from '../../../../common/constants';
+import { GEO_JSON_TYPE, LON_INDEX, RawValue } from '../../../../common/constants';
 import {
   GEOMETRY_FILTER_ACTION,
   TooltipFeature,
@@ -33,9 +28,8 @@ import {
 } from '../../../../common/descriptor_types';
 import { TooltipPopover } from './tooltip_popover';
 import { FeatureGeometryFilterForm } from './features_tooltip';
-import { EXCLUDE_TOO_MANY_FEATURES_BOX } from '../../../classes/util/mb_filter_expressions';
 import { ILayer } from '../../../classes/layers/layer';
-import { IVectorLayer, isVectorLayer } from '../../../classes/layers/vector_layer';
+import { IVectorLayer, isVectorLayer, getFeatureId } from '../../../classes/layers/vector_layer';
 import { RenderToolTipContent } from '../../../classes/tooltips/tooltip_property';
 
 function justifyAnchorLocation(
@@ -132,7 +126,13 @@ export class TooltipControl extends Component<Props, {}> {
     }) as IVectorLayer;
   }
 
-  _loadPreIndexedShape = async ({ layerId, featureId }: { layerId: string; featureId: string }) => {
+  _loadPreIndexedShape = async ({
+    layerId,
+    featureId,
+  }: {
+    layerId: string;
+    featureId?: string | number;
+  }) => {
     const tooltipLayer = this._findLayerById(layerId);
     if (!tooltipLayer || typeof featureId === 'undefined') {
       return null;
@@ -152,7 +152,7 @@ export class TooltipControl extends Component<Props, {}> {
     tooltipId,
   }: {
     layerId: string;
-    featureId: string;
+    featureId?: string | number;
     tooltipId: string;
   }): TooltipFeatureAction[] {
     const actions = [];
@@ -203,7 +203,8 @@ export class TooltipControl extends Component<Props, {}> {
       if (!layer) {
         break;
       }
-      const featureId = mbFeature.properties?.[FEATURE_ID_PROPERTY_NAME];
+
+      const featureId = getFeatureId(mbFeature, layer.getSource());
       const layerId = layer.getId();
       let match = false;
       for (let j = 0; j < uniqueFeatures.length; j++) {
@@ -284,9 +285,10 @@ export class TooltipControl extends Component<Props, {}> {
     }
 
     const targetMbFeature = mbFeatures[0];
-    if (this.props.openTooltips[0] && this.props.openTooltips[0].features.length) {
+    const layer = this._getLayerByMbLayerId(targetMbFeature.layer.id);
+    if (layer && this.props.openTooltips[0] && this.props.openTooltips[0].features.length) {
       const firstFeature = this.props.openTooltips[0].features[0];
-      if (targetMbFeature.properties?.[FEATURE_ID_PROPERTY_NAME] === firstFeature.id) {
+      if (getFeatureId(targetMbFeature, layer.getSource()) === firstFeature.id) {
         // ignore hover events when hover tooltip is all ready opened for feature
         return;
       }
@@ -312,7 +314,7 @@ export class TooltipControl extends Component<Props, {}> {
       (accumulator: string[], layer: ILayer) => {
         // tooltips are only supported for vector layers, filter out all other layer types
         return layer.isVisible() && isVectorLayer(layer)
-          ? accumulator.concat(layer.getMbLayerIds())
+          ? accumulator.concat((layer as IVectorLayer).getMbTooltipLayerIds())
           : accumulator;
       },
       []
@@ -347,7 +349,6 @@ export class TooltipControl extends Component<Props, {}> {
     ] as [MbPoint, MbPoint];
     return this.props.mbMap.queryRenderedFeatures(mbBbox, {
       layers: mbLayerIds,
-      filter: EXCLUDE_TOO_MANY_FEATURES_BOX,
     });
   }
 
diff --git a/x-pack/plugins/maps/server/kibana_server_services.ts b/x-pack/plugins/maps/server/kibana_server_services.ts
index e3c612f415c4d..f5bd4dad085d8 100644
--- a/x-pack/plugins/maps/server/kibana_server_services.ts
+++ b/x-pack/plugins/maps/server/kibana_server_services.ts
@@ -20,14 +20,17 @@ export const setInternalRepository = (
 };
 export const getInternalRepository = () => internalRepository;
 
+let esClient: ElasticsearchClient;
 let indexPatternsService: IndexPatternsCommonService;
 export const setIndexPatternsService = async (
   indexPatternsServiceFactory: IndexPatternsServiceStart['indexPatternsServiceFactory'],
   elasticsearchClient: ElasticsearchClient
 ) => {
+  esClient = elasticsearchClient;
   indexPatternsService = await indexPatternsServiceFactory(
     new SavedObjectsClient(getInternalRepository()),
     elasticsearchClient
   );
 };
 export const getIndexPatternsService = () => indexPatternsService;
+export const getESClient = () => esClient;
diff --git a/x-pack/plugins/maps/server/mvt/get_grid_tile.ts b/x-pack/plugins/maps/server/mvt/get_grid_tile.ts
new file mode 100644
index 0000000000000..cfc894d512450
--- /dev/null
+++ b/x-pack/plugins/maps/server/mvt/get_grid_tile.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Logger } from 'src/core/server';
+import type { DataRequestHandlerContext } from 'src/plugins/data/server';
+import { RENDER_AS } from '../../common/constants';
+
+function isAbortError(error: Error) {
+  return error.message === 'Request aborted' || error.message === 'Aborted';
+}
+
+export async function getEsGridTile({
+  logger,
+  context,
+  index,
+  geometryFieldName,
+  x,
+  y,
+  z,
+  requestBody = {},
+  requestType = RENDER_AS.POINT,
+}: {
+  x: number;
+  y: number;
+  z: number;
+  geometryFieldName: string;
+  index: string;
+  context: DataRequestHandlerContext;
+  logger: Logger;
+  requestBody: any;
+  requestType: RENDER_AS.GRID | RENDER_AS.POINT;
+}): Promise<Buffer | null> {
+  try {
+    const path = `/${encodeURIComponent(index)}/_mvt/${geometryFieldName}/${z}/${x}/${y}`;
+    const body = {
+      size: 0, // no hits
+      grid_precision: 7,
+      exact_bounds: false,
+      extent: 4096, // full resolution,
+      query: requestBody.query,
+      grid_type: requestType === RENDER_AS.GRID ? 'grid' : 'centroid',
+      aggs: requestBody.aggs,
+      fields: requestBody.fields,
+      runtime_mappings: requestBody.runtime_mappings,
+    };
+    const tile = await context.core.elasticsearch.client.asCurrentUser.transport.request({
+      method: 'GET',
+      path,
+      body,
+    });
+    return tile.body as unknown as Buffer;
+  } catch (e) {
+    if (!isAbortError(e)) {
+      // These are often circuit breaking exceptions
+      // Should return a tile with some error message
+      logger.warn(`Cannot generate ES-grid-tile for ${z}/${x}/${y}: ${e.message}`);
+    }
+    return null;
+  }
+}
diff --git a/x-pack/plugins/maps/server/mvt/get_tile.ts b/x-pack/plugins/maps/server/mvt/get_tile.ts
index 11e1af5a7d368..0864b373af3f8 100644
--- a/x-pack/plugins/maps/server/mvt/get_tile.ts
+++ b/x-pack/plugins/maps/server/mvt/get_tile.ts
@@ -5,53 +5,15 @@
  * 2.0.
  */
 
-// @ts-expect-error
-import geojsonvt from 'geojson-vt';
-// @ts-expect-error
-import vtpbf from 'vt-pbf';
+import _ from 'lodash';
 import { Logger } from 'src/core/server';
 import type { DataRequestHandlerContext } from 'src/plugins/data/server';
-import { Feature, FeatureCollection, Polygon } from 'geojson';
-import { countVectorShapeTypes } from '../../common/get_geometry_counts';
-import {
-  COUNT_PROP_NAME,
-  ES_GEO_FIELD_TYPE,
-  FEATURE_ID_PROPERTY_NAME,
-  GEOTILE_GRID_AGG_NAME,
-  KBN_FEATURE_COUNT,
-  KBN_IS_TILE_COMPLETE,
-  KBN_METADATA_FEATURE,
-  KBN_VECTOR_SHAPE_TYPE_COUNTS,
-  MAX_ZOOM,
-  MVT_SOURCE_LAYER_NAME,
-  RENDER_AS,
-  SUPER_FINE_ZOOM_DELTA,
-  VECTOR_SHAPE_TYPE,
-} from '../../common/constants';
-
-import {
-  createExtentFilter,
-  convertRegularRespToGeoJson,
-  hitsToGeoJson,
-  isTotalHitsGreaterThan,
-  formatEnvelopeAsPolygon,
-  TotalHits,
-} from '../../common/elasticsearch_util';
-import { flattenHit } from './util';
-import { ESBounds, tileToESBbox } from '../../common/geo_tile_utils';
-import { getCentroidFeatures } from '../../common/get_centroid_features';
-import { pluckRangeFieldMeta } from '../../common/pluck_range_field_meta';
-import { FieldMeta, TileMetaFeature } from '../../common/descriptor_types';
-import { pluckCategoryFieldMeta } from '../../common/pluck_category_field_meta';
-
-// heuristic. largest color-palette has 30 colors. 1 color is used for 'other'.
-const TERM_COUNT = 30 - 1;
 
 function isAbortError(error: Error) {
   return error.message === 'Request aborted' || error.message === 'Aborted';
 }
 
-export async function getGridTile({
+export async function getEsTile({
   logger,
   context,
   index,
@@ -60,9 +22,6 @@ export async function getGridTile({
   y,
   z,
   requestBody = {},
-  requestType = RENDER_AS.POINT,
-  searchSessionId,
-  abortSignal,
 }: {
   x: number;
   y: number;
@@ -72,388 +31,32 @@ export async function getGridTile({
   context: DataRequestHandlerContext;
   logger: Logger;
   requestBody: any;
-  requestType: RENDER_AS.GRID | RENDER_AS.POINT;
-  geoFieldType: ES_GEO_FIELD_TYPE;
-  searchSessionId?: string;
-  abortSignal: AbortSignal;
 }): Promise<Buffer | null> {
   try {
-    const tileBounds: ESBounds = tileToESBbox(x, y, z);
-    requestBody.query.bool.filter.push(getTileSpatialFilter(geometryFieldName, tileBounds));
-    requestBody.aggs[GEOTILE_GRID_AGG_NAME].geotile_grid.precision = Math.min(
-      z + SUPER_FINE_ZOOM_DELTA,
-      MAX_ZOOM
-    );
-    requestBody.aggs[GEOTILE_GRID_AGG_NAME].geotile_grid.bounds = tileBounds;
-    requestBody.track_total_hits = false;
-
-    const response = await context
-      .search!.search(
-        {
-          params: {
-            index,
-            body: requestBody,
-          },
-        },
-        {
-          sessionId: searchSessionId,
-          legacyHitsTotal: false,
-          abortSignal,
-        }
-      )
-      .toPromise();
-    const features: Feature[] = convertRegularRespToGeoJson(response.rawResponse, requestType);
-
-    if (features.length) {
-      const bounds = formatEnvelopeAsPolygon({
-        maxLat: tileBounds.top_left.lat,
-        minLat: tileBounds.bottom_right.lat,
-        maxLon: tileBounds.bottom_right.lon,
-        minLon: tileBounds.top_left.lon,
-      });
-
-      const fieldNames = new Set<string>();
-      features.forEach((feature) => {
-        for (const key in feature.properties) {
-          if (feature.properties.hasOwnProperty(key) && key !== 'key' && key !== 'gridCentroid') {
-            fieldNames.add(key);
-          }
-        }
-      });
-
-      const fieldMeta: FieldMeta = {};
-      fieldNames.forEach((fieldName: string) => {
-        const rangeMeta = pluckRangeFieldMeta(features, fieldName, (rawValue: unknown) => {
-          if (fieldName === COUNT_PROP_NAME) {
-            return parseFloat(rawValue as string);
-          } else if (typeof rawValue === 'number') {
-            return rawValue;
-          } else if (rawValue) {
-            return parseFloat((rawValue as { value: string }).value);
-          } else {
-            return NaN;
-          }
-        });
-
-        const categoryMeta = pluckCategoryFieldMeta(features, fieldName, TERM_COUNT);
-
-        if (!fieldMeta[fieldName]) {
-          fieldMeta[fieldName] = {};
-        }
-
-        if (rangeMeta) {
-          fieldMeta[fieldName].range = rangeMeta;
-        }
-
-        if (categoryMeta) {
-          fieldMeta[fieldName].categories = categoryMeta;
-        }
-      });
-
-      const metaDataFeature: TileMetaFeature = {
-        type: 'Feature',
-        properties: {
-          [KBN_METADATA_FEATURE]: true,
-          [KBN_FEATURE_COUNT]: features.length,
-          [KBN_IS_TILE_COMPLETE]: true,
-          [KBN_VECTOR_SHAPE_TYPE_COUNTS]:
-            requestType === RENDER_AS.GRID
-              ? {
-                  [VECTOR_SHAPE_TYPE.POINT]: 0,
-                  [VECTOR_SHAPE_TYPE.LINE]: 0,
-                  [VECTOR_SHAPE_TYPE.POLYGON]: features.length,
-                }
-              : {
-                  [VECTOR_SHAPE_TYPE.POINT]: features.length,
-                  [VECTOR_SHAPE_TYPE.LINE]: 0,
-                  [VECTOR_SHAPE_TYPE.POLYGON]: 0,
-                },
-          fieldMeta,
-        },
-        geometry: bounds,
-      };
-
-      features.push(metaDataFeature);
-    }
-
-    const featureCollection: FeatureCollection = {
-      features,
-      type: 'FeatureCollection',
+    const path = `/${encodeURIComponent(index)}/_mvt/${geometryFieldName}/${z}/${x}/${y}`;
+    let fields = _.uniq(requestBody.docvalue_fields.concat(requestBody.stored_fields));
+    fields = fields.filter((f) => f !== geometryFieldName);
+    const body = {
+      grid_precision: 0, // no aggs
+      exact_bounds: true,
+      extent: 4096, // full resolution,
+      query: requestBody.query,
+      fields,
+      runtime_mappings: requestBody.runtime_mappings,
+      track_total_hits: requestBody.size + 1,
     };
-
-    return createMvtTile(featureCollection, z, x, y);
+    const tile = await context.core.elasticsearch.client.asCurrentUser.transport.request({
+      method: 'GET',
+      path,
+      body,
+    });
+    return tile.body as unknown as Buffer;
   } catch (e) {
     if (!isAbortError(e)) {
       // These are often circuit breaking exceptions
       // Should return a tile with some error message
-      logger.warn(`Cannot generate grid-tile for ${z}/${x}/${y}: ${e.message}`);
+      logger.warn(`Cannot generate ES-grid-tile for ${z}/${x}/${y}: ${e.message}`);
     }
     return null;
   }
 }
-
-export async function getTile({
-  logger,
-  context,
-  index,
-  geometryFieldName,
-  x,
-  y,
-  z,
-  requestBody = {},
-  geoFieldType,
-  searchSessionId,
-  abortSignal,
-}: {
-  x: number;
-  y: number;
-  z: number;
-  geometryFieldName: string;
-  index: string;
-  context: DataRequestHandlerContext;
-  logger: Logger;
-  requestBody: any;
-  geoFieldType: ES_GEO_FIELD_TYPE;
-  searchSessionId?: string;
-  abortSignal: AbortSignal;
-}): Promise<Buffer | null> {
-  let features: Feature[];
-  try {
-    requestBody.query.bool.filter.push(
-      getTileSpatialFilter(geometryFieldName, tileToESBbox(x, y, z))
-    );
-
-    const searchOptions = {
-      sessionId: searchSessionId,
-      legacyHitsTotal: false,
-      abortSignal,
-    };
-
-    const countResponse = await context
-      .search!.search(
-        {
-          params: {
-            index,
-            body: {
-              size: 0,
-              query: requestBody.query,
-              track_total_hits: requestBody.size + 1,
-            },
-          },
-        },
-        searchOptions
-      )
-      .toPromise();
-
-    if (
-      isTotalHitsGreaterThan(
-        countResponse.rawResponse.hits.total as unknown as TotalHits,
-        requestBody.size
-      )
-    ) {
-      // Generate "too many features"-bounds
-      const bboxResponse = await context
-        .search!.search(
-          {
-            params: {
-              index,
-              body: {
-                size: 0,
-                query: requestBody.query,
-                aggs: {
-                  data_bounds: {
-                    geo_bounds: {
-                      field: geometryFieldName,
-                    },
-                  },
-                },
-                track_total_hits: false,
-              },
-            },
-          },
-          searchOptions
-        )
-        .toPromise();
-
-      const metaDataFeature: TileMetaFeature = {
-        type: 'Feature',
-        properties: {
-          [KBN_METADATA_FEATURE]: true,
-          [KBN_IS_TILE_COMPLETE]: false,
-          [KBN_FEATURE_COUNT]: 0,
-          [KBN_VECTOR_SHAPE_TYPE_COUNTS]: {
-            [VECTOR_SHAPE_TYPE.POINT]: 0,
-            [VECTOR_SHAPE_TYPE.LINE]: 0,
-            [VECTOR_SHAPE_TYPE.POLYGON]: 0,
-          },
-        },
-        geometry: esBboxToGeoJsonPolygon(
-          // @ts-expect-error @elastic/elasticsearch no way to declare aggregations for search response
-          bboxResponse.rawResponse.aggregations.data_bounds.bounds,
-          tileToESBbox(x, y, z)
-        ),
-      };
-      features = [metaDataFeature];
-    } else {
-      const documentsResponse = await context
-        .search!.search(
-          {
-            params: {
-              index,
-              body: {
-                ...requestBody,
-                track_total_hits: false,
-              },
-            },
-          },
-          searchOptions
-        )
-        .toPromise();
-
-      const featureCollection = hitsToGeoJson(
-        // @ts-expect-error hitsToGeoJson should be refactored to accept estypes.SearchHit
-        documentsResponse.rawResponse.hits.hits,
-        (hit: Record<string, unknown>) => {
-          return flattenHit(geometryFieldName, hit);
-        },
-        geometryFieldName,
-        geoFieldType,
-        []
-      );
-
-      features = featureCollection.features;
-
-      // Correct system-fields.
-      for (let i = 0; i < features.length; i++) {
-        const props = features[i].properties;
-        if (props !== null) {
-          props[FEATURE_ID_PROPERTY_NAME] = features[i].id;
-        }
-      }
-
-      const counts = countVectorShapeTypes(features);
-
-      const fieldNames = new Set<string>();
-      features.forEach((feature) => {
-        for (const key in feature.properties) {
-          if (
-            feature.properties.hasOwnProperty(key) &&
-            key !== '_index' &&
-            key !== '_id' &&
-            key !== FEATURE_ID_PROPERTY_NAME
-          ) {
-            fieldNames.add(key);
-          }
-        }
-      });
-
-      const fieldMeta: FieldMeta = {};
-      fieldNames.forEach((fieldName: string) => {
-        const rangeMeta = pluckRangeFieldMeta(features, fieldName, (rawValue: unknown) => {
-          return typeof rawValue === 'number' ? rawValue : NaN;
-        });
-        const categoryMeta = pluckCategoryFieldMeta(features, fieldName, TERM_COUNT);
-
-        if (!fieldMeta[fieldName]) {
-          fieldMeta[fieldName] = {};
-        }
-
-        if (rangeMeta) {
-          fieldMeta[fieldName].range = rangeMeta;
-        }
-
-        if (categoryMeta) {
-          fieldMeta[fieldName].categories = categoryMeta;
-        }
-      });
-
-      const metadataFeature: TileMetaFeature = {
-        type: 'Feature',
-        properties: {
-          [KBN_METADATA_FEATURE]: true,
-          [KBN_IS_TILE_COMPLETE]: true,
-          [KBN_VECTOR_SHAPE_TYPE_COUNTS]: counts,
-          [KBN_FEATURE_COUNT]: features.length,
-          fieldMeta,
-        },
-        geometry: esBboxToGeoJsonPolygon(tileToESBbox(x, y, z), tileToESBbox(x, y, z)),
-      };
-
-      features.push(metadataFeature);
-    }
-
-    const featureCollection: FeatureCollection = {
-      features,
-      type: 'FeatureCollection',
-    };
-
-    return createMvtTile(featureCollection, z, x, y);
-  } catch (e) {
-    if (!isAbortError(e)) {
-      logger.warn(`Cannot generate tile for ${z}/${x}/${y}: ${e.message}`);
-    }
-    return null;
-  }
-}
-
-function getTileSpatialFilter(geometryFieldName: string, tileBounds: ESBounds): unknown {
-  const tileExtent = {
-    minLon: tileBounds.top_left.lon,
-    minLat: tileBounds.bottom_right.lat,
-    maxLon: tileBounds.bottom_right.lon,
-    maxLat: tileBounds.top_left.lat,
-  };
-  const tileExtentFilter = createExtentFilter(tileExtent, [geometryFieldName]);
-  return tileExtentFilter.query;
-}
-
-function esBboxToGeoJsonPolygon(esBounds: ESBounds, tileBounds: ESBounds): Polygon {
-  // Intersecting geo_shapes may push bounding box outside of tile so need to clamp to tile bounds.
-  let minLon = Math.max(esBounds.top_left.lon, tileBounds.top_left.lon);
-  const maxLon = Math.min(esBounds.bottom_right.lon, tileBounds.bottom_right.lon);
-  minLon = minLon > maxLon ? minLon - 360 : minLon; // fixes an ES bbox to straddle dateline
-  const minLat = Math.max(esBounds.bottom_right.lat, tileBounds.bottom_right.lat);
-  const maxLat = Math.min(esBounds.top_left.lat, tileBounds.top_left.lat);
-
-  return {
-    type: 'Polygon',
-    coordinates: [
-      [
-        [minLon, minLat],
-        [minLon, maxLat],
-        [maxLon, maxLat],
-        [maxLon, minLat],
-        [minLon, minLat],
-      ],
-    ],
-  };
-}
-
-function createMvtTile(
-  featureCollection: FeatureCollection,
-  z: number,
-  x: number,
-  y: number
-): Buffer | null {
-  featureCollection.features.push(...getCentroidFeatures(featureCollection));
-  const tileIndex = geojsonvt(featureCollection, {
-    maxZoom: 24, // max zoom to preserve detail on; can't be higher than 24
-    tolerance: 3, // simplification tolerance (higher means simpler)
-    extent: 4096, // tile extent (both width and height)
-    buffer: 64, // tile buffer on each side
-    debug: 0, // logging level (0 to disable, 1 or 2)
-    lineMetrics: false, // whether to enable line metrics tracking for LineString/MultiLineString features
-    promoteId: null, // name of a feature property to promote to feature.id. Cannot be used with `generateId`
-    generateId: false, // whether to generate feature ids. Cannot be used with `promoteId`
-    indexMaxZoom: 5, // max zoom in the initial tile index
-    indexMaxPoints: 100000, // max number of points per tile in the index
-  });
-  const tile = tileIndex.getTile(z, x, y);
-
-  if (tile) {
-    const pbf = vtpbf.fromGeojsonVt({ [MVT_SOURCE_LAYER_NAME]: tile }, { version: 2 });
-    return Buffer.from(pbf);
-  } else {
-    return null;
-  }
-}
diff --git a/x-pack/plugins/maps/server/mvt/mvt_routes.ts b/x-pack/plugins/maps/server/mvt/mvt_routes.ts
index 01a89aff1a661..3c61a47a383d6 100644
--- a/x-pack/plugins/maps/server/mvt/mvt_routes.ts
+++ b/x-pack/plugins/maps/server/mvt/mvt_routes.ts
@@ -16,10 +16,10 @@ import {
   MVT_GETTILE_API_PATH,
   API_ROOT_PATH,
   MVT_GETGRIDTILE_API_PATH,
-  ES_GEO_FIELD_TYPE,
   RENDER_AS,
 } from '../../common/constants';
-import { getGridTile, getTile } from './get_tile';
+import { getEsTile } from './get_tile';
+import { getEsGridTile } from './get_grid_tile';
 
 const CACHE_TIMEOUT_SECONDS = 60 * 60;
 
@@ -43,8 +43,6 @@ export function initMVTRoutes({
           geometryFieldName: schema.string(),
           requestBody: schema.string(),
           index: schema.string(),
-          geoFieldType: schema.string(),
-          searchSessionId: schema.maybe(schema.string()),
           token: schema.maybe(schema.string()),
         }),
       },
@@ -56,14 +54,15 @@ export function initMVTRoutes({
     ) => {
       const { query, params } = request;
 
-      const abortController = new AbortController();
-      request.events.aborted$.subscribe(() => {
-        abortController.abort();
-      });
+      // todo - replace with direct abortion of raw transport request
+      // const abortController = new AbortController();
+      // request.events.aborted$.subscribe(() => {
+      //   abortController.abort();
+      // });
 
       const requestBodyDSL = rison.decode(query.requestBody as string);
 
-      const tile = await getTile({
+      const tile = await getEsTile({
         logger,
         context,
         geometryFieldName: query.geometryFieldName as string,
@@ -72,9 +71,6 @@ export function initMVTRoutes({
         z: parseInt((params as any).z, 10) as number,
         index: query.index as string,
         requestBody: requestBodyDSL as any,
-        geoFieldType: query.geoFieldType as ES_GEO_FIELD_TYPE,
-        searchSessionId: query.searchSessionId,
-        abortSignal: abortController.signal,
       });
 
       return sendResponse(response, tile);
@@ -95,8 +91,6 @@ export function initMVTRoutes({
           requestBody: schema.string(),
           index: schema.string(),
           requestType: schema.string(),
-          geoFieldType: schema.string(),
-          searchSessionId: schema.maybe(schema.string()),
           token: schema.maybe(schema.string()),
         }),
       },
@@ -107,14 +101,16 @@ export function initMVTRoutes({
       response: KibanaResponseFactory
     ) => {
       const { query, params } = request;
-      const abortController = new AbortController();
-      request.events.aborted$.subscribe(() => {
-        abortController.abort();
-      });
+
+      // todo - replace with direct abortion of raw transport request
+      // const abortController = new AbortController();
+      // request.events.aborted$.subscribe(() => {
+      //   abortController.abort();
+      // });
 
       const requestBodyDSL = rison.decode(query.requestBody as string);
 
-      const tile = await getGridTile({
+      const tile = await getEsGridTile({
         logger,
         context,
         geometryFieldName: query.geometryFieldName as string,
@@ -124,9 +120,6 @@ export function initMVTRoutes({
         index: query.index as string,
         requestBody: requestBodyDSL as any,
         requestType: query.requestType as RENDER_AS.POINT | RENDER_AS.GRID,
-        geoFieldType: query.geoFieldType as ES_GEO_FIELD_TYPE,
-        searchSessionId: query.searchSessionId,
-        abortSignal: abortController.signal,
       });
 
       return sendResponse(response, tile);
diff --git a/x-pack/plugins/maps/server/mvt/util.ts b/x-pack/plugins/maps/server/mvt/util.ts
deleted file mode 100644
index b3dc606ba3f11..0000000000000
--- a/x-pack/plugins/maps/server/mvt/util.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-// This implementation:
-// - does not include meta-fields
-// - does not validate the schema against the index-pattern (e.g. nested fields)
-// In the context of .mvt this is sufficient:
-// - only fields from the response are packed in the tile (more efficient)
-// - query-dsl submitted from the client, which was generated by the IndexPattern
-// todo: Ideally, this should adapt/reuse from https://github.com/elastic/kibana/blob/52b42a81faa9dd5c102b9fbb9a645748c3623121/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.ts#L26
-
-export function flattenHit(
-  geometryField: string,
-  hit: Record<string, unknown>
-): Record<string, any> {
-  const flat: Record<string, any> = {};
-  if (hit) {
-    flattenSource(flat, '', hit._source as Record<string, unknown>, geometryField);
-    if (hit.fields) {
-      flattenFields(flat, hit.fields as Array<Record<string, unknown>>);
-    }
-
-    // Attach meta fields
-    flat._index = hit._index;
-    flat._id = hit._id;
-  }
-  return flat;
-}
-
-function flattenSource(
-  accum: Record<string, any>,
-  path: string,
-  properties: Record<string, unknown> = {},
-  geometryField: string
-): Record<string, any> {
-  accum = accum || {};
-  for (const key in properties) {
-    if (properties.hasOwnProperty(key)) {
-      const newKey = path ? path + '.' + key : key;
-      let value;
-      if (geometryField === newKey) {
-        value = properties[key]; // do not deep-copy the geometry
-      } else if (properties[key] !== null && typeof value === 'object' && !Array.isArray(value)) {
-        value = flattenSource(
-          accum,
-          newKey,
-          properties[key] as Record<string, unknown>,
-          geometryField
-        );
-      } else {
-        value = properties[key];
-      }
-      accum[newKey] = value;
-    }
-  }
-  return accum;
-}
-
-function flattenFields(accum: Record<string, any> = {}, fields: Array<Record<string, unknown>>) {
-  accum = accum || {};
-  for (const key in fields) {
-    if (fields.hasOwnProperty(key)) {
-      const value = fields[key];
-      if (Array.isArray(value)) {
-        accum[key] = value[0];
-      } else {
-        accum[key] = value;
-      }
-    }
-  }
-}
diff --git a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix_vega_lite_spec.ts b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix_vega_lite_spec.ts
index 7291f7bbfa838..861b3727cea1b 100644
--- a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix_vega_lite_spec.ts
+++ b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix_vega_lite_spec.ts
@@ -107,6 +107,11 @@ export const getScatterplotMatrixVegaLiteSpec = (
         labelColor: euiTheme.euiTextSubduedColor,
         titleColor: euiTheme.euiTextSubduedColor,
       },
+      legend: {
+        orient: 'right',
+        labelColor: euiTheme.euiTextSubduedColor,
+        titleColor: euiTheme.euiTextSubduedColor,
+      },
     },
     repeat: {
       column: vegaColumns,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
index fb103886635a9..00a63bcf2a414 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx
@@ -26,6 +26,7 @@ import { useMlKibana } from '../../../../../contexts/kibana';
 // Separate imports for lazy loadable VegaChart and related code
 import { VegaChart } from '../../../../../components/vega_chart';
 import { VegaChartLoading } from '../../../../../components/vega_chart/vega_chart_loading';
+import { useCurrentEuiTheme } from '../../../../../components/color_range_legend';
 
 import { ErrorCallout } from '../error_callout';
 import { getDependentVar, DataFrameAnalyticsConfig } from '../../../../common';
@@ -33,6 +34,7 @@ import { DataFrameTaskStateType } from '../../../analytics_management/components
 import { ResultsSearchQuery } from '../../../../common/analytics';
 
 import { ExpandableSection, HEADER_ITEMS_LOADING } from '../expandable_section';
+
 import { EvaluateStat } from './evaluate_stat';
 import { EvaluationQualityMetricsTable } from './evaluation_quality_metrics_table';
 
@@ -107,6 +109,7 @@ export const EvaluatePanel: FC<EvaluatePanelProps> = ({ jobConfig, jobStatus, se
   const {
     services: { docLinks },
   } = useMlKibana();
+  const { euiTheme } = useCurrentEuiTheme();
 
   const [columns, setColumns] = useState<ConfusionMatrixColumn[]>([]);
   const [columnsData, setColumnsData] = useState<ConfusionMatrixColumnData[]>([]);
@@ -469,7 +472,8 @@ export const EvaluatePanel: FC<EvaluatePanelProps> = ({ jobConfig, jobStatus, se
                   vegaSpec={getRocCurveChartVegaLiteSpec(
                     classificationClasses,
                     rocCurveData,
-                    getDependentVar(jobConfig.analysis)
+                    getDependentVar(jobConfig.analysis),
+                    euiTheme
                   )}
                 />
               </div>
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/get_roc_curve_chart_vega_lite_spec.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/get_roc_curve_chart_vega_lite_spec.tsx
index e9a6925476b02..ef5bcb83e871f 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/get_roc_curve_chart_vega_lite_spec.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/get_roc_curve_chart_vega_lite_spec.tsx
@@ -10,6 +10,7 @@
 import type { TopLevelSpec } from 'vega-lite/build/vega-lite';
 
 import { euiPaletteColorBlind, euiPaletteGray } from '@elastic/eui';
+import euiThemeLight from '@elastic/eui/dist/eui_theme_light.json';
 
 import { i18n } from '@kbn/i18n';
 
@@ -43,7 +44,8 @@ export interface RocCurveDataRow extends RocCurveItem {
 export const getRocCurveChartVegaLiteSpec = (
   classificationClasses: string[],
   data: RocCurveDataRow[],
-  legendTitle: string
+  legendTitle: string,
+  euiTheme: typeof euiThemeLight
 ): TopLevelSpec => {
   // we append two rows which make up the data for the diagonal baseline
   data.push({ tpr: 0, fpr: 0, threshold: 1, class_name: BASELINE });
@@ -59,6 +61,8 @@ export const getRocCurveChartVegaLiteSpec = (
     config: {
       legend: {
         orient: 'right',
+        labelColor: euiTheme.euiTextSubduedColor,
+        titleColor: euiTheme.euiTextSubduedColor,
       },
       view: {
         continuousHeight: SIZE,
@@ -101,9 +105,9 @@ export const getRocCurveChartVegaLiteSpec = (
         type: 'quantitative',
         axis: {
           tickColor: GRAY,
-          labelColor: GRAY,
+          labelColor: euiTheme.euiTextSubduedColor,
           domainColor: GRAY,
-          titleColor: GRAY,
+          titleColor: euiTheme.euiTextSubduedColor,
         },
       },
       y: {
@@ -114,9 +118,9 @@ export const getRocCurveChartVegaLiteSpec = (
         type: 'quantitative',
         axis: {
           tickColor: GRAY,
-          labelColor: GRAY,
+          labelColor: euiTheme.euiTextSubduedColor,
           domainColor: GRAY,
-          titleColor: GRAY,
+          titleColor: euiTheme.euiTextSubduedColor,
         },
       },
       tooltip: [
diff --git a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx
index b9e866d2e00d0..04543a28ab3e6 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx
@@ -19,10 +19,7 @@ import { IndexDataVisualizerPage as Page } from '../../../datavisualizer/index_b
 import { checkBasicLicense } from '../../../license';
 import { checkGetJobsCapabilitiesResolver } from '../../../capabilities/check_capabilities';
 import { loadIndexPatterns } from '../../../util/index_utils';
-import { checkMlNodesAvailable } from '../../../ml_nodes_check';
 import { getBreadcrumbWithUrlForApp } from '../../breadcrumbs';
-import { ML_PAGES } from '../../../../../common/constants/locator';
-import { useCreateAndNavigateToMlLink } from '../../../contexts/kibana/use_create_url';
 
 export const indexBasedRouteFactory = (
   navigateToPath: NavigateToPath,
@@ -44,16 +41,12 @@ export const indexBasedRouteFactory = (
 
 const PageWrapper: FC<PageProps> = ({ location, deps }) => {
   const { redirectToMlAccessDeniedPage } = deps;
-  const redirectToJobsManagementPage = useCreateAndNavigateToMlLink(
-    ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE
-  );
 
   const { index, savedSearchId }: Record<string, any> = parse(location.search, { sort: false });
   const { context } = useResolver(index, savedSearchId, deps.config, {
     checkBasicLicense,
     loadIndexPatterns: () => loadIndexPatterns(deps.indexPatterns),
     checkGetJobsCapabilities: () => checkGetJobsCapabilitiesResolver(redirectToMlAccessDeniedPage),
-    checkMlNodesAvailable: () => checkMlNodesAvailable(redirectToJobsManagementPage),
   });
 
   return (
diff --git a/x-pack/plugins/ml/public/application/routing/routes/new_job/index_or_search.tsx b/x-pack/plugins/ml/public/application/routing/routes/new_job/index_or_search.tsx
index 8500d85d5580a..53057cb16c132 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/new_job/index_or_search.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/new_job/index_or_search.tsx
@@ -19,9 +19,6 @@ import { getBreadcrumbWithUrlForApp } from '../../breadcrumbs';
 import { checkBasicLicense } from '../../../license';
 import { loadIndexPatterns } from '../../../util/index_utils';
 import { checkGetJobsCapabilitiesResolver } from '../../../capabilities/check_capabilities';
-import { checkMlNodesAvailable } from '../../../ml_nodes_check';
-import { ML_PAGES } from '../../../../../common/constants/locator';
-import { useCreateAndNavigateToMlLink } from '../../../contexts/kibana/use_create_url';
 
 enum MODE {
   NEW_JOB,
@@ -85,9 +82,6 @@ const PageWrapper: FC<IndexOrSearchPageProps> = ({ nextStepPath, deps, mode }) =
   } = useMlKibana();
 
   const { redirectToMlAccessDeniedPage } = deps;
-  const redirectToJobsManagementPage = useCreateAndNavigateToMlLink(
-    ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE
-  );
 
   const newJobResolvers = {
     ...basicResolvers(deps),
@@ -98,7 +92,6 @@ const PageWrapper: FC<IndexOrSearchPageProps> = ({ nextStepPath, deps, mode }) =
     checkBasicLicense,
     loadIndexPatterns: () => loadIndexPatterns(deps.indexPatterns),
     checkGetJobsCapabilities: () => checkGetJobsCapabilitiesResolver(redirectToMlAccessDeniedPage),
-    checkMlNodesAvailable: () => checkMlNodesAvailable(redirectToJobsManagementPage),
   };
 
   const { context } = useResolver(
diff --git a/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx b/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx
index 1f56ea22839e2..cf9b5628222f4 100644
--- a/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/logstash/pipeline.tsx
@@ -46,7 +46,7 @@ export const LogStashPipelinePage: React.FC<ComponentProps> = ({ clusters }) =>
     cluster_uuid: clusterUuid,
   }) as any;
   const [data, setData] = useState({} as any);
-  const [detailVertexId, setDetailVertexId] = useState<string | null>(null);
+  const [detailVertexId, setDetailVertexId] = useState<string | null | undefined>(undefined);
   const { updateTotalItemCount } = useTable('logstash.pipelines');
 
   const title = i18n.translate('xpack.monitoring.logstash.pipeline.routeTitle', {
@@ -128,18 +128,19 @@ export const LogStashPipelinePage: React.FC<ComponentProps> = ({ clusters }) =>
   const timeseriesTooltipXValueFormatter = (xValue: any) => moment(xValue).format(dateFormat);
   const { generate: generateBreadcrumbs } = useContext(BreadcrumbContainer.Context);
 
-  const onVertexChange = useCallback(
-    (vertex: any) => {
-      if (!vertex) {
-        setDetailVertexId(null);
-      } else {
-        setDetailVertexId(vertex.id);
-      }
+  const onVertexChange = useCallback((vertex: any) => {
+    if (!vertex) {
+      setDetailVertexId(null);
+    } else {
+      setDetailVertexId(vertex.id);
+    }
+  }, []);
 
+  useEffect(() => {
+    if (detailVertexId !== undefined) {
       getPageData();
-    },
-    [getPageData]
-  );
+    }
+  }, [detailVertexId, getPageData]);
 
   const onChangePipelineHash = useCallback(() => {
     window.location.hash = getSafeForExternalLink(
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
index faaf0762dbc7a..3647945c094cb 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
@@ -136,6 +136,8 @@ exports[`CcrShard that it renders normally 1`] = `
           </h2>
         </EuiTitle>
       }
+      buttonElement="button"
+      element="div"
       id="ccrLatestStat"
       initialIsOpen={false}
       isLoading={false}
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.test.tsx
index 03fd23631f755..097ea89826c38 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/filter_label.test.tsx
@@ -12,7 +12,8 @@ import { FilterLabel } from './filter_label';
 import * as useSeriesHook from '../hooks/use_series_filters';
 import { buildFilterLabel } from '../../filter_value_label/filter_value_label';
 
-describe('FilterLabel', function () {
+// FLAKY: https://github.com/elastic/kibana/issues/115324
+describe.skip('FilterLabel', function () {
   mockAppIndexPattern();
 
   const invertFilter = jest.fn();
diff --git a/x-pack/plugins/observability/server/index.ts b/x-pack/plugins/observability/server/index.ts
index 77595d1187093..22a469dbedbdd 100644
--- a/x-pack/plugins/observability/server/index.ts
+++ b/x-pack/plugins/observability/server/index.ts
@@ -32,8 +32,8 @@ export const config: PluginConfigDescriptor = {
       index: schema.string({ defaultValue: 'observability-annotations' }),
     }),
     unsafe: schema.object({
-      alertingExperience: schema.object({ enabled: schema.boolean({ defaultValue: false }) }),
-      cases: schema.object({ enabled: schema.boolean({ defaultValue: false }) }),
+      alertingExperience: schema.object({ enabled: schema.boolean({ defaultValue: true }) }),
+      cases: schema.object({ enabled: schema.boolean({ defaultValue: true }) }),
     }),
   }),
 };
diff --git a/x-pack/plugins/reporting/public/share_context_menu/__snapshots__/screen_capture_panel_content.test.tsx.snap b/x-pack/plugins/reporting/public/share_context_menu/__snapshots__/screen_capture_panel_content.test.tsx.snap
index c5d87410f596f..40cf48555a8c0 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/__snapshots__/screen_capture_panel_content.test.tsx.snap
+++ b/x-pack/plugins/reporting/public/share_context_menu/__snapshots__/screen_capture_panel_content.test.tsx.snap
@@ -259,6 +259,8 @@ exports[`ScreenCapturePanelContent properly renders a view with "canvas" layout
     <EuiAccordion
       arrowDisplay="left"
       buttonContent="Advanced options"
+      buttonElement="button"
+      element="div"
       id="advanced-options"
       initialIsOpen={false}
       isLoading={false}
@@ -271,31 +273,53 @@ exports[`ScreenCapturePanelContent properly renders a view with "canvas" layout
         <div
           className="euiAccordion__triggerWrapper"
         >
-          <button
+          <EuiButtonIcon
             aria-controls="advanced-options"
             aria-expanded={false}
-            className="euiAccordion__button"
-            id="generated-id"
+            aria-labelledby="generated-id"
+            className="euiAccordion__iconButton"
+            color="text"
+            iconType="arrowRight"
             onClick={[Function]}
-            type="button"
+            tabIndex={-1}
           >
-            <span
-              className="euiAccordion__iconWrapper"
+            <button
+              aria-controls="advanced-options"
+              aria-expanded={false}
+              aria-labelledby="generated-id"
+              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiAccordion__iconButton"
+              disabled={false}
+              onClick={[Function]}
+              tabIndex={-1}
+              type="button"
             >
               <EuiIcon
-                className="euiAccordion__icon"
+                aria-hidden="true"
+                className="euiButtonIcon__icon"
+                color="inherit"
                 size="m"
                 type="arrowRight"
               >
                 <span
-                  className="euiAccordion__icon"
+                  aria-hidden="true"
+                  className="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="arrowRight"
                   size="m"
                 />
               </EuiIcon>
-            </span>
+            </button>
+          </EuiButtonIcon>
+          <button
+            aria-controls="advanced-options"
+            aria-expanded={false}
+            className="euiAccordion__button"
+            id="generated-id"
+            onClick={[Function]}
+            type="button"
+          >
             <span
-              className="euiIEFlexWrapFix"
+              className="euiAccordion__buttonContent"
             >
               Advanced options
             </span>
@@ -697,6 +721,8 @@ exports[`ScreenCapturePanelContent properly renders a view with "print" layout o
     <EuiAccordion
       arrowDisplay="left"
       buttonContent="Advanced options"
+      buttonElement="button"
+      element="div"
       id="advanced-options"
       initialIsOpen={false}
       isLoading={false}
@@ -709,31 +735,53 @@ exports[`ScreenCapturePanelContent properly renders a view with "print" layout o
         <div
           className="euiAccordion__triggerWrapper"
         >
-          <button
+          <EuiButtonIcon
             aria-controls="advanced-options"
             aria-expanded={false}
-            className="euiAccordion__button"
-            id="generated-id"
+            aria-labelledby="generated-id"
+            className="euiAccordion__iconButton"
+            color="text"
+            iconType="arrowRight"
             onClick={[Function]}
-            type="button"
+            tabIndex={-1}
           >
-            <span
-              className="euiAccordion__iconWrapper"
+            <button
+              aria-controls="advanced-options"
+              aria-expanded={false}
+              aria-labelledby="generated-id"
+              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiAccordion__iconButton"
+              disabled={false}
+              onClick={[Function]}
+              tabIndex={-1}
+              type="button"
             >
               <EuiIcon
-                className="euiAccordion__icon"
+                aria-hidden="true"
+                className="euiButtonIcon__icon"
+                color="inherit"
                 size="m"
                 type="arrowRight"
               >
                 <span
-                  className="euiAccordion__icon"
+                  aria-hidden="true"
+                  className="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="arrowRight"
                   size="m"
                 />
               </EuiIcon>
-            </span>
+            </button>
+          </EuiButtonIcon>
+          <button
+            aria-controls="advanced-options"
+            aria-expanded={false}
+            className="euiAccordion__button"
+            id="generated-id"
+            onClick={[Function]}
+            type="button"
+          >
             <span
-              className="euiIEFlexWrapFix"
+              className="euiAccordion__buttonContent"
             >
               Advanced options
             </span>
@@ -1007,6 +1055,8 @@ exports[`ScreenCapturePanelContent renders the default view properly 1`] = `
     <EuiAccordion
       arrowDisplay="left"
       buttonContent="Advanced options"
+      buttonElement="button"
+      element="div"
       id="advanced-options"
       initialIsOpen={false}
       isLoading={false}
@@ -1019,31 +1069,53 @@ exports[`ScreenCapturePanelContent renders the default view properly 1`] = `
         <div
           className="euiAccordion__triggerWrapper"
         >
-          <button
+          <EuiButtonIcon
             aria-controls="advanced-options"
             aria-expanded={false}
-            className="euiAccordion__button"
-            id="generated-id"
+            aria-labelledby="generated-id"
+            className="euiAccordion__iconButton"
+            color="text"
+            iconType="arrowRight"
             onClick={[Function]}
-            type="button"
+            tabIndex={-1}
           >
-            <span
-              className="euiAccordion__iconWrapper"
+            <button
+              aria-controls="advanced-options"
+              aria-expanded={false}
+              aria-labelledby="generated-id"
+              className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiAccordion__iconButton"
+              disabled={false}
+              onClick={[Function]}
+              tabIndex={-1}
+              type="button"
             >
               <EuiIcon
-                className="euiAccordion__icon"
+                aria-hidden="true"
+                className="euiButtonIcon__icon"
+                color="inherit"
                 size="m"
                 type="arrowRight"
               >
                 <span
-                  className="euiAccordion__icon"
+                  aria-hidden="true"
+                  className="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="arrowRight"
                   size="m"
                 />
               </EuiIcon>
-            </span>
+            </button>
+          </EuiButtonIcon>
+          <button
+            aria-controls="advanced-options"
+            aria-expanded={false}
+            className="euiAccordion__button"
+            id="generated-id"
+            onClick={[Function]}
+            type="button"
+          >
             <span
-              className="euiIEFlexWrapFix"
+              className="euiAccordion__buttonContent"
             >
               Advanced options
             </span>
diff --git a/x-pack/plugins/rule_registry/server/config.ts b/x-pack/plugins/rule_registry/server/config.ts
index 078498864f8e8..983a750452410 100644
--- a/x-pack/plugins/rule_registry/server/config.ts
+++ b/x-pack/plugins/rule_registry/server/config.ts
@@ -12,7 +12,7 @@ export const config: PluginConfigDescriptor = {
   deprecations: ({ deprecate, unused }) => [unused('unsafe.indexUpgrade.enabled')],
   schema: schema.object({
     write: schema.object({
-      enabled: schema.boolean({ defaultValue: false }),
+      enabled: schema.boolean({ defaultValue: true }),
     }),
     unsafe: schema.object({
       legacyMultiTenancy: schema.object({
diff --git a/x-pack/plugins/security/server/config.test.ts b/x-pack/plugins/security/server/config.test.ts
index 4034a7a79e6dd..ababf435af3c9 100644
--- a/x-pack/plugins/security/server/config.test.ts
+++ b/x-pack/plugins/security/server/config.test.ts
@@ -56,7 +56,6 @@ describe('config schema', () => {
           "selector": Object {},
         },
         "cookieName": "sid",
-        "enabled": true,
         "encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
         "loginAssistanceMessage": "",
         "public": Object {},
@@ -110,7 +109,6 @@ describe('config schema', () => {
           "selector": Object {},
         },
         "cookieName": "sid",
-        "enabled": true,
         "encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
         "loginAssistanceMessage": "",
         "public": Object {},
@@ -164,7 +162,6 @@ describe('config schema', () => {
           "selector": Object {},
         },
         "cookieName": "sid",
-        "enabled": true,
         "loginAssistanceMessage": "",
         "public": Object {},
         "secureCookies": false,
diff --git a/x-pack/plugins/security/server/config.ts b/x-pack/plugins/security/server/config.ts
index 23a1fd2efa382..a9e22448e1725 100644
--- a/x-pack/plugins/security/server/config.ts
+++ b/x-pack/plugins/security/server/config.ts
@@ -198,7 +198,6 @@ const providersConfigSchema = schema.object(
 );
 
 export const ConfigSchema = schema.object({
-  enabled: schema.boolean({ defaultValue: true }),
   loginAssistanceMessage: schema.string({ defaultValue: '' }),
   showInsecureClusterWarning: schema.boolean({ defaultValue: true }),
   loginHelp: schema.maybe(schema.string()),
diff --git a/x-pack/plugins/security/server/config_deprecations.test.ts b/x-pack/plugins/security/server/config_deprecations.test.ts
index a629b6d73a682..3c674de97ad8e 100644
--- a/x-pack/plugins/security/server/config_deprecations.test.ts
+++ b/x-pack/plugins/security/server/config_deprecations.test.ts
@@ -357,34 +357,4 @@ describe('Config Deprecations', () => {
       ]
     `);
   });
-
-  it('warns when the security plugin is disabled', () => {
-    const config = {
-      xpack: {
-        security: {
-          enabled: false,
-        },
-      },
-    };
-    const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
-    expect(migrated).toEqual(config);
-    expect(messages).toMatchInlineSnapshot(`
-      Array [
-        "Disabling the security plugin \\"xpack.security.enabled\\" will only be supported by disable security in Elasticsearch.",
-      ]
-    `);
-  });
-
-  it('does not warn when the security plugin is enabled', () => {
-    const config = {
-      xpack: {
-        security: {
-          enabled: true,
-        },
-      },
-    };
-    const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
-    expect(migrated).toEqual(config);
-    expect(messages).toHaveLength(0);
-  });
 });
diff --git a/x-pack/plugins/security/server/config_deprecations.ts b/x-pack/plugins/security/server/config_deprecations.ts
index 0c76840819b3d..055818a159a79 100644
--- a/x-pack/plugins/security/server/config_deprecations.ts
+++ b/x-pack/plugins/security/server/config_deprecations.ts
@@ -157,28 +157,4 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
       });
     }
   },
-  (settings, fromPath, addDeprecation) => {
-    if (settings?.xpack?.security?.enabled === false) {
-      addDeprecation({
-        configPath: 'xpack.security.enabled',
-        title: i18n.translate('xpack.security.deprecations.enabledTitle', {
-          defaultMessage: 'Disabling the security plugin "xpack.security.enabled" is deprecated',
-        }),
-        message: i18n.translate('xpack.security.deprecations.enabledMessage', {
-          defaultMessage:
-            'Disabling the security plugin "xpack.security.enabled" will only be supported by disable security in Elasticsearch.',
-        }),
-        correctiveActions: {
-          manualSteps: [
-            i18n.translate('xpack.security.deprecations.enabled.manualStepOneMessage', {
-              defaultMessage: `Remove "xpack.security.enabled" from your Kibana configuration.`,
-            }),
-            i18n.translate('xpack.security.deprecations.enabled.manualStepTwoMessage', {
-              defaultMessage: `To turn off security features, disable them in Elasticsearch instead.`,
-            }),
-          ],
-        },
-      });
-    }
-  },
 ];
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx
index 352fc95447822..591cba6b19381 100644
--- a/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/index.test.tsx
@@ -7,6 +7,9 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
+import { waitFor } from '@testing-library/react';
+
+import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 import { SourcererScopeName } from '../../store/sourcerer/model';
 import { Sourcerer } from './index';
 import { DEFAULT_INDEX_PATTERN } from '../../../../common/constants';
@@ -19,8 +22,6 @@ import {
   TestProviders,
 } from '../../mock';
 import { createStore, State } from '../../store';
-import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
-import { waitFor } from '@testing-library/react';
 
 const mockDispatch = jest.fn();
 jest.mock('react-redux', () => {
@@ -46,6 +47,7 @@ const mockOptions = [
 const defaultProps = {
   scope: sourcererModel.SourcererScopeName.default,
 };
+
 describe('Sourcerer component', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -59,6 +61,34 @@ describe('Sourcerer component', () => {
     store = createStore(state, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
   });
 
+  it('renders tooltip', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <Sourcerer {...defaultProps} />
+      </TestProviders>
+    );
+    expect(wrapper.find('[data-test-subj="sourcerer-tooltip"]').prop('content')).toEqual(
+      mockOptions
+        .map((p) => p.label)
+        .sort()
+        .join(', ')
+    );
+  });
+
+  it('renders popover button inside tooltip', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <Sourcerer {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect(
+      wrapper
+        .find('[data-test-subj="sourcerer-tooltip"] [data-test-subj="sourcerer-trigger"]')
+        .exists()
+    ).toBeTruthy();
+  });
+
   // Using props callback instead of simulating clicks,
   // because EuiSelectable uses a virtualized list, which isn't easily testable via test subjects
   it('Mounts with all options selected', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/index.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/index.tsx
index 8d0bb6410651c..3e922176f9982 100644
--- a/x-pack/plugins/security_solution/public/common/components/sourcerer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/index.tsx
@@ -169,55 +169,62 @@ export const Sourcerer = React.memo<SourcererComponentProps>(({ scope: scopeId }
     [isPopoverOpen, sourcererScope.selectedPatterns]
   );
 
+  const buttonWithTooptip = useMemo(() => {
+    return tooltipContent ? (
+      <EuiToolTip position="top" content={tooltipContent} data-test-subj="sourcerer-tooltip">
+        {trigger}
+      </EuiToolTip>
+    ) : (
+      trigger
+    );
+  }, [trigger, tooltipContent]);
+
   return (
-    <EuiToolTip position="top" content={tooltipContent}>
-      <EuiPopover
-        data-test-subj="sourcerer-popover"
-        button={trigger}
-        isOpen={isPopoverOpen}
-        closePopover={handleClosePopOver}
-        display="block"
-        panelPaddingSize="s"
-        repositionOnScroll
-        ownFocus
-      >
-        <PopoverContent>
-          <EuiPopoverTitle>
-            <>{i18n.SELECT_INDEX_PATTERNS}</>
-          </EuiPopoverTitle>
-          <EuiSpacer size="s" />
-          <EuiText color="default">{i18n.INDEX_PATTERNS_SELECTION_LABEL}</EuiText>
-          <EuiSpacer size="xs" />
-          {comboBox}
-          <EuiSpacer size="s" />
-          <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
-            <EuiFlexItem>
-              <ResetButton
-                aria-label={i18n.INDEX_PATTERNS_RESET}
-                data-test-subj="sourcerer-reset"
-                flush="left"
-                onClick={resetDataSources}
-                title={i18n.INDEX_PATTERNS_RESET}
-              >
-                {i18n.INDEX_PATTERNS_RESET}
-              </ResetButton>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                onClick={handleSaveIndices}
-                disabled={isSavingDisabled}
-                data-test-subj="add-index"
-                fill
-                fullWidth
-                size="s"
-              >
-                {i18n.SAVE_INDEX_PATTERNS}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </PopoverContent>
-      </EuiPopover>
-    </EuiToolTip>
+    <EuiPopover
+      data-test-subj="sourcerer-popover"
+      button={buttonWithTooptip}
+      isOpen={isPopoverOpen}
+      closePopover={handleClosePopOver}
+      panelPaddingSize="s"
+      repositionOnScroll
+      ownFocus
+    >
+      <PopoverContent>
+        <EuiPopoverTitle>
+          <>{i18n.SELECT_INDEX_PATTERNS}</>
+        </EuiPopoverTitle>
+        <EuiSpacer size="s" />
+        <EuiText color="default">{i18n.INDEX_PATTERNS_SELECTION_LABEL}</EuiText>
+        <EuiSpacer size="xs" />
+        {comboBox}
+        <EuiSpacer size="s" />
+        <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
+          <EuiFlexItem>
+            <ResetButton
+              aria-label={i18n.INDEX_PATTERNS_RESET}
+              data-test-subj="sourcerer-reset"
+              flush="left"
+              onClick={resetDataSources}
+              title={i18n.INDEX_PATTERNS_RESET}
+            >
+              {i18n.INDEX_PATTERNS_RESET}
+            </ResetButton>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButton
+              onClick={handleSaveIndices}
+              disabled={isSavingDisabled}
+              data-test-subj="add-index"
+              fill
+              fullWidth
+              size="s"
+            >
+              {i18n.SAVE_INDEX_PATTERNS}
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </PopoverContent>
+    </EuiPopover>
   );
 });
 Sourcerer.displayName = 'Sourcerer';
diff --git a/x-pack/plugins/security_solution/public/common/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
index 5e008e28073de..ee1b371fb5178 100644
--- a/x-pack/plugins/security_solution/public/common/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
@@ -22,7 +22,9 @@ exports[`Modal all errors rendering it renders the default all errors modal when
     <EuiAccordion
       arrowDisplay="left"
       buttonContent="Error 1, Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt u ..."
+      buttonElement="button"
       data-test-subj="modal-all-errors-accordion"
+      element="div"
       id="accordion1"
       initialIsOpen={true}
       isLoading={false}
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/alerts_count.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/alerts_count.tsx
index f64e279fb2755..d6b1afea98592 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/alerts_count.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_count_panel/alerts_count.tsx
@@ -35,7 +35,7 @@ const getAlertsCountTableColumns = (
     {
       field: 'key',
       name: selectedStackByOption,
-      truncateText: true,
+      truncateText: false,
       render: function DraggableStackOptionField(value: string) {
         return (
           <DefaultDraggable
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/endpoint_details_tabs.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/endpoint_details_tabs.tsx
index 8f044959f4c90..adae21b55a637 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/endpoint_details_tabs.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/endpoint_details_tabs.tsx
@@ -62,7 +62,7 @@ export const EndpointDetailsFlyoutTabs = memo(
     const selectedTab = useMemo(() => tabs.find((tab) => tab.id === show), [tabs, show]);
 
     const renderTabs = tabs.map((tab) => (
-      <EndpointDetailsTab tab={tab} isSelected={tab.id === selectedTab?.id} />
+      <EndpointDetailsTab key={tab.id} tab={tab} isSelected={tab.id === selectedTab?.id} />
     ));
 
     return (
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details_content.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details_content.tsx
index cc1cad52eb21c..cb920bdbd1b03 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details_content.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details_content.tsx
@@ -13,8 +13,9 @@ import {
   EuiText,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiBadge,
   EuiSpacer,
+  EuiLink,
+  EuiHealth,
 } from '@elastic/eui';
 import React, { memo, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -30,7 +31,6 @@ import { getEndpointDetailsPath } from '../../../../common/routing';
 import { EndpointPolicyLink } from '../components/endpoint_policy_link';
 import { OutOfDate } from '../components/out_of_date';
 import { EndpointAgentStatus } from '../components/endpoint_agent_status';
-import { useAppUrl } from '../../../../../common/lib/kibana/hooks';
 
 const HostIds = styled(EuiListGroupItem)`
   margin-top: 0;
@@ -53,9 +53,8 @@ export const EndpointDetailsContent = memo(
     const policyStatus = useEndpointSelector(
       policyResponseStatus
     ) as keyof typeof POLICY_STATUS_TO_BADGE_COLOR;
-    const { getAppUrl } = useAppUrl();
 
-    const [policyResponseUri, policyResponseRoutePath] = useMemo(() => {
+    const policyResponseRoutePath = useMemo(() => {
       // eslint-disable-next-line @typescript-eslint/naming-convention
       const { selected_endpoint, show, ...currentUrlParams } = queryParams;
       const path = getEndpointDetailsPath({
@@ -63,8 +62,8 @@ export const EndpointDetailsContent = memo(
         ...currentUrlParams,
         selected_endpoint: details.agent.id,
       });
-      return [getAppUrl({ path }), path];
-    }, [details.agent.id, getAppUrl, queryParams]);
+      return path;
+    }, [details.agent.id, queryParams]);
 
     const policyStatusClickHandler = useNavigateByRouterEventHandler(policyResponseRoutePath);
 
@@ -142,26 +141,20 @@ export const EndpointDetailsContent = memo(
             defaultMessage: 'Policy Status',
           }),
           description: (
-            // https://github.com/elastic/eui/issues/4530
-            // @ts-ignore
-            <EuiBadge
+            <EuiHealth
+              data-test-subj={`policyStatusValue-${policyStatus}`}
               color={POLICY_STATUS_TO_BADGE_COLOR[policyStatus] || 'default'}
-              data-test-subj="policyStatusValue"
-              href={policyResponseUri}
-              onClick={policyStatusClickHandler}
-              onClickAriaLabel={i18n.translate(
-                'xpack.securitySolution.endpoint.details.policyStatus',
-                { defaultMessage: 'Policy Status' }
-              )}
             >
-              <EuiText size="m">
-                <FormattedMessage
-                  id="xpack.securitySolution.endpoint.details.policyStatusValue"
-                  defaultMessage="{policyStatus, select, success {Success} warning {Warning} failure {Failed} other {Unknown}}"
-                  values={{ policyStatus }}
-                />
-              </EuiText>
-            </EuiBadge>
+              <EuiLink onClick={policyStatusClickHandler} data-test-subj="policyStatusValue">
+                <EuiText size="m">
+                  <FormattedMessage
+                    id="xpack.securitySolution.endpoint.details.policyStatusValue"
+                    defaultMessage="{policyStatus, select, success {Success} warning {Warning} failure {Failed} other {Unknown}}"
+                    values={{ policyStatus }}
+                  />
+                </EuiText>
+              </EuiLink>
+            </EuiHealth>
           ),
         },
         {
@@ -185,14 +178,7 @@ export const EndpointDetailsContent = memo(
           ),
         },
       ];
-    }, [
-      details,
-      hostStatus,
-      policyResponseUri,
-      policyStatus,
-      policyStatusClickHandler,
-      policyInfo,
-    ]);
+    }, [details, hostStatus, policyStatus, policyStatusClickHandler, policyInfo]);
 
     return (
       <>
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 727c2e8a35024..45dcf5f7a0f7d 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
@@ -167,7 +167,7 @@ describe('when on the endpoint list page', () => {
 
   it('should NOT display timeline', async () => {
     const renderResult = render();
-    const timelineFlyout = await renderResult.queryByTestId('flyoutOverlay');
+    const timelineFlyout = renderResult.queryByTestId('flyoutOverlay');
     expect(timelineFlyout).toBeNull();
   });
 
@@ -460,7 +460,7 @@ describe('when on the endpoint list page', () => {
         const outOfDates = await renderResult.findAllByTestId('rowPolicyOutOfDate');
         expect(outOfDates).toHaveLength(4);
 
-        outOfDates.forEach((item, index) => {
+        outOfDates.forEach((item) => {
           expect(item.textContent).toEqual('Out-of-date');
           expect(item.querySelector(`[data-euiicon-type][color=warning]`)).not.toBeNull();
         });
@@ -512,8 +512,8 @@ describe('when on the endpoint list page', () => {
 
   // FLAKY: https://github.com/elastic/kibana/issues/75721
   describe.skip('when polling on Endpoint List', () => {
-    beforeEach(async () => {
-      await reactTestingLibrary.act(() => {
+    beforeEach(() => {
+      reactTestingLibrary.act(() => {
         const hostListData = mockEndpointResultList({ total: 4 }).hosts;
 
         setEndpointListApiMockImplementation(coreStart.http, {
@@ -703,8 +703,8 @@ describe('when on the endpoint list page', () => {
 
     it('should show the flyout and footer', async () => {
       const renderResult = await renderAndWaitForData();
-      await expect(renderResult.findByTestId('endpointDetailsFlyout')).not.toBeNull();
-      await expect(renderResult.queryByTestId('endpointDetailsFlyoutFooter')).not.toBeNull();
+      expect(renderResult.getByTestId('endpointDetailsFlyout')).not.toBeNull();
+      expect(renderResult.getByTestId('endpointDetailsFlyoutFooter')).not.toBeNull();
     });
 
     it('should display policy name value as a link', async () => {
@@ -738,15 +738,6 @@ describe('when on the endpoint list page', () => {
       );
     });
 
-    it('should display policy status value as a link', async () => {
-      const renderResult = await renderAndWaitForData();
-      const policyStatusLink = await renderResult.findByTestId('policyStatusValue');
-      expect(policyStatusLink).not.toBeNull();
-      expect(policyStatusLink.getAttribute('href')).toEqual(
-        `${APP_PATH}${MANAGEMENT_PATH}/endpoints?page_index=0&page_size=10&selected_endpoint=1&show=policy_response`
-      );
-    });
-
     it('should update the URL when policy status link is clicked', async () => {
       const renderResult = await renderAndWaitForData();
       const policyStatusLink = await renderResult.findByTestId('policyStatusValue');
@@ -763,10 +754,8 @@ describe('when on the endpoint list page', () => {
     it('should display Success overall policy status', async () => {
       const renderResult = await renderAndWaitForData();
       const policyStatusBadge = await renderResult.findByTestId('policyStatusValue');
+      expect(renderResult.getByTestId('policyStatusValue-success')).toBeTruthy();
       expect(policyStatusBadge.textContent).toEqual('Success');
-      expect(policyStatusBadge.getAttribute('style')).toMatch(
-        /background-color\: rgb\(109\, 204\, 177\)\;/
-      );
     });
 
     it('should display Warning overall policy status', async () => {
@@ -774,9 +763,7 @@ describe('when on the endpoint list page', () => {
       const renderResult = await renderAndWaitForData();
       const policyStatusBadge = await renderResult.findByTestId('policyStatusValue');
       expect(policyStatusBadge.textContent).toEqual('Warning');
-      expect(policyStatusBadge.getAttribute('style')).toMatch(
-        /background-color\: rgb\(241\, 216\, 111\)\;/
-      );
+      expect(renderResult.getByTestId('policyStatusValue-warning')).toBeTruthy();
     });
 
     it('should display Failed overall policy status', async () => {
@@ -784,9 +771,7 @@ describe('when on the endpoint list page', () => {
       const renderResult = await renderAndWaitForData();
       const policyStatusBadge = await renderResult.findByTestId('policyStatusValue');
       expect(policyStatusBadge.textContent).toEqual('Failed');
-      expect(policyStatusBadge.getAttribute('style')).toMatch(
-        /background-color\: rgb\(255\, 126\, 98\)\;/
-      );
+      expect(renderResult.getByTestId('policyStatusValue-failure')).toBeTruthy();
     });
 
     it('should display Unknown overall policy status', async () => {
@@ -794,9 +779,7 @@ describe('when on the endpoint list page', () => {
       const renderResult = await renderAndWaitForData();
       const policyStatusBadge = await renderResult.findByTestId('policyStatusValue');
       expect(policyStatusBadge.textContent).toEqual('Unknown');
-      expect(policyStatusBadge.getAttribute('style')).toMatch(
-        /background-color\: rgb\(211\, 218\, 230\)\;/
-      );
+      expect(renderResult.getByTestId('policyStatusValue-')).toBeTruthy();
     });
 
     it('should show the Take Action button', async () => {
@@ -898,7 +881,7 @@ describe('when on the endpoint list page', () => {
         await reactTestingLibrary.act(async () => {
           await middlewareSpy.waitForAction('serverReturnedEndpointList');
         });
-        const hostNameLinks = await renderResult.getAllByTestId('hostnameCellLink');
+        const hostNameLinks = renderResult.getAllByTestId('hostnameCellLink');
         reactTestingLibrary.fireEvent.click(hostNameLinks[0]);
       });
 
@@ -913,7 +896,7 @@ describe('when on the endpoint list page', () => {
         reactTestingLibrary.act(() => {
           dispatchEndpointDetailsActivityLogChanged('success', getMockData());
         });
-        const endpointDetailsFlyout = await renderResult.queryByTestId('endpointDetailsFlyoutBody');
+        const endpointDetailsFlyout = renderResult.queryByTestId('endpointDetailsFlyoutBody');
         expect(endpointDetailsFlyout).not.toBeNull();
       });
 
@@ -926,7 +909,7 @@ describe('when on the endpoint list page', () => {
         reactTestingLibrary.act(() => {
           dispatchEndpointDetailsActivityLogChanged('success', getMockData());
         });
-        const logEntries = await renderResult.queryAllByTestId('timelineEntry');
+        const logEntries = renderResult.queryAllByTestId('timelineEntry');
         expect(logEntries.length).toEqual(3);
         expect(`${logEntries[0]} .euiCommentTimeline__icon--update`).not.toBe(null);
         expect(`${logEntries[1]} .euiCommentTimeline__icon--regular`).not.toBe(null);
@@ -944,7 +927,7 @@ describe('when on the endpoint list page', () => {
             getMockData({ hasLogsEndpointActionResponses: true })
           );
         });
-        const logEntries = await renderResult.queryAllByTestId('timelineEntry');
+        const logEntries = renderResult.queryAllByTestId('timelineEntry');
         expect(logEntries.length).toEqual(4);
         expect(`${logEntries[0]} .euiCommentTimeline__icon--update`).not.toBe(null);
         expect(`${logEntries[1]} .euiCommentTimeline__icon--update`).not.toBe(null);
@@ -960,7 +943,7 @@ describe('when on the endpoint list page', () => {
         reactTestingLibrary.act(() => {
           dispatchEndpointDetailsActivityLogChanged('failed', getMockData());
         });
-        const emptyState = await renderResult.queryByTestId('activityLogEmpty');
+        const emptyState = renderResult.queryByTestId('activityLogEmpty');
         expect(emptyState).not.toBe(null);
       });
 
@@ -980,10 +963,10 @@ describe('when on the endpoint list page', () => {
           });
         });
 
-        const emptyState = await renderResult.queryByTestId('activityLogEmpty');
+        const emptyState = renderResult.queryByTestId('activityLogEmpty');
         expect(emptyState).toBe(null);
 
-        const superDatePicker = await renderResult.queryByTestId('activityLogSuperDatePicker');
+        const superDatePicker = renderResult.queryByTestId('activityLogSuperDatePicker');
         expect(superDatePicker).not.toBe(null);
       });
 
@@ -1002,7 +985,7 @@ describe('when on the endpoint list page', () => {
         reactTestingLibrary.act(() => {
           dispatchEndpointDetailsActivityLogChanged('success', getMockData());
         });
-        const logEntries = await renderResult.queryAllByTestId('timelineEntry');
+        const logEntries = renderResult.queryAllByTestId('timelineEntry');
         expect(logEntries.length).toEqual(3);
       });
 
@@ -1047,7 +1030,7 @@ describe('when on the endpoint list page', () => {
         reactTestingLibrary.act(() => {
           dispatchEndpointDetailsActivityLogChanged('success', getMockData());
         });
-        const commentTexts = await renderResult.queryAllByTestId('activityLogCommentText');
+        const commentTexts = renderResult.queryAllByTestId('activityLogCommentText');
         expect(commentTexts.length).toEqual(1);
         expect(commentTexts[0].textContent).toEqual('some comment');
         expect(commentTexts[0].parentElement?.parentElement?.className).toContain(
@@ -1081,7 +1064,7 @@ describe('when on the endpoint list page', () => {
       afterEach(reactTestingLibrary.cleanup);
 
       it('should hide the host details panel', async () => {
-        const endpointDetailsFlyout = await renderResult.queryByTestId('endpointDetailsFlyoutBody');
+        const endpointDetailsFlyout = renderResult.queryByTestId('endpointDetailsFlyoutBody');
         expect(endpointDetailsFlyout).toBeNull();
       });
 
@@ -1328,8 +1311,8 @@ describe('when on the endpoint list page', () => {
         ).toBe(true);
       });
 
-      it('should NOT show the flyout footer', async () => {
-        await expect(renderResult.queryByTestId('endpointDetailsFlyoutFooter')).toBeNull();
+      it('should NOT show the flyout footer', () => {
+        expect(renderResult.queryByTestId('endpointDetailsFlyoutFooter')).toBeNull();
       });
     });
   });
diff --git a/x-pack/plugins/security_solution/public/overview/components/overview_host_stats/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/overview/components/overview_host_stats/__snapshots__/index.test.tsx.snap
index 2e70d1a7f8a5b..4512dfd8aab2c 100644
--- a/x-pack/plugins/security_solution/public/overview/components/overview_host_stats/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/overview/components/overview_host_stats/__snapshots__/index.test.tsx.snap
@@ -38,6 +38,8 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
       </EuiFlexGroup>
     }
     buttonContentClassName="accordion-button"
+    buttonElement="button"
+    element="div"
     id="host-stat-accordion-groupauditbeat"
     initialIsOpen={false}
     isLoading={false}
@@ -273,6 +275,8 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
       </EuiFlexGroup>
     }
     buttonContentClassName="accordion-button"
+    buttonElement="button"
+    element="div"
     id="host-stat-accordion-groupendgame"
     initialIsOpen={false}
     isLoading={false}
@@ -540,6 +544,8 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
       </EuiFlexGroup>
     }
     buttonContentClassName="accordion-button"
+    buttonElement="button"
+    element="div"
     id="host-stat-accordion-groupfilebeat"
     initialIsOpen={false}
     isLoading={false}
@@ -615,6 +621,8 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
       </EuiFlexGroup>
     }
     buttonContentClassName="accordion-button"
+    buttonElement="button"
+    element="div"
     id="host-stat-accordion-groupwinlogbeat"
     initialIsOpen={false}
     isLoading={false}
diff --git a/x-pack/plugins/security_solution/public/overview/components/overview_network_stats/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/overview/components/overview_network_stats/__snapshots__/index.test.tsx.snap
index 167866ef3c606..d9a5521aed9ac 100644
--- a/x-pack/plugins/security_solution/public/overview/components/overview_network_stats/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/overview/components/overview_network_stats/__snapshots__/index.test.tsx.snap
@@ -38,6 +38,8 @@ exports[`Overview Network Stat Data rendering it renders the default OverviewNet
       </EuiFlexGroup>
     }
     buttonContentClassName="accordion-button"
+    buttonElement="button"
+    element="div"
     id="network-stat-accordion-groupauditbeat"
     initialIsOpen={false}
     isLoading={false}
@@ -113,6 +115,8 @@ exports[`Overview Network Stat Data rendering it renders the default OverviewNet
       </EuiFlexGroup>
     }
     buttonContentClassName="accordion-button"
+    buttonElement="button"
+    element="div"
     id="network-stat-accordion-groupfilebeat"
     initialIsOpen={false}
     isLoading={false}
@@ -316,6 +320,8 @@ exports[`Overview Network Stat Data rendering it renders the default OverviewNet
       </EuiFlexGroup>
     }
     buttonContentClassName="accordion-button"
+    buttonElement="button"
+    element="div"
     id="network-stat-accordion-grouppacketbeat"
     initialIsOpen={false}
     isLoading={false}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.test.tsx
index 3c6dc68edefcc..e519cfcd204a7 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.test.tsx
@@ -5,7 +5,9 @@
  * 2.0.
  */
 
-import { fireEvent, render } from '@testing-library/react';
+import { fireEvent, render, within } from '@testing-library/react';
+import { EuiToolTip } from '@elastic/eui';
+
 import React from 'react';
 import { PickEventType } from './pick_events';
 import {
@@ -19,6 +21,14 @@ import { TimelineEventsType } from '../../../../../common';
 import { createStore } from '../../../../common/store';
 import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
 
+jest.mock('@elastic/eui', () => {
+  const actual = jest.requireActual('@elastic/eui');
+  return {
+    ...actual,
+    EuiToolTip: jest.fn(),
+  };
+});
+
 describe('pick_events', () => {
   const defaultProps = {
     eventType: 'all' as TimelineEventsType,
@@ -53,6 +63,23 @@ describe('pick_events', () => {
     },
   };
   const store = createStore(state, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+
+  const mockTooltip = ({
+    tooltipContent,
+    children,
+  }: {
+    tooltipContent: string;
+    children: React.ReactElement;
+  }) => (
+    <div data-test-subj="timeline-sourcerer-tooltip">
+      <span>{tooltipContent}</span>
+      {children}
+    </div>
+  );
+
+  beforeAll(() => {
+    (EuiToolTip as unknown as jest.Mock).mockImplementation(mockTooltip);
+  });
   beforeEach(() => {
     jest.clearAllMocks();
     jest.restoreAllMocks();
@@ -68,6 +95,32 @@ describe('pick_events', () => {
       initialPatterns.sort().join('')
     );
   });
+
+  it('renders tooltip', () => {
+    render(
+      <TestProviders>
+        <PickEventType {...defaultProps} />
+      </TestProviders>
+    );
+
+    expect((EuiToolTip as unknown as jest.Mock).mock.calls[0][0].content).toEqual(
+      initialPatterns
+        .filter((p) => p != null)
+        .sort()
+        .join(', ')
+    );
+  });
+
+  it('renders popover button inside tooltip', () => {
+    const wrapper = render(
+      <TestProviders>
+        <PickEventType {...defaultProps} />
+      </TestProviders>
+    );
+    const tooltip = wrapper.getByTestId('timeline-sourcerer-tooltip');
+    expect(within(tooltip).getByTestId('sourcerer-timeline-trigger')).toBeTruthy();
+  });
+
   it('correctly filters options', () => {
     const wrapper = render(
       <TestProviders store={store}>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.tsx
index dbe04eccac521..6d86d7c0f1330 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.tsx
@@ -295,6 +295,20 @@ const PickEventTypeComponents: React.FC<PickEventTypeProps> = ({
     [isPopoverOpen, sourcererScope.selectedPatterns]
   );
 
+  const buttonWithTooptip = useMemo(() => {
+    return tooltipContent ? (
+      <EuiToolTip
+        position="top"
+        content={tooltipContent}
+        data-test-subj="timeline-sourcerer-tooltip"
+      >
+        {button}
+      </EuiToolTip>
+    ) : (
+      button
+    );
+  }, [button, tooltipContent]);
+
   const ButtonContent = useMemo(
     () => (
       <AdvancedSettings data-test-subj="advanced-settings">
@@ -326,69 +340,66 @@ const PickEventTypeComponents: React.FC<PickEventTypeProps> = ({
 
   return (
     <PickEventContainer>
-      <EuiToolTip position="top" content={tooltipContent}>
-        <EuiPopover
-          button={button}
-          closePopover={closePopover}
-          id="popover"
-          isOpen={isPopoverOpen}
-          ownFocus
-          repositionOnScroll
-        >
-          <PopoverContent>
-            <EuiPopoverTitle>
-              <>{i18n.SELECT_INDEX_PATTERNS}</>
-            </EuiPopoverTitle>
-            <EuiSpacer size="s" />
-            {filter}
-            <EuiSpacer size="m" />
-            <EuiAccordion
-              id="accordion1"
-              forceState={showAdvanceSettings ? 'open' : 'closed'}
-              buttonContent={ButtonContent}
-              onToggle={setAdvanceSettings}
-            >
-              <>
-                <EuiSpacer size="s" />
-                {comboBox}
-              </>
-            </EuiAccordion>
-            {!showAdvanceSettings && (
-              <>
-                <EuiSpacer size="s" />
-                <ConfigHelper size="s" color="subdued">
-                  {i18n.CONFIGURE_INDEX_PATTERNS}
-                </ConfigHelper>
-              </>
-            )}
-            <EuiSpacer size="m" />
-            <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
-              <EuiFlexItem>
-                <ResetButton
-                  aria-label={i18n.DATA_SOURCES_RESET}
-                  data-test-subj="sourcerer-reset"
-                  flush="left"
-                  onClick={resetDataSources}
-                  title={i18n.DATA_SOURCES_RESET}
-                >
-                  {i18n.DATA_SOURCES_RESET}
-                </ResetButton>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiButton
-                  onClick={handleSaveIndices}
-                  data-test-subj="add-index"
-                  fill
-                  fullWidth
-                  size="s"
-                >
-                  {i18n.SAVE_INDEX_PATTERNS}
-                </EuiButton>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </PopoverContent>
-        </EuiPopover>
-      </EuiToolTip>
+      <EuiPopover
+        button={buttonWithTooptip}
+        closePopover={closePopover}
+        id="popover"
+        isOpen={isPopoverOpen}
+        repositionOnScroll
+      >
+        <PopoverContent>
+          <EuiPopoverTitle>
+            <>{i18n.SELECT_INDEX_PATTERNS}</>
+          </EuiPopoverTitle>
+          <EuiSpacer size="s" />
+          {filter}
+          <EuiSpacer size="m" />
+          <EuiAccordion
+            id="accordion1"
+            forceState={showAdvanceSettings ? 'open' : 'closed'}
+            buttonContent={ButtonContent}
+            onToggle={setAdvanceSettings}
+          >
+            <>
+              <EuiSpacer size="s" />
+              {comboBox}
+            </>
+          </EuiAccordion>
+          {!showAdvanceSettings && (
+            <>
+              <EuiSpacer size="s" />
+              <ConfigHelper size="s" color="subdued">
+                {i18n.CONFIGURE_INDEX_PATTERNS}
+              </ConfigHelper>
+            </>
+          )}
+          <EuiSpacer size="m" />
+          <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
+            <EuiFlexItem>
+              <ResetButton
+                aria-label={i18n.DATA_SOURCES_RESET}
+                data-test-subj="sourcerer-reset"
+                flush="left"
+                onClick={resetDataSources}
+                title={i18n.DATA_SOURCES_RESET}
+              >
+                {i18n.DATA_SOURCES_RESET}
+              </ResetButton>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiButton
+                onClick={handleSaveIndices}
+                data-test-subj="add-index"
+                fill
+                fullWidth
+                size="s"
+              >
+                {i18n.SAVE_INDEX_PATTERNS}
+              </EuiButton>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </PopoverContent>
+      </EuiPopover>
     </PickEventContainer>
   );
 };
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 9e4249986c6a9..a8d3b4a5f3e27 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -807,8 +807,6 @@
     "xpack.lens.xyChart.topAxisDisabledHelpText": "この設定は、上の軸が有効であるときにのみ適用されます。",
     "xpack.lens.xyChart.topAxisLabel": "上の軸",
     "xpack.lens.xyChart.upperBoundLabel": "上界",
-    "xpack.lens.xyChart.valueLabelsVisibility.auto": "非表示",
-    "xpack.lens.xyChart.valueLabelsVisibility.inside": "表示",
     "xpack.lens.xyChart.valuesHistogramDisabledHelpText": "この設定はヒストグラムで変更できません。",
     "xpack.lens.xyChart.valuesInLegend.help": "凡例に値を表示",
     "xpack.lens.xyChart.valuesPercentageDisabledHelpText": "この設定は割合エリアグラフで変更できません。",
@@ -2532,7 +2530,6 @@
     "discover.sourceViewer.errorMessage": "現在データを取得できませんでした。タブを更新して、再試行してください。",
     "discover.sourceViewer.errorMessageTitle": "エラーが発生しました",
     "discover.sourceViewer.refresh": "更新",
-    "discover.timeLabel": "時間",
     "discover.toggleSidebarAriaLabel": "サイドバーを切り替える",
     "discover.topNav.openOptionsPopover.description": "お知らせDiscoverでは、データの並べ替え、列のドラッグアンドドロップ、ドキュメントの比較を行う方法が改善されました。詳細設定で［クラシックテーブルを使用］を切り替えて、開始します。",
     "discover.topNav.openSearchPanel.manageSearchesButtonLabel": "検索の管理",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index db6d19d7550a9..4bd2a5907abf3 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -817,8 +817,6 @@
     "xpack.lens.xyChart.topAxisDisabledHelpText": "此设置仅在启用顶轴时应用。",
     "xpack.lens.xyChart.topAxisLabel": "顶轴",
     "xpack.lens.xyChart.upperBoundLabel": "上边界",
-    "xpack.lens.xyChart.valueLabelsVisibility.auto": "隐藏",
-    "xpack.lens.xyChart.valueLabelsVisibility.inside": "显示",
     "xpack.lens.xyChart.valuesHistogramDisabledHelpText": "不能在直方图上更改此设置。",
     "xpack.lens.xyChart.valuesInLegend.help": "在图例中显示值",
     "xpack.lens.xyChart.valuesPercentageDisabledHelpText": "不能在百分比面积图上更改此设置。",
@@ -2557,7 +2555,6 @@
     "discover.sourceViewer.errorMessage": "当前无法获取数据。请刷新选项卡以重试。",
     "discover.sourceViewer.errorMessageTitle": "发生错误",
     "discover.sourceViewer.refresh": "刷新",
-    "discover.timeLabel": "时间",
     "discover.toggleSidebarAriaLabel": "切换侧边栏",
     "discover.topNav.openOptionsPopover.description": "好消息！Discover 有更好的方法排序数据、拖放列和比较文档。在“高级模式”中切换“使用经典表”来开始。",
     "discover.topNav.openSearchPanel.manageSearchesButtonLabel": "管理搜索",
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/helpers.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/helpers.ts
index e6acb2e0976a8..755923acc25cb 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/helpers.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/helpers.ts
@@ -28,7 +28,7 @@ export const isFieldInvalid = (
 ): boolean => error !== undefined && error.length > 0 && field != null;
 
 // TODO: Remove when the applications are certified
-export const isLegacyConnector = (connector: ServiceNowActionConnector) => {
+export const isDeprecatedConnector = (connector: ServiceNowActionConnector): boolean => {
   if (connector == null) {
     return true;
   }
@@ -41,5 +41,14 @@ export const isLegacyConnector = (connector: ServiceNowActionConnector) => {
     return true;
   }
 
-  return connector.config.isLegacy;
+  /**
+   * Connectors after the Elastic ServiceNow application use the
+   * Import Set API (https://developer.servicenow.com/dev.do#!/reference/api/rome/rest/c_ImportSetAPI)
+   * A ServiceNow connector is considered deprecated if it uses the Table API.
+   *
+   * All other connectors do not have the usesTableApi config property
+   * so the function will always return false for them.
+   */
+
+  return !!connector.config.usesTableApi;
 };
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx
index eb3e1c01887c9..3f22a51b5bd53 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.test.tsx
@@ -52,7 +52,7 @@ describe('servicenow connector validation', () => {
         isPreconfigured: false,
         config: {
           apiUrl: 'https://dev94428.service-now.com/',
-          isLegacy: false,
+          usesTableApi: false,
         },
       } as ServiceNowActionConnector;
 
@@ -60,7 +60,7 @@ describe('servicenow connector validation', () => {
         config: {
           errors: {
             apiUrl: [],
-            isLegacy: [],
+            usesTableApi: [],
           },
         },
         secrets: {
@@ -88,7 +88,7 @@ describe('servicenow connector validation', () => {
         config: {
           errors: {
             apiUrl: ['URL is required.'],
-            isLegacy: [],
+            usesTableApi: [],
           },
         },
         secrets: {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx
index 6b6d536ff303b..7267e11ae7327 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx
@@ -28,7 +28,7 @@ const validateConnector = async (
   const translations = await import('./translations');
   const configErrors = {
     apiUrl: new Array<string>(),
-    isLegacy: new Array<string>(),
+    usesTableApi: new Array<string>(),
   };
   const secretsErrors = {
     username: new Array<string>(),
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.test.tsx
index f491376e5078c..03acb673bf5a4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.test.tsx
@@ -36,7 +36,7 @@ describe('ServiceNowActionConnectorFields renders', () => {
     name: 'SN',
     config: {
       apiUrl: 'https://test/',
-      isLegacy: true,
+      usesTableApi: true,
     },
   } as ServiceNowActionConnector;
 
@@ -44,7 +44,7 @@ describe('ServiceNowActionConnectorFields renders', () => {
     ...usesTableApiConnector,
     config: {
       ...usesTableApiConnector.config,
-      isLegacy: false,
+      usesTableApi: false,
     },
   } as ServiceNowActionConnector;
 
@@ -350,7 +350,7 @@ describe('ServiceNowActionConnectorFields renders', () => {
           id: usesTableApiConnector.id,
           connector: {
             name: usesTableApiConnector.name,
-            config: { ...usesTableApiConnector.config, isLegacy: false },
+            config: { ...usesTableApiConnector.config, usesTableApi: false },
             secrets: usesTableApiConnector.secrets,
           },
         })
@@ -415,7 +415,7 @@ describe('ServiceNowActionConnectorFields renders', () => {
       ).toBeTruthy();
     });
 
-    test('should set the isLegacy to false when creating a connector', async () => {
+    test('should set the usesTableApi to false when creating a connector', async () => {
       const newConnector = { ...usesTableApiConnector, config: {}, secrets: {} };
       const editActionConfig = jest.fn();
 
@@ -432,7 +432,7 @@ describe('ServiceNowActionConnectorFields renders', () => {
         />
       );
 
-      expect(editActionConfig).toHaveBeenCalledWith('isLegacy', false);
+      expect(editActionConfig).toHaveBeenCalledWith('usesTableApi', false);
     });
 
     test('it should set the legacy attribute if it is not undefined', async () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx
index a0b4bdca47ff5..db3c32755f0ed 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_connectors.tsx
@@ -15,7 +15,7 @@ import { useKibana } from '../../../../common/lib/kibana';
 import { DeprecatedCallout } from './deprecated_callout';
 import { useGetAppInfo } from './use_get_app_info';
 import { ApplicationRequiredCallout } from './application_required_callout';
-import { isRESTApiError, isLegacyConnector } from './helpers';
+import { isRESTApiError, isDeprecatedConnector } from './helpers';
 import { InstallationCallout } from './installation_callout';
 import { UpdateConnector } from './update_connector';
 import { updateActionConnector } from '../../../lib/action_connector_api';
@@ -36,9 +36,9 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<ServiceNowA
       http,
       notifications: { toasts },
     } = useKibana().services;
-    const { apiUrl, isLegacy } = action.config;
+    const { apiUrl, usesTableApi } = action.config;
     const { username, password } = action.secrets;
-    const isOldConnector = isLegacyConnector(action);
+    const requiresNewApplication = !isDeprecatedConnector(action);
 
     const [showUpdateConnector, setShowUpdateConnector] = useState(false);
 
@@ -46,11 +46,12 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<ServiceNowA
       actionTypeId: action.actionTypeId,
     });
 
-    const [applicationRequired, setApplicationRequired] = useState<boolean>(false);
+    const [showApplicationRequiredCallout, setShowApplicationRequiredCallout] =
+      useState<boolean>(false);
     const [applicationInfoErrorMsg, setApplicationInfoErrorMsg] = useState<string | null>(null);
 
     const getApplicationInfo = useCallback(async () => {
-      setApplicationRequired(false);
+      setShowApplicationRequiredCallout(false);
       setApplicationInfoErrorMsg(null);
 
       try {
@@ -61,7 +62,7 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<ServiceNowA
 
         return res;
       } catch (e) {
-        setApplicationRequired(true);
+        setShowApplicationRequiredCallout(true);
         setApplicationInfoErrorMsg(e.message);
         // We need to throw here so the connector will be not be saved.
         throw e;
@@ -69,10 +70,10 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<ServiceNowA
     }, [action, fetchAppInfo]);
 
     const beforeActionConnectorSave = useCallback(async () => {
-      if (!isOldConnector) {
+      if (requiresNewApplication) {
         await getApplicationInfo();
       }
-    }, [getApplicationInfo, isOldConnector]);
+    }, [getApplicationInfo, requiresNewApplication]);
 
     useEffect(
       () => setCallbacks({ beforeActionConnectorSave }),
@@ -90,13 +91,13 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<ServiceNowA
           http,
           connector: {
             name: action.name,
-            config: { apiUrl, isLegacy: false },
+            config: { apiUrl, usesTableApi: false },
             secrets: { username, password },
           },
           id: action.id,
         });
 
-        editActionConfig('isLegacy', false);
+        editActionConfig('usesTableApi', false);
         setShowUpdateConnector(false);
 
         toasts.addSuccess({
@@ -124,14 +125,14 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<ServiceNowA
     ]);
 
     /**
-     * Defaults the isLegacy attribute to false
-     * if it is not defined. The isLegacy attribute
+     * Defaults the usesTableApi attribute to false
+     * if it is not defined. The usesTableApi attribute
      * will be undefined only at the creation of
      * the connector.
      */
     useEffect(() => {
-      if (isLegacy == null) {
-        editActionConfig('isLegacy', false);
+      if (usesTableApi == null) {
+        editActionConfig('usesTableApi', false);
       }
     });
 
@@ -150,8 +151,8 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<ServiceNowA
             onCancel={onModalCancel}
           />
         )}
-        {!isOldConnector && <InstallationCallout />}
-        {isOldConnector && <DeprecatedCallout onMigrate={onMigrateClick} />}
+        {requiresNewApplication && <InstallationCallout />}
+        {!requiresNewApplication && <DeprecatedCallout onMigrate={onMigrateClick} />}
         <Credentials
           action={action}
           errors={errors}
@@ -160,7 +161,7 @@ const ServiceNowConnectorFields: React.FC<ActionConnectorFieldsProps<ServiceNowA
           editActionSecrets={editActionSecrets}
           editActionConfig={editActionConfig}
         />
-        {applicationRequired && !isOldConnector && (
+        {showApplicationRequiredCallout && requiresNewApplication && (
           <ApplicationRequiredCallout message={applicationInfoErrorMsg} />
         )}
       </>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_itsm_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_itsm_params.tsx
index 09b04f0fa3c48..dcfdfe3af0e0e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_itsm_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_itsm_params.tsx
@@ -23,7 +23,7 @@ import { ServiceNowITSMActionParams, Choice, Fields, ServiceNowActionConnector }
 import { TextAreaWithMessageVariables } from '../../text_area_with_message_variables';
 import { TextFieldWithMessageVariables } from '../../text_field_with_message_variables';
 import { useGetChoices } from './use_get_choices';
-import { choicesToEuiOptions, DEFAULT_CORRELATION_ID, isLegacyConnector } from './helpers';
+import { choicesToEuiOptions, DEFAULT_CORRELATION_ID, isDeprecatedConnector } from './helpers';
 
 import * as i18n from './translations';
 
@@ -46,10 +46,6 @@ const ServiceNowParamsFields: React.FunctionComponent<
     notifications: { toasts },
   } = useKibana().services;
 
-  const isDeprecatedConnector = isLegacyConnector(
-    actionConnector as unknown as ServiceNowActionConnector
-  );
-
   const actionConnectorRef = useRef(actionConnector?.id ?? '');
   const { incident, comments } = useMemo(
     () =>
@@ -244,7 +240,7 @@ const ServiceNowParamsFields: React.FunctionComponent<
         </EuiFlexItem>
       </EuiFlexGroup>
       <EuiSpacer size="m" />
-      {!isDeprecatedConnector && (
+      {!isDeprecatedConnector(actionConnector as unknown as ServiceNowActionConnector) && (
         <>
           <EuiFlexGroup>
             <EuiFlexItem>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_sir_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_sir_params.tsx
index 42758250408d9..a264ed5421c2e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_sir_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_sir_params.tsx
@@ -25,7 +25,7 @@ import { TextFieldWithMessageVariables } from '../../text_field_with_message_var
 import * as i18n from './translations';
 import { useGetChoices } from './use_get_choices';
 import { ServiceNowSIRActionParams, Fields, Choice, ServiceNowActionConnector } from './types';
-import { choicesToEuiOptions, isLegacyConnector, DEFAULT_CORRELATION_ID } from './helpers';
+import { choicesToEuiOptions, isDeprecatedConnector, DEFAULT_CORRELATION_ID } from './helpers';
 
 const useGetChoicesFields = ['category', 'subcategory', 'priority'];
 const defaultFields: Fields = {
@@ -43,10 +43,6 @@ const ServiceNowSIRParamsFields: React.FunctionComponent<
     notifications: { toasts },
   } = useKibana().services;
 
-  const isDeprecatedConnector = isLegacyConnector(
-    actionConnector as unknown as ServiceNowActionConnector
-  );
-
   const actionConnectorRef = useRef(actionConnector?.id ?? '');
   const { incident, comments } = useMemo(
     () =>
@@ -229,7 +225,7 @@ const ServiceNowSIRParamsFields: React.FunctionComponent<
         </EuiFlexItem>
       </EuiFlexGroup>
       <EuiSpacer size="m" />
-      {!isDeprecatedConnector && (
+      {!isDeprecatedConnector(actionConnector as unknown as ServiceNowActionConnector) && (
         <>
           <EuiFlexGroup>
             <EuiFlexItem>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts
index ecbb4f9de726b..40bb47543a3c8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/types.ts
@@ -35,7 +35,7 @@ export interface ServiceNowITOMActionParams {
 
 export interface ServiceNowConfig {
   apiUrl: string;
-  isLegacy: boolean;
+  usesTableApi: boolean;
 }
 
 export interface ServiceNowSecrets {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.test.tsx
index 2d95bfa85ceb9..ecb90051e78c2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/update_connector.test.tsx
@@ -22,7 +22,7 @@ const actionConnector: ServiceNowActionConnector = {
   name: 'servicenow',
   config: {
     apiUrl: 'https://test/',
-    isLegacy: true,
+    usesTableApi: true,
   },
 };
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_app_info.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_app_info.test.tsx
index c6b70443ec8fb..f842f6863676a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_app_info.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/use_get_app_info.test.tsx
@@ -34,7 +34,7 @@ const actionConnector = {
   isPreconfigured: false,
   config: {
     apiUrl: 'https://test.service-now.com/',
-    isLegacy: false,
+    usesTableApi: false,
   },
 } as ServiceNowActionConnector;
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
index 844f28f022547..5de21470fc19a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
@@ -205,8 +205,8 @@ const ActionsConnectorsList: React.FunctionComponent = () => {
         const itemConfig = (
           item as UserConfiguredActionConnector<Record<string, unknown>, Record<string, unknown>>
         ).config;
-        const showLegacyTooltip =
-          itemConfig?.isLegacy &&
+        const showDeprecatedTooltip =
+          itemConfig?.usesTableApi &&
           // TODO: Remove when applications are certified
           ((ENABLE_NEW_SN_ITSM_CONNECTOR && item.actionTypeId === '.servicenow') ||
             (ENABLE_NEW_SN_SIR_CONNECTOR && item.actionTypeId === '.servicenow-sir'));
@@ -233,7 +233,7 @@ const ActionsConnectorsList: React.FunctionComponent = () => {
                 position="right"
               />
             ) : null}
-            {showLegacyTooltip && <ConnectorIconTipWithSpacing />}
+            {showDeprecatedTooltip && <ConnectorIconTipWithSpacing />}
           </>
         );
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx
index 4ae570a62f7d9..ffcda22195ff5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx
@@ -64,7 +64,8 @@ export const TestExpression: FunctionComponent<any> = () => {
   );
 };
 
-describe('alert_add', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/g
+describe.skip('alert_add', () => {
   let wrapper: ReactWrapper<any>;
 
   async function setup(
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/ping_headers.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/ping_headers.test.tsx.snap
index ef707dc3ea315..3899c27acf1d7 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/ping_headers.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/__snapshots__/ping_headers.test.tsx.snap
@@ -16,6 +16,8 @@ exports[`Ping Headers shallow renders expected elements for valid props 1`] = `
         </h3>
       </EuiText>
     }
+    buttonElement="button"
+    element="div"
     id="responseHeaderAccord"
     initialIsOpen={false}
     isLoading={false}
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 3fe5ecb6076e2..7bcec7b11c10e 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -242,7 +242,9 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
               },
             },
           })}`,
-          ...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),
+          ...disabledPlugins
+            .filter((k) => k !== 'security')
+            .map((key) => `--xpack.${key}.enabled=false`),
           ...plugins.map(
             (pluginDir) =>
               `--plugin-path=${path.resolve(__dirname, 'fixtures', 'plugins', pluginDir)}`
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts
index 26a9c1bcadf6e..e9e6d6732327a 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/jira_simulation.ts
@@ -30,7 +30,6 @@ export function initPlugin(router: IRouter, path: string) {
       return jsonResponse(res, 200, {
         id: '123',
         key: 'CK-1',
-        created: '2020-04-27T14:17:45.490Z',
       });
     }
   );
@@ -48,12 +47,7 @@ export function initPlugin(router: IRouter, path: string) {
       req: KibanaRequest<any, any, any, any>,
       res: KibanaResponseFactory
     ): Promise<IKibanaResponse<any>> {
-      return jsonResponse(res, 200, {
-        id: '123',
-        key: 'CK-1',
-        created: '2020-04-27T14:17:45.490Z',
-        updated: '2020-04-27T14:17:45.490Z',
-      });
+      return jsonResponse(res, 204, {});
     }
   );
 
@@ -73,10 +67,12 @@ export function initPlugin(router: IRouter, path: string) {
       return jsonResponse(res, 200, {
         id: '123',
         key: 'CK-1',
-        created: '2020-04-27T14:17:45.490Z',
-        updated: '2020-04-27T14:17:45.490Z',
-        summary: 'title',
-        description: 'description',
+        fields: {
+          created: '2020-04-27T14:17:45.490Z',
+          updated: '2020-04-27T14:17:45.490Z',
+          summary: 'title',
+          description: 'description',
+        },
       });
     }
   );
@@ -97,6 +93,7 @@ export function initPlugin(router: IRouter, path: string) {
       return jsonResponse(res, 200, {
         id: '123',
         created: '2020-04-27T14:17:45.490Z',
+        updated: '2020-04-27T14:17:45.490Z',
       });
     }
   );
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow_itsm.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow_itsm.ts
index 97c2a77a8f074..1308959ebbacf 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow_itsm.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow_itsm.ts
@@ -22,7 +22,7 @@ export default function serviceNowITSMTest({ getService }: FtrProviderContext) {
   const mockServiceNow = {
     config: {
       apiUrl: 'www.servicenowisinkibanaactions.com',
-      isLegacy: false,
+      usesTableApi: false,
     },
     secrets: {
       password: 'elastic',
@@ -91,7 +91,7 @@ export default function serviceNowITSMTest({ getService }: FtrProviderContext) {
             connector_type_id: '.servicenow',
             config: {
               apiUrl: serviceNowSimulatorURL,
-              isLegacy: false,
+              usesTableApi: false,
             },
             secrets: mockServiceNow.secrets,
           })
@@ -105,7 +105,7 @@ export default function serviceNowITSMTest({ getService }: FtrProviderContext) {
           is_missing_secrets: false,
           config: {
             apiUrl: serviceNowSimulatorURL,
-            isLegacy: false,
+            usesTableApi: false,
           },
         });
 
@@ -121,12 +121,12 @@ export default function serviceNowITSMTest({ getService }: FtrProviderContext) {
           is_missing_secrets: false,
           config: {
             apiUrl: serviceNowSimulatorURL,
-            isLegacy: false,
+            usesTableApi: false,
           },
         });
       });
 
-      it('should set the isLegacy to true when not provided', async () => {
+      it('should set the usesTableApi to true when not provided', async () => {
         const { body: createdAction } = await supertest
           .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
@@ -144,7 +144,7 @@ export default function serviceNowITSMTest({ getService }: FtrProviderContext) {
           .get(`/api/actions/connector/${createdAction.id}`)
           .expect(200);
 
-        expect(fetchedAction.config.isLegacy).to.be(true);
+        expect(fetchedAction.config.usesTableApi).to.be(true);
       });
 
       it('should respond with a 400 Bad Request when creating a servicenow action with no apiUrl', async () => {
@@ -223,7 +223,7 @@ export default function serviceNowITSMTest({ getService }: FtrProviderContext) {
             connector_type_id: '.servicenow',
             config: {
               apiUrl: serviceNowSimulatorURL,
-              isLegacy: false,
+              usesTableApi: false,
             },
             secrets: mockServiceNow.secrets,
           });
@@ -383,7 +383,7 @@ export default function serviceNowITSMTest({ getService }: FtrProviderContext) {
       });
 
       describe('Execution', () => {
-        // New connectors
+        // Connectors that use the Import set API
         describe('Import set API', () => {
           it('should handle creating an incident without comments', async () => {
             const { body: result } = await supertest
@@ -414,7 +414,7 @@ export default function serviceNowITSMTest({ getService }: FtrProviderContext) {
           });
         });
 
-        // Legacy connectors
+        // Connectors that use the Table API
         describe('Table API', () => {
           before(async () => {
             const { body } = await supertest
@@ -425,7 +425,7 @@ export default function serviceNowITSMTest({ getService }: FtrProviderContext) {
                 connector_type_id: '.servicenow',
                 config: {
                   apiUrl: serviceNowSimulatorURL,
-                  isLegacy: true,
+                  usesTableApi: true,
                 },
                 secrets: mockServiceNow.secrets,
               });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow_sir.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow_sir.ts
index 3a13e055e7aeb..c27634ecf6aca 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow_sir.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow_sir.ts
@@ -22,7 +22,7 @@ export default function serviceNowSIRTest({ getService }: FtrProviderContext) {
   const mockServiceNow = {
     config: {
       apiUrl: 'www.servicenowisinkibanaactions.com',
-      isLegacy: false,
+      usesTableApi: false,
     },
     secrets: {
       password: 'elastic',
@@ -95,7 +95,7 @@ export default function serviceNowSIRTest({ getService }: FtrProviderContext) {
             connector_type_id: '.servicenow-sir',
             config: {
               apiUrl: serviceNowSimulatorURL,
-              isLegacy: false,
+              usesTableApi: false,
             },
             secrets: mockServiceNow.secrets,
           })
@@ -109,7 +109,7 @@ export default function serviceNowSIRTest({ getService }: FtrProviderContext) {
           is_missing_secrets: false,
           config: {
             apiUrl: serviceNowSimulatorURL,
-            isLegacy: false,
+            usesTableApi: false,
           },
         });
 
@@ -125,12 +125,12 @@ export default function serviceNowSIRTest({ getService }: FtrProviderContext) {
           is_missing_secrets: false,
           config: {
             apiUrl: serviceNowSimulatorURL,
-            isLegacy: false,
+            usesTableApi: false,
           },
         });
       });
 
-      it('should set the isLegacy to true when not provided', async () => {
+      it('should set the usesTableApi to true when not provided', async () => {
         const { body: createdAction } = await supertest
           .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
@@ -148,7 +148,7 @@ export default function serviceNowSIRTest({ getService }: FtrProviderContext) {
           .get(`/api/actions/connector/${createdAction.id}`)
           .expect(200);
 
-        expect(fetchedAction.config.isLegacy).to.be(true);
+        expect(fetchedAction.config.usesTableApi).to.be(true);
       });
 
       it('should respond with a 400 Bad Request when creating a servicenow action with no apiUrl', async () => {
@@ -227,7 +227,7 @@ export default function serviceNowSIRTest({ getService }: FtrProviderContext) {
             connector_type_id: '.servicenow-sir',
             config: {
               apiUrl: serviceNowSimulatorURL,
-              isLegacy: false,
+              usesTableApi: false,
             },
             secrets: mockServiceNow.secrets,
           });
@@ -387,7 +387,7 @@ export default function serviceNowSIRTest({ getService }: FtrProviderContext) {
       });
 
       describe('Execution', () => {
-        // New connectors
+        // Connectors that use the Import set API
         describe('Import set API', () => {
           it('should handle creating an incident without comments', async () => {
             const { body: result } = await supertest
@@ -418,7 +418,7 @@ export default function serviceNowSIRTest({ getService }: FtrProviderContext) {
           });
         });
 
-        // Legacy connectors
+        // Connectors that use the Table API
         describe('Table API', () => {
           before(async () => {
             const { body } = await supertest
@@ -429,7 +429,7 @@ export default function serviceNowSIRTest({ getService }: FtrProviderContext) {
                 connector_type_id: '.servicenow-sir',
                 config: {
                   apiUrl: serviceNowSimulatorURL,
-                  isLegacy: true,
+                  usesTableApi: true,
                 },
                 secrets: mockServiceNow.secrets,
               });
diff --git a/x-pack/test/api_integration/apis/features/features/features.ts b/x-pack/test/api_integration/apis/features/features/features.ts
index 0e9ee6cc5ea58..d5b66c4d6da97 100644
--- a/x-pack/test/api_integration/apis/features/features/features.ts
+++ b/x-pack/test/api_integration/apis/features/features/features.ts
@@ -104,6 +104,7 @@ export default function ({ getService }: FtrProviderContext) {
             'indexPatterns',
             'graph',
             'monitoring',
+            'observabilityCases',
             'savedObjectsManagement',
             'savedObjectsTagging',
             'ml',
diff --git a/x-pack/test/api_integration/apis/maps/get_grid_tile.js b/x-pack/test/api_integration/apis/maps/get_grid_tile.js
index fdb8b2187bbbb..63063514555b3 100644
--- a/x-pack/test/api_integration/apis/maps/get_grid_tile.js
+++ b/x-pack/test/api_integration/apis/maps/get_grid_tile.js
@@ -8,60 +8,65 @@
 import { VectorTile } from '@mapbox/vector-tile';
 import Protobuf from 'pbf';
 import expect from '@kbn/expect';
-import {
-  KBN_IS_CENTROID_FEATURE,
-  MVT_SOURCE_LAYER_NAME,
-} from '../../../../plugins/maps/common/constants';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
 
-  describe('getGridTile', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/116186
+  describe.skip('getGridTile', () => {
     it('should return vector tile containing cluster features', async () => {
       const resp = await supertest
         .get(
           `/api/maps/mvt/getGridTile/3/2/3.pbf\
 ?geometryFieldName=geo.coordinates\
 &index=logstash-*\
-&requestBody=(_source:(excludes:!()),aggs:(gridSplit:(aggs:(avg_of_bytes:(avg:(field:bytes)),gridCentroid:(geo_centroid:(field:geo.coordinates))),geotile_grid:(bounds:!n,field:geo.coordinates,precision:!n,shard_size:65535,size:65535))),fields:!((field:%27@timestamp%27,format:date_time),(field:%27relatedContent.article:modified_time%27,format:date_time),(field:%27relatedContent.article:published_time%27,format:date_time),(field:utc_time,format:date_time)),query:(bool:(filter:!((match_all:()),(range:(%27@timestamp%27:(format:strict_date_optional_time,gte:%272015-09-20T00:00:00.000Z%27,lte:%272015-09-20T01:00:00.000Z%27)))),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(hour_of_day:(script:(lang:painless,source:%27doc[!%27@timestamp!%27].value.getHour()%27))),size:0,stored_fields:!(%27*%27))\
-&requestType=point\
-&geoFieldType=geo_point`
+&requestBody=(_source:(excludes:!()),aggs:(avg_of_bytes:(avg:(field:bytes))),fields:!((field:%27@timestamp%27,format:date_time),(field:%27relatedContent.article:modified_time%27,format:date_time),(field:%27relatedContent.article:published_time%27,format:date_time),(field:utc_time,format:date_time)),query:(bool:(filter:!((match_all:()),(range:(%27@timestamp%27:(format:strict_date_optional_time,gte:%272015-09-20T00:00:00.000Z%27,lte:%272015-09-20T01:00:00.000Z%27)))),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(hour_of_day:(script:(lang:painless,source:%27doc[!%27@timestamp!%27].value.getHour()%27))),size:0,stored_fields:!(%27*%27))\
+&requestType=point`
         )
         .set('kbn-xsrf', 'kibana')
         .responseType('blob')
         .expect(200);
 
       const jsonTile = new VectorTile(new Protobuf(resp.body));
-      const layer = jsonTile.layers[MVT_SOURCE_LAYER_NAME];
-      expect(layer.length).to.be(2);
 
       // Cluster feature
+      const layer = jsonTile.layers.aggs;
+      expect(layer.length).to.be(1);
       const clusterFeature = layer.feature(0);
       expect(clusterFeature.type).to.be(1);
       expect(clusterFeature.extent).to.be(4096);
       expect(clusterFeature.id).to.be(undefined);
-      expect(clusterFeature.properties).to.eql({ doc_count: 1, avg_of_bytes: 9252 });
+      expect(clusterFeature.properties).to.eql({ _count: 1, 'avg_of_bytes.value': 9252 });
       expect(clusterFeature.loadGeometry()).to.eql([[{ x: 87, y: 667 }]]);
 
       // Metadata feature
-      const metadataFeature = layer.feature(1);
+      const metaDataLayer = jsonTile.layers.meta;
+      expect(metaDataLayer.length).to.be(1);
+      const metadataFeature = metaDataLayer.feature(0);
       expect(metadataFeature.type).to.be(3);
       expect(metadataFeature.extent).to.be(4096);
-      expect(metadataFeature.properties).to.eql({
-        __kbn_metadata_feature__: true,
-        __kbn_feature_count__: 1,
-        __kbn_is_tile_complete__: true,
-        __kbn_vector_shape_type_counts__: '{"POINT":1,"LINE":0,"POLYGON":0}',
-        fieldMeta:
-          '{"doc_count":{"range":{"min":1,"max":1,"delta":0},"categories":{"categories":[{"key":1,"count":1}]}},"avg_of_bytes":{"range":{"min":9252,"max":9252,"delta":0},"categories":{"categories":[{"key":9252,"count":1}]}}}',
-      });
+
+      expect(metadataFeature.properties['aggregations._count.avg']).to.eql(1);
+      expect(metadataFeature.properties['aggregations._count.count']).to.eql(1);
+      expect(metadataFeature.properties['aggregations._count.min']).to.eql(1);
+      expect(metadataFeature.properties['aggregations._count.sum']).to.eql(1);
+
+      expect(metadataFeature.properties['aggregations.avg_of_bytes.avg']).to.eql(9252);
+      expect(metadataFeature.properties['aggregations.avg_of_bytes.count']).to.eql(1);
+      expect(metadataFeature.properties['aggregations.avg_of_bytes.max']).to.eql(9252);
+      expect(metadataFeature.properties['aggregations.avg_of_bytes.min']).to.eql(9252);
+      expect(metadataFeature.properties['aggregations.avg_of_bytes.sum']).to.eql(9252);
+
+      expect(metadataFeature.properties['hits.total.relation']).to.eql('eq');
+      expect(metadataFeature.properties['hits.total.value']).to.eql(1);
+
       expect(metadataFeature.loadGeometry()).to.eql([
         [
-          { x: 0, y: 0 },
-          { x: 4096, y: 0 },
-          { x: 4096, y: 4096 },
           { x: 0, y: 4096 },
+          { x: 4096, y: 4096 },
+          { x: 4096, y: 0 },
           { x: 0, y: 0 },
+          { x: 0, y: 4096 },
         ],
       ]);
     });
@@ -72,65 +77,62 @@ export default function ({ getService }) {
           `/api/maps/mvt/getGridTile/3/2/3.pbf\
 ?geometryFieldName=geo.coordinates\
 &index=logstash-*\
-&requestBody=(_source:(excludes:!()),aggs:(gridSplit:(aggs:(avg_of_bytes:(avg:(field:bytes)),gridCentroid:(geo_centroid:(field:geo.coordinates))),geotile_grid:(bounds:!n,field:geo.coordinates,precision:!n,shard_size:65535,size:65535))),fields:!((field:%27@timestamp%27,format:date_time),(field:%27relatedContent.article:modified_time%27,format:date_time),(field:%27relatedContent.article:published_time%27,format:date_time),(field:utc_time,format:date_time)),query:(bool:(filter:!((match_all:()),(range:(%27@timestamp%27:(format:strict_date_optional_time,gte:%272015-09-20T00:00:00.000Z%27,lte:%272015-09-20T01:00:00.000Z%27)))),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(hour_of_day:(script:(lang:painless,source:%27doc[!%27@timestamp!%27].value.getHour()%27))),size:0,stored_fields:!(%27*%27))\
-&requestType=grid\
-&geoFieldType=geo_point`
+&requestBody=(_source:(excludes:!()),aggs:(avg_of_bytes:(avg:(field:bytes))),fields:!((field:%27@timestamp%27,format:date_time),(field:%27relatedContent.article:modified_time%27,format:date_time),(field:%27relatedContent.article:published_time%27,format:date_time),(field:utc_time,format:date_time)),query:(bool:(filter:!((match_all:()),(range:(%27@timestamp%27:(format:strict_date_optional_time,gte:%272015-09-20T00:00:00.000Z%27,lte:%272015-09-20T01:00:00.000Z%27)))),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(hour_of_day:(script:(lang:painless,source:%27doc[!%27@timestamp!%27].value.getHour()%27))),size:0,stored_fields:!(%27*%27))\
+&requestType=grid`
         )
         .set('kbn-xsrf', 'kibana')
         .responseType('blob')
         .expect(200);
 
       const jsonTile = new VectorTile(new Protobuf(resp.body));
-      const layer = jsonTile.layers[MVT_SOURCE_LAYER_NAME];
-      expect(layer.length).to.be(3);
+      const layer = jsonTile.layers.aggs;
+      expect(layer.length).to.be(1);
 
       const gridFeature = layer.feature(0);
       expect(gridFeature.type).to.be(3);
       expect(gridFeature.extent).to.be(4096);
       expect(gridFeature.id).to.be(undefined);
-      expect(gridFeature.properties).to.eql({ doc_count: 1, avg_of_bytes: 9252 });
+      expect(gridFeature.properties).to.eql({ _count: 1, 'avg_of_bytes.value': 9252 });
       expect(gridFeature.loadGeometry()).to.eql([
         [
-          { x: 96, y: 640 },
-          { x: 96, y: 672 },
           { x: 64, y: 672 },
-          { x: 64, y: 640 },
+          { x: 96, y: 672 },
           { x: 96, y: 640 },
+          { x: 64, y: 640 },
+          { x: 64, y: 672 },
         ],
       ]);
 
       // Metadata feature
-      const metadataFeature = layer.feature(1);
+      const metaDataLayer = jsonTile.layers.meta;
+      expect(metaDataLayer.length).to.be(1);
+      const metadataFeature = metaDataLayer.feature(0);
       expect(metadataFeature.type).to.be(3);
       expect(metadataFeature.extent).to.be(4096);
-      expect(metadataFeature.properties).to.eql({
-        __kbn_metadata_feature__: true,
-        __kbn_feature_count__: 1,
-        __kbn_is_tile_complete__: true,
-        __kbn_vector_shape_type_counts__: '{"POINT":0,"LINE":0,"POLYGON":1}',
-        fieldMeta:
-          '{"doc_count":{"range":{"min":1,"max":1,"delta":0},"categories":{"categories":[{"key":1,"count":1}]}},"avg_of_bytes":{"range":{"min":9252,"max":9252,"delta":0},"categories":{"categories":[{"key":9252,"count":1}]}}}',
-      });
+
+      expect(metadataFeature.properties['aggregations._count.avg']).to.eql(1);
+      expect(metadataFeature.properties['aggregations._count.count']).to.eql(1);
+      expect(metadataFeature.properties['aggregations._count.min']).to.eql(1);
+      expect(metadataFeature.properties['aggregations._count.sum']).to.eql(1);
+
+      expect(metadataFeature.properties['aggregations.avg_of_bytes.avg']).to.eql(9252);
+      expect(metadataFeature.properties['aggregations.avg_of_bytes.count']).to.eql(1);
+      expect(metadataFeature.properties['aggregations.avg_of_bytes.max']).to.eql(9252);
+      expect(metadataFeature.properties['aggregations.avg_of_bytes.min']).to.eql(9252);
+      expect(metadataFeature.properties['aggregations.avg_of_bytes.sum']).to.eql(9252);
+
+      expect(metadataFeature.properties['hits.total.relation']).to.eql('eq');
+      expect(metadataFeature.properties['hits.total.value']).to.eql(1);
+
       expect(metadataFeature.loadGeometry()).to.eql([
         [
-          { x: 0, y: 0 },
-          { x: 4096, y: 0 },
-          { x: 4096, y: 4096 },
           { x: 0, y: 4096 },
+          { x: 4096, y: 4096 },
+          { x: 4096, y: 0 },
           { x: 0, y: 0 },
+          { x: 0, y: 4096 },
         ],
       ]);
-
-      const clusterFeature = layer.feature(2);
-      expect(clusterFeature.type).to.be(1);
-      expect(clusterFeature.extent).to.be(4096);
-      expect(clusterFeature.id).to.be(undefined);
-      expect(clusterFeature.properties).to.eql({
-        doc_count: 1,
-        avg_of_bytes: 9252,
-        [KBN_IS_CENTROID_FEATURE]: true,
-      });
-      expect(clusterFeature.loadGeometry()).to.eql([[{ x: 80, y: 656 }]]);
     });
   });
 }
diff --git a/x-pack/test/api_integration/apis/maps/get_tile.js b/x-pack/test/api_integration/apis/maps/get_tile.js
index 9705064464843..699ff145aa1b1 100644
--- a/x-pack/test/api_integration/apis/maps/get_tile.js
+++ b/x-pack/test/api_integration/apis/maps/get_tile.js
@@ -8,7 +8,6 @@
 import { VectorTile } from '@mapbox/vector-tile';
 import Protobuf from 'pbf';
 import expect from '@kbn/expect';
-import { MVT_SOURCE_LAYER_NAME } from '../../../../plugins/maps/common/constants';
 
 function findFeature(layer, callbackFn) {
   for (let i = 0; i < layer.length; i++) {
@@ -23,22 +22,21 @@ export default function ({ getService }) {
   const supertest = getService('supertest');
 
   describe('getTile', () => {
-    it('should return vector tile containing document', async () => {
+    it('should return ES vector tile containing documents and metadata', async () => {
       const resp = await supertest
         .get(
           `/api/maps/mvt/getTile/2/1/1.pbf\
 ?geometryFieldName=geo.coordinates\
 &index=logstash-*\
-&requestBody=(_source:!f,docvalue_fields:!(bytes,geo.coordinates,machine.os.raw),query:(bool:(filter:!((match_all:()),(range:(%27@timestamp%27:(format:strict_date_optional_time,gte:%272015-09-20T00:00:00.000Z%27,lte:%272015-09-20T01:00:00.000Z%27)))),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(),size:10000,stored_fields:!(bytes,geo.coordinates,machine.os.raw))\
-&geoFieldType=geo_point`
+&requestBody=(_source:!f,docvalue_fields:!(bytes,geo.coordinates,machine.os.raw),query:(bool:(filter:!((match_all:()),(range:(%27@timestamp%27:(format:strict_date_optional_time,gte:%272015-09-20T00:00:00.000Z%27,lte:%272015-09-20T01:00:00.000Z%27)))),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(),size:10000,stored_fields:!(bytes,geo.coordinates,machine.os.raw))`
         )
         .set('kbn-xsrf', 'kibana')
         .responseType('blob')
         .expect(200);
 
       const jsonTile = new VectorTile(new Protobuf(resp.body));
-      const layer = jsonTile.layers[MVT_SOURCE_LAYER_NAME];
-      expect(layer.length).to.be(3); // 2 docs + the metadata feature
+      const layer = jsonTile.layers.hits;
+      expect(layer.length).to.be(2); // 2 docs
 
       // Verify ES document
 
@@ -50,82 +48,32 @@ export default function ({ getService }) {
       expect(feature.extent).to.be(4096);
       expect(feature.id).to.be(undefined);
       expect(feature.properties).to.eql({
-        __kbn__feature_id__: 'logstash-2015.09.20:AU_x3_BsGFA8no6Qjjug:0',
         _id: 'AU_x3_BsGFA8no6Qjjug',
         _index: 'logstash-2015.09.20',
         bytes: 9252,
-        ['machine.os.raw']: 'ios',
+        'machine.os.raw': 'ios',
       });
       expect(feature.loadGeometry()).to.eql([[{ x: 44, y: 2382 }]]);
 
       // Verify metadata feature
-      const metadataFeature = findFeature(layer, (feature) => {
-        return feature.properties.__kbn_metadata_feature__;
-      });
+      const metaDataLayer = jsonTile.layers.meta;
+      const metadataFeature = metaDataLayer.feature(0);
       expect(metadataFeature).not.to.be(undefined);
       expect(metadataFeature.type).to.be(3);
       expect(metadataFeature.extent).to.be(4096);
       expect(metadataFeature.id).to.be(undefined);
-      const fieldMeta = JSON.parse(metadataFeature.properties.fieldMeta);
-      delete metadataFeature.properties.fieldMeta;
-      expect(metadataFeature.properties).to.eql({
-        __kbn_feature_count__: 2,
-        __kbn_is_tile_complete__: true,
-        __kbn_metadata_feature__: true,
-        __kbn_vector_shape_type_counts__: '{"POINT":2,"LINE":0,"POLYGON":0}',
-      });
-      expect(fieldMeta.bytes.range).to.eql({
-        min: 9252,
-        max: 9583,
-        delta: 331,
-      });
-      expect(fieldMeta.bytes.categories.categories.length).to.be(2);
-      expect(fieldMeta['machine.os.raw'].categories.categories.length).to.be(2);
-      expect(metadataFeature.loadGeometry()).to.eql([
-        [
-          { x: 0, y: 4096 },
-          { x: 0, y: 0 },
-          { x: 4096, y: 0 },
-          { x: 4096, y: 4096 },
-          { x: 0, y: 4096 },
-        ],
-      ]);
-    });
 
-    it('should return vector tile containing bounds when count exceeds size', async () => {
-      const resp = await supertest
-        // requestBody sets size=1 to force count exceeded
-        .get(
-          `/api/maps/mvt/getTile/2/1/1.pbf\
-?geometryFieldName=geo.coordinates\
-&index=logstash-*\
-&requestBody=(_source:!f,docvalue_fields:!(bytes,geo.coordinates,machine.os.raw),query:(bool:(filter:!((match_all:()),(range:(%27@timestamp%27:(format:strict_date_optional_time,gte:%272015-09-20T00:00:00.000Z%27,lte:%272015-09-20T01:00:00.000Z%27)))),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(),size:1,stored_fields:!(bytes,geo.coordinates,machine.os.raw))\
-&geoFieldType=geo_point`
-        )
-        .set('kbn-xsrf', 'kibana')
-        .responseType('blob')
-        .expect(200);
+      // This is dropping some irrelevant properties from the comparison
+      expect(metadataFeature.properties['hits.total.relation']).to.eql('eq');
+      expect(metadataFeature.properties['hits.total.value']).to.eql(2);
+      expect(metadataFeature.properties.timed_out).to.eql(false);
 
-      const jsonTile = new VectorTile(new Protobuf(resp.body));
-      const layer = jsonTile.layers[MVT_SOURCE_LAYER_NAME];
-      expect(layer.length).to.be(1);
-
-      const metadataFeature = layer.feature(0);
-      expect(metadataFeature.type).to.be(3);
-      expect(metadataFeature.extent).to.be(4096);
-      expect(metadataFeature.id).to.be(undefined);
-      expect(metadataFeature.properties).to.eql({
-        __kbn_metadata_feature__: true,
-        __kbn_feature_count__: 0,
-        __kbn_is_tile_complete__: false,
-        __kbn_vector_shape_type_counts__: '{"POINT":0,"LINE":0,"POLYGON":0}',
-      });
       expect(metadataFeature.loadGeometry()).to.eql([
         [
           { x: 44, y: 2382 },
-          { x: 44, y: 1913 },
-          { x: 550, y: 1913 },
           { x: 550, y: 2382 },
+          { x: 550, y: 1913 },
+          { x: 44, y: 1913 },
           { x: 44, y: 2382 },
         ],
       ]);
diff --git a/x-pack/test/api_integration/apis/security/privileges.ts b/x-pack/test/api_integration/apis/security/privileges.ts
index f234855b84e17..4938334bb936b 100644
--- a/x-pack/test/api_integration/apis/security/privileges.ts
+++ b/x-pack/test/api_integration/apis/security/privileges.ts
@@ -28,6 +28,7 @@ export default function ({ getService }: FtrProviderContext) {
             savedObjectsTagging: ['all', 'read'],
             canvas: ['all', 'read'],
             maps: ['all', 'read'],
+            observabilityCases: ['all', 'read'],
             fleet: ['all', 'read'],
             actions: ['all', 'read'],
             stackAlerts: ['all', 'read'],
diff --git a/x-pack/test/api_integration/apis/security/privileges_basic.ts b/x-pack/test/api_integration/apis/security/privileges_basic.ts
index ac69bfcd9d5d4..e6fe9d87af6f3 100644
--- a/x-pack/test/api_integration/apis/security/privileges_basic.ts
+++ b/x-pack/test/api_integration/apis/security/privileges_basic.ts
@@ -30,6 +30,7 @@ export default function ({ getService }: FtrProviderContext) {
             savedObjectsTagging: ['all', 'read'],
             graph: ['all', 'read'],
             maps: ['all', 'read'],
+            observabilityCases: ['all', 'read'],
             canvas: ['all', 'read'],
             infrastructure: ['all', 'read'],
             logs: ['all', 'read'],
diff --git a/x-pack/test/case_api_integration/common/config.ts b/x-pack/test/case_api_integration/common/config.ts
index 2658472a7b84d..284b4360dacf8 100644
--- a/x-pack/test/case_api_integration/common/config.ts
+++ b/x-pack/test/case_api_integration/common/config.ts
@@ -118,7 +118,9 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           `--xpack.actions.allowedHosts=${JSON.stringify(['localhost', 'some.non.existent.com'])}`,
           `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
           '--xpack.eventLog.logEntries=true',
-          ...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),
+          ...disabledPlugins
+            .filter((k) => k !== 'security')
+            .map((key) => `--xpack.${key}.enabled=false`),
           // Actions simulators plugin. Needed for testing push to external services.
           ...alertingPlugins.map(
             (pluginDir) =>
diff --git a/x-pack/test/case_api_integration/common/lib/utils.ts b/x-pack/test/case_api_integration/common/lib/utils.ts
index 0a875f9f1e822..9d48aed32d55c 100644
--- a/x-pack/test/case_api_integration/common/lib/utils.ts
+++ b/x-pack/test/case_api_integration/common/lib/utils.ts
@@ -329,7 +329,7 @@ export const getServiceNowConnector = () => ({
   },
   config: {
     apiUrl: 'http://some.non.existent.com',
-    isLegacy: false,
+    usesTableApi: false,
   },
 });
 
@@ -386,7 +386,7 @@ export const getServiceNowSIRConnector = () => ({
   },
   config: {
     apiUrl: 'http://some.non.existent.com',
-    isLegacy: false,
+    usesTableApi: false,
   },
 });
 
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts
index c3e737464f19b..a4e69ab928325 100644
--- a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts
@@ -109,7 +109,7 @@ export default ({ getService }: FtrProviderContext): void => {
           name: 'ServiceNow Connector',
           config: {
             apiUrl: 'http://some.non.existent.com',
-            isLegacy: false,
+            usesTableApi: false,
           },
           isPreconfigured: false,
           isMissingSecrets: false,
@@ -121,7 +121,7 @@ export default ({ getService }: FtrProviderContext): void => {
           name: 'ServiceNow Connector',
           config: {
             apiUrl: 'http://some.non.existent.com',
-            isLegacy: false,
+            usesTableApi: false,
           },
           isPreconfigured: false,
           isMissingSecrets: false,
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/get_connectors.ts b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/get_connectors.ts
index 7b6848d1f301e..02b91c9f0b918 100644
--- a/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/get_connectors.ts
+++ b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/get_connectors.ts
@@ -109,7 +109,7 @@ export default ({ getService }: FtrProviderContext): void => {
           name: 'ServiceNow Connector',
           config: {
             apiUrl: 'http://some.non.existent.com',
-            isLegacy: false,
+            usesTableApi: false,
           },
           isPreconfigured: false,
           isMissingSecrets: false,
@@ -121,7 +121,7 @@ export default ({ getService }: FtrProviderContext): void => {
           name: 'ServiceNow Connector',
           config: {
             apiUrl: 'http://some.non.existent.com',
-            isLegacy: false,
+            usesTableApi: false,
           },
           isPreconfigured: false,
           isMissingSecrets: false,
diff --git a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
index 7cfdf87aaf9ea..6f6d29db1ef0c 100644
--- a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
+++ b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
@@ -64,6 +64,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         const navLinks = await appsMenu.readLinks();
         expect(navLinks.map((link) => link.text)).to.eql([
           'Overview',
+          'Alerts',
           'APM',
           'User Experience',
           'Stack Management',
@@ -116,7 +117,13 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows apm navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'APM', 'User Experience', 'Stack Management']);
+        expect(navLinks).to.eql([
+          'Overview',
+          'Alerts',
+          'APM',
+          'User Experience',
+          'Stack Management',
+        ]);
       });
 
       it('can navigate to APM app', async () => {
diff --git a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts
index 5b80f6589281a..1575948610566 100644
--- a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts
+++ b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts
@@ -192,7 +192,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
     });
 
-    describe('no dev_tools privileges', () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/113080
+    describe.skip('no dev_tools privileges', () => {
       before(async () => {
         await security.role.create('no_dev_tools_privileges_role', {
           kibana: [
diff --git a/x-pack/test/functional/apps/discover/saved_searches.ts b/x-pack/test/functional/apps/discover/saved_searches.ts
index 16deecde2b0ba..f2abc6b350e5b 100644
--- a/x-pack/test/functional/apps/discover/saved_searches.ts
+++ b/x-pack/test/functional/apps/discover/saved_searches.ts
@@ -31,6 +31,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   };
 
   // Failing: See https://github.com/elastic/kibana/issues/104578
+  // FLAKY: https://github.com/elastic/kibana/issues/114002
   describe.skip('Discover Saved Searches', () => {
     before('initialize tests', async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce');
diff --git a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts
index 65b9019f556fd..d6e8737b72b91 100644
--- a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts
+++ b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts
@@ -62,7 +62,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows metrics navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'Metrics', 'Stack Management']);
+        expect(navLinks).to.eql(['Overview', 'Alerts', 'Metrics', 'Stack Management']);
       });
 
       describe('infrastructure landing page without data', () => {
@@ -159,7 +159,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows metrics navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'Metrics', 'Stack Management']);
+        expect(navLinks).to.eql(['Overview', 'Alerts', 'Metrics', 'Stack Management']);
       });
 
       describe('infrastructure landing page without data', () => {
diff --git a/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts b/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts
index d120a6c582c7b..d4f56ee3c9b9b 100644
--- a/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts
+++ b/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts
@@ -59,7 +59,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows logs navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'Logs', 'Stack Management']);
+        expect(navLinks).to.eql(['Overview', 'Alerts', 'Logs', 'Stack Management']);
       });
 
       describe('logs landing page without data', () => {
@@ -121,7 +121,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows logs navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'Logs', 'Stack Management']);
+        expect(navLinks).to.eql(['Overview', 'Alerts', 'Logs', 'Stack Management']);
       });
 
       describe('logs landing page without data', () => {
diff --git a/x-pack/test/functional/apps/lens/smokescreen.ts b/x-pack/test/functional/apps/lens/smokescreen.ts
index ff5bae8aa7e61..7cacee6446723 100644
--- a/x-pack/test/functional/apps/lens/smokescreen.ts
+++ b/x-pack/test/functional/apps/lens/smokescreen.ts
@@ -256,7 +256,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     it('should show value labels on bar charts when enabled', async () => {
       // enable value labels
       await PageObjects.lens.openVisualOptions();
-      await testSubjects.click('lnsXY_valueLabels_inside');
+      await testSubjects.click('lns_valueLabels_inside');
 
       await PageObjects.lens.waitForVisualization();
 
diff --git a/x-pack/test/functional/apps/maps/mapbox_styles.js b/x-pack/test/functional/apps/maps/mapbox_styles.js
index 58c69950590cf..471e7440822c5 100644
--- a/x-pack/test/functional/apps/maps/mapbox_styles.js
+++ b/x-pack/test/functional/apps/maps/mapbox_styles.js
@@ -6,10 +6,6 @@
  */
 
 import expect from '@kbn/expect';
-import {
-  KBN_IS_TILE_COMPLETE,
-  KBN_METADATA_FEATURE,
-} from '../../../../plugins/maps/common/constants';
 
 export default function ({ getPageObjects, getService }) {
   const PageObjects = getPageObjects(['maps']);
@@ -44,7 +40,6 @@ export default function ({ getPageObjects, getService }) {
         maxzoom: 24,
         filter: [
           'all',
-          ['!=', ['get', '__kbn_metadata_feature__'], true],
           ['!=', ['get', '__kbn_is_centroid_feature__'], true],
           ['any', ['==', ['geometry-type'], 'Point'], ['==', ['geometry-type'], 'MultiPoint']],
           ['==', ['get', '__kbn_isvisibleduetojoin__'], true],
@@ -125,7 +120,6 @@ export default function ({ getPageObjects, getService }) {
         maxzoom: 24,
         filter: [
           'all',
-          ['!=', ['get', '__kbn_metadata_feature__'], true],
           ['!=', ['get', '__kbn_is_centroid_feature__'], true],
           ['any', ['==', ['geometry-type'], 'Polygon'], ['==', ['geometry-type'], 'MultiPolygon']],
           ['==', ['get', '__kbn_isvisibleduetojoin__'], true],
@@ -202,7 +196,6 @@ export default function ({ getPageObjects, getService }) {
         maxzoom: 24,
         filter: [
           'all',
-          ['!=', ['get', '__kbn_metadata_feature__'], true],
           ['!=', ['get', '__kbn_is_centroid_feature__'], true],
           [
             'any',
@@ -217,26 +210,5 @@ export default function ({ getPageObjects, getService }) {
         paint: { 'line-color': '#41937c', 'line-opacity': 0.75, 'line-width': 1 },
       });
     });
-
-    it('should style incomplete data layer as expected', async () => {
-      const layer = mapboxStyle.layers.find((mbLayer) => {
-        return mbLayer.id === 'n1t6f_toomanyfeatures';
-      });
-
-      expect(layer).to.eql({
-        id: 'n1t6f_toomanyfeatures',
-        type: 'fill',
-        source: 'n1t6f',
-        minzoom: 0,
-        maxzoom: 24,
-        filter: [
-          'all',
-          ['==', ['get', KBN_METADATA_FEATURE], true],
-          ['==', ['get', KBN_IS_TILE_COMPLETE], false],
-        ],
-        layout: { visibility: 'visible' },
-        paint: { 'fill-pattern': '__kbn_too_many_features_image_id__', 'fill-opacity': 0.75 },
-      });
-    });
   });
 }
diff --git a/x-pack/test/functional/apps/maps/mvt_scaling.js b/x-pack/test/functional/apps/maps/mvt_scaling.js
index 66a511f6e9fec..d9b660ba0d730 100644
--- a/x-pack/test/functional/apps/maps/mvt_scaling.js
+++ b/x-pack/test/functional/apps/maps/mvt_scaling.js
@@ -31,7 +31,7 @@ export default function ({ getPageObjects, getService }) {
       //Source should be correct
       expect(
         mapboxStyle.sources[VECTOR_SOURCE_ID].tiles[0].startsWith(
-          `/api/maps/mvt/getTile/{z}/{x}/{y}.pbf?geometryFieldName=geometry&index=geo_shapes*&requestBody=(_source:!(geometry),docvalue_fields:!(prop1),query:(bool:(filter:!(),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(),size:10001,stored_fields:!(geometry,prop1))&geoFieldType=geo_shape`
+          `/api/maps/mvt/getTile/{z}/{x}/{y}.pbf?geometryFieldName=geometry&index=geo_shapes*&requestBody=(_source:!(geometry),docvalue_fields:!(prop1),query:(bool:(filter:!(),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(),size:10001,stored_fields:!(geometry,prop1))`
         )
       ).to.equal(true);
 
@@ -77,5 +77,34 @@ export default function ({ getPageObjects, getService }) {
         'fill-opacity': 1,
       });
     });
+
+    it('Style should include toomanyfeatures layer', async () => {
+      const mapboxStyle = await PageObjects.maps.getMapboxStyle();
+
+      const layer = mapboxStyle.layers.find((mbLayer) => {
+        return mbLayer.id === `${VECTOR_SOURCE_ID}_toomanyfeatures`;
+      });
+
+      expect(layer).to.eql({
+        id: 'caffa63a-ebfb-466d-8ff6-d797975b88ab_toomanyfeatures',
+        type: 'line',
+        source: 'caffa63a-ebfb-466d-8ff6-d797975b88ab',
+        'source-layer': 'meta',
+        minzoom: 0,
+        maxzoom: 24,
+        filter: [
+          'all',
+          ['==', ['get', 'hits.total.relation'], 'gte'],
+          ['>=', ['get', 'hits.total.value'], 10002],
+        ],
+        layout: { visibility: 'visible' },
+        paint: {
+          'line-color': '#fec514',
+          'line-width': 3,
+          'line-dasharray': [2, 1],
+          'line-opacity': 1,
+        },
+      });
+    });
   });
 }
diff --git a/x-pack/test/functional/apps/maps/mvt_super_fine.js b/x-pack/test/functional/apps/maps/mvt_super_fine.js
index dcd2923cb9335..6c5065a77c1d2 100644
--- a/x-pack/test/functional/apps/maps/mvt_super_fine.js
+++ b/x-pack/test/functional/apps/maps/mvt_super_fine.js
@@ -34,7 +34,7 @@ export default function ({ getPageObjects, getService }) {
       //Source should be correct
       expect(
         mapboxStyle.sources[MB_VECTOR_SOURCE_ID].tiles[0].startsWith(
-          `/api/maps/mvt/getGridTile/{z}/{x}/{y}.pbf?geometryFieldName=geo.coordinates&index=logstash-*&requestBody=(_source:(excludes:!()),aggs:(gridSplit:(aggs:(gridCentroid:(geo_centroid:(field:geo.coordinates)),max_of_bytes:(max:(field:bytes))),geotile_grid:(bounds:!n,field:geo.coordinates,precision:!n,shard_size:65535,size:65535))),fields:!((field:'@timestamp',format:date_time),(field:'relatedContent.article:modified_time',format:date_time),(field:'relatedContent.article:published_time',format:date_time),(field:utc_time,format:date_time)),query:(bool:(filter:!((range:('@timestamp':(format:strict_date_optional_time,gte:'2015-09-20T00:00:00.000Z',lte:'2015-09-20T01:00:00.000Z')))),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(hour_of_day:(script:(lang:painless,source:'doc[!'@timestamp!'].value.getHour()'))),size:0,stored_fields:!('*'))&requestType=grid&geoFieldType=geo_point`
+          `/api/maps/mvt/getGridTile/{z}/{x}/{y}.pbf?geometryFieldName=geo.coordinates&index=logstash-*&requestBody=(_source:(excludes:!()),aggs:(max_of_bytes:(max:(field:bytes))),fields:!((field:'@timestamp',format:date_time),(field:'relatedContent.article:modified_time',format:date_time),(field:'relatedContent.article:published_time',format:date_time),(field:utc_time,format:date_time)),query:(bool:(filter:!((range:('@timestamp':(format:strict_date_optional_time,gte:'2015-09-20T00:00:00.000Z',lte:'2015-09-20T01:00:00.000Z')))),must:!(),must_not:!(),should:!())),runtime_mappings:(),script_fields:(hour_of_day:(script:(lang:painless,source:'doc[!'@timestamp!'].value.getHour()'))),size:0,stored_fields:!('*'))&requestType=grid`
         )
       ).to.equal(true);
 
@@ -51,9 +51,9 @@ export default function ({ getPageObjects, getService }) {
             'coalesce',
             [
               'case',
-              ['==', ['get', 'max_of_bytes'], null],
+              ['==', ['get', 'max_of_bytes.value'], null],
               1622,
-              ['max', ['min', ['to-number', ['get', 'max_of_bytes']], 9790], 1623],
+              ['max', ['min', ['to-number', ['get', 'max_of_bytes.value']], 9790], 1623],
             ],
             1622,
           ],
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
index 7e07ac82c9dcf..a494b401480d6 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
@@ -53,7 +53,7 @@ export default function ({ getService }: FtrProviderContext) {
             // tick/grid/axis
             { color: '#DDDDDD', percentage: 50 },
             // line
-            { color: '#98A2B3', percentage: 30 },
+            { color: '#98A2B3', percentage: 10 },
           ],
           scatterplotMatrixColorStats: [
             // marker colors
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts
index 8561487dff7cb..3faee67c01a53 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts
@@ -14,7 +14,8 @@ export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const ml = getService('ml');
 
-  describe('total feature importance panel and decision path popover', function () {
+  // FLAKY: https://github.com/elastic/kibana/issues/116078
+  describe.skip('total feature importance panel and decision path popover', function () {
     const testDataList: Array<{
       suiteTitle: string;
       archive: string;
diff --git a/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts b/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts
index 7867170c1801c..977a384062f79 100644
--- a/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts
+++ b/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts
@@ -68,6 +68,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         const navLinks = await appsMenu.readLinks();
         expect(navLinks.map((link) => link.text)).to.eql([
           'Overview',
+          'Alerts',
           'Uptime',
           'Stack Management',
         ]);
@@ -121,7 +122,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('shows uptime navlink', async () => {
         const navLinks = (await appsMenu.readLinks()).map((link) => link.text);
-        expect(navLinks).to.eql(['Overview', 'Uptime', 'Stack Management']);
+        expect(navLinks).to.eql(['Overview', 'Alerts', 'Uptime', 'Stack Management']);
       });
 
       it('can navigate to Uptime app', async () => {
diff --git a/x-pack/test/lists_api_integration/common/config.ts b/x-pack/test/lists_api_integration/common/config.ts
index 4983f00cce044..214f03b632658 100644
--- a/x-pack/test/lists_api_integration/common/config.ts
+++ b/x-pack/test/lists_api_integration/common/config.ts
@@ -51,7 +51,9 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         ...xPackApiIntegrationTestsConfig.get('kbnTestServer'),
         serverArgs: [
           ...xPackApiIntegrationTestsConfig.get('kbnTestServer.serverArgs'),
-          ...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),
+          ...disabledPlugins
+            .filter((k) => k !== 'security')
+            .map((key) => `--xpack.${key}.enabled=false`),
           `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'alerts')}`,
           `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'actions')}`,
           `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'task_manager')}`,
diff --git a/x-pack/test/observability_functional/with_rac_write.config.ts b/x-pack/test/observability_functional/with_rac_write.config.ts
index 5bb7d9926af54..dcf6b121d6258 100644
--- a/x-pack/test/observability_functional/with_rac_write.config.ts
+++ b/x-pack/test/observability_functional/with_rac_write.config.ts
@@ -36,10 +36,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         ...xpackFunctionalConfig.get('kbnTestServer.serverArgs'),
         `--elasticsearch.hosts=https://${servers.elasticsearch.hostname}:${servers.elasticsearch.port}`,
         `--elasticsearch.ssl.certificateAuthorities=${CA_CERT_PATH}`,
-        // TO DO: Remove feature flags once we're good to go
-        '--xpack.observability.unsafe.alertingExperience.enabled=true',
-        '--xpack.observability.unsafe.cases.enabled=true',
-        '--xpack.ruleRegistry.write.enabled=true',
       ],
     },
     uiSettings: {
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security.config.ts b/x-pack/test/reporting_api_integration/reporting_without_security.config.ts
index dfd79916b5ce0..0779b3b871e36 100644
--- a/x-pack/test/reporting_api_integration/reporting_without_security.config.ts
+++ b/x-pack/test/reporting_api_integration/reporting_without_security.config.ts
@@ -24,7 +24,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     },
     kbnTestServer: {
       ...apiConfig.get('kbnTestServer'),
-      serverArgs: [...apiConfig.get('kbnTestServer.serverArgs'), `--xpack.security.enabled=false`],
+      serverArgs: [...apiConfig.get('kbnTestServer.serverArgs')],
     },
   };
 }
diff --git a/x-pack/test/reporting_functional/reporting_without_security.config.ts b/x-pack/test/reporting_functional/reporting_without_security.config.ts
index 0269f57bf08cb..7ca7f89a0b709 100644
--- a/x-pack/test/reporting_functional/reporting_without_security.config.ts
+++ b/x-pack/test/reporting_functional/reporting_without_security.config.ts
@@ -17,10 +17,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     testFiles: [resolve(__dirname, './reporting_without_security')],
     kbnTestServer: {
       ...reportingConfig.get('kbnTestServer'),
-      serverArgs: [
-        ...reportingConfig.get('kbnTestServer.serverArgs'),
-        `--xpack.security.enabled=false`,
-      ],
+      serverArgs: [...reportingConfig.get('kbnTestServer.serverArgs')],
     },
     esTestCluster: {
       ...reportingConfig.get('esTestCluster'),
diff --git a/x-pack/test/rule_registry/common/config.ts b/x-pack/test/rule_registry/common/config.ts
index 9cce58c30f6e9..6b920a6f5dbf2 100644
--- a/x-pack/test/rule_registry/common/config.ts
+++ b/x-pack/test/rule_registry/common/config.ts
@@ -79,7 +79,9 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           `--xpack.actions.allowedHosts=${JSON.stringify(['localhost', 'some.non.existent.com'])}`,
           `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
           '--xpack.eventLog.logEntries=true',
-          ...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),
+          ...disabledPlugins
+            .filter((k) => k !== 'security')
+            .map((key) => `--xpack.${key}.enabled=false`),
           // TO DO: Remove feature flags once we're good to go
           '--xpack.securitySolution.enableExperimental=["ruleRegistryEnabled"]',
           '--xpack.ruleRegistry.write.enabled=true',
diff --git a/x-pack/test/saved_object_api_integration/common/config.ts b/x-pack/test/saved_object_api_integration/common/config.ts
index 9b9e46efa6d5d..8ca74c7fcea49 100644
--- a/x-pack/test/saved_object_api_integration/common/config.ts
+++ b/x-pack/test/saved_object_api_integration/common/config.ts
@@ -54,7 +54,9 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           ...config.xpack.api.get('kbnTestServer.serverArgs'),
           '--server.xsrf.disableProtection=true',
           `--plugin-path=${path.join(__dirname, 'fixtures', 'saved_object_test_plugin')}`,
-          ...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),
+          ...disabledPlugins
+            .filter((k) => k !== 'security')
+            .map((key) => `--xpack.${key}.enabled=false`),
         ],
       },
     };
diff --git a/x-pack/test/spaces_api_integration/common/config.ts b/x-pack/test/spaces_api_integration/common/config.ts
index 7cceb945790d5..5d135cd05605c 100644
--- a/x-pack/test/spaces_api_integration/common/config.ts
+++ b/x-pack/test/spaces_api_integration/common/config.ts
@@ -61,7 +61,9 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           '--status.allowAnonymous=false',
           '--server.xsrf.disableProtection=true',
           `--plugin-path=${path.join(__dirname, 'fixtures', 'spaces_test_plugin')}`,
-          ...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),
+          ...disabledPlugins
+            .filter((k) => k !== 'security')
+            .map((key) => `--xpack.${key}.enabled=false`),
         ],
       },
     };
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
index 3b2a87d924e88..c1525409cfa3f 100644
--- a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
+++ b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
@@ -153,7 +153,7 @@
       "references": [
         {
           "type": "index-pattern",
-          "id": "cts_ip_1",
+          "id": "cts_ip_1_default",
           "name": "CTS IP 1"
         }
       ],
@@ -182,7 +182,7 @@
       "references": [
         {
           "type": "index-pattern",
-          "id": "cts_ip_1",
+          "id": "cts_ip_1_default",
           "name": "CTS IP 1"
         }
       ],
@@ -212,7 +212,7 @@
       "references": [
         {
           "type": "index-pattern",
-          "id": "cts_ip_1",
+          "id": "cts_ip_1_default",
           "name": "CTS IP 1"
         }
       ],
@@ -276,7 +276,7 @@
       "references": [
         {
           "type": "index-pattern",
-          "id": "cts_ip_1",
+          "id": "cts_ip_1_space_1",
           "name": "CTS IP 1"
         }
       ],
@@ -305,7 +305,7 @@
       "references": [
         {
           "type": "index-pattern",
-          "id": "cts_ip_1",
+          "id": "cts_ip_1_space_1",
           "name": "CTS IP 1"
         }
       ],
@@ -335,7 +335,7 @@
       "references": [
         {
           "type": "index-pattern",
-          "id": "cts_ip_1",
+          "id": "cts_ip_1_space_1",
           "name": "CTS IP 1"
         }
       ],
@@ -350,15 +350,17 @@
 {
   "type": "_doc",
   "value": {
-    "id": "index-pattern:cts_ip_1",
+    "id": "index-pattern:cts_ip_1_default",
     "index": ".kibana",
     "source": {
+      "originId": "cts_ip_1",
       "index-pattern": {
         "title": "Copy to Space index pattern 1 from default space"
       },
       "references": [],
       "type": "index-pattern",
-      "updated_at": "2017-09-21T18:49:16.270Z"
+      "updated_at": "2017-09-21T18:49:16.270Z",
+      "namespaces": ["default"]
     },
     "type": "_doc"
   }
@@ -367,16 +369,17 @@
 {
   "type": "_doc",
   "value": {
-    "id": "space_1:index-pattern:cts_ip_1",
+    "id": "index-pattern:cts_ip_1_space_1",
     "index": ".kibana",
     "source": {
+      "originId": "cts_ip_1",
       "index-pattern": {
         "title": "Copy to Space index pattern 1 from space_1 space"
       },
       "references": [],
       "type": "index-pattern",
       "updated_at": "2017-09-21T18:49:16.270Z",
-      "namespace": "space_1"
+      "namespaces": ["space_1"]
     },
     "type": "_doc"
   }
diff --git a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
index 3a3f0f889c91c..23136838f3002 100644
--- a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
@@ -183,6 +183,8 @@ export function copyToSpaceTestSuiteFactory(
       const destination = getDestinationWithoutConflicts();
       const result = resp.body as CopyResponse;
 
+      const indexPatternDestinationId = result[destination].successResults![0].destinationId;
+      expect(indexPatternDestinationId).to.match(UUID_PATTERN); // this was copied to space 2 and hit an unresolvable conflict, so the object ID was regenerated silently / the destinationId is a UUID
       const vis1DestinationId = result[destination].successResults![1].destinationId;
       expect(vis1DestinationId).to.match(UUID_PATTERN); // this was copied to space 2 and hit an unresolvable conflict, so the object ID was regenerated silently / the destinationId is a UUID
       const vis2DestinationId = result[destination].successResults![2].destinationId;
@@ -196,12 +198,13 @@ export function copyToSpaceTestSuiteFactory(
           successCount: 5,
           successResults: [
             {
-              id: 'cts_ip_1',
+              id: `cts_ip_1_${spaceId}`,
               type: 'index-pattern',
               meta: {
                 icon: 'indexPatternApp',
                 title: `Copy to Space index pattern 1 from ${spaceId} space`,
               },
+              destinationId: indexPatternDestinationId,
             },
             {
               id: `cts_vis_1_${spaceId}`,
@@ -321,13 +324,14 @@ export function copyToSpaceTestSuiteFactory(
           successCount: 5,
           successResults: [
             {
-              id: 'cts_ip_1',
+              id: `cts_ip_1_${spaceId}`,
               type: 'index-pattern',
               meta: {
                 icon: 'indexPatternApp',
                 title: `Copy to Space index pattern 1 from ${spaceId} space`,
               },
               overwrite: true,
+              destinationId: `cts_ip_1_${destination}`, // this conflicted with another index pattern in the destination space because of a shared originId
             },
             {
               id: `cts_vis_1_${spaceId}`,
@@ -409,8 +413,11 @@ export function copyToSpaceTestSuiteFactory(
           },
         },
         {
-          error: { type: 'conflict' },
-          id: 'cts_ip_1',
+          error: {
+            type: 'conflict',
+            destinationId: `cts_ip_1_${destination}`, // this conflicted with another index pattern in the destination space because of a shared originId
+          },
+          id: `cts_ip_1_${spaceId}`,
           title: `Copy to Space index pattern 1 from ${spaceId} space`,
           type: 'index-pattern',
           meta: {
diff --git a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
index b190a37965b0b..72130743b69d9 100644
--- a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
@@ -82,8 +82,18 @@ export function resolveCopyToSpaceConflictsSuite(
       expect(result).to.eql({
         [destination]: {
           success: true,
-          successCount: 1,
+          successCount: 2,
           successResults: [
+            {
+              id: `cts_ip_1_${sourceSpaceId}`,
+              type: 'index-pattern',
+              meta: {
+                title: `Copy to Space index pattern 1 from ${sourceSpaceId} space`,
+                icon: 'indexPatternApp',
+              },
+              destinationId: `cts_ip_1_${destination}`, // this conflicted with another index pattern in the destination space because of a shared originId
+              overwrite: true,
+            },
             {
               id: `cts_vis_3_${sourceSpaceId}`,
               type: 'visualization',
@@ -146,6 +156,19 @@ export function resolveCopyToSpaceConflictsSuite(
           success: false,
           successCount: 0,
           errors: [
+            {
+              error: {
+                type: 'conflict',
+                destinationId: `cts_ip_1_${destination}`, // this conflicted with another index pattern in the destination space because of a shared originId
+              },
+              id: `cts_ip_1_${sourceSpaceId}`,
+              title: `Copy to Space index pattern 1 from ${sourceSpaceId} space`,
+              meta: {
+                title: `Copy to Space index pattern 1 from ${sourceSpaceId} space`,
+                icon: 'indexPatternApp',
+              },
+              type: 'index-pattern',
+            },
             {
               error: {
                 type: 'conflict',
@@ -231,35 +254,7 @@ export function resolveCopyToSpaceConflictsSuite(
             {
               statusCode: 403,
               error: 'Forbidden',
-              message: 'Unable to bulk_get index-pattern',
-            },
-          ],
-        },
-      } as CopyResponse);
-
-      // Query ES to ensure that nothing was copied
-      const [dashboard, visualization] = await getObjectsAtSpace(destination);
-      expect(dashboard.attributes.title).to.eql(
-        `This is the ${destination} test space CTS dashboard`
-      );
-      expect(visualization.attributes.title).to.eql(`CTS vis 3 from ${destination} space`);
-    };
-
-  const createExpectReadonlyAtSpaceWithReferencesResult =
-    (spaceId: string = DEFAULT_SPACE_ID) =>
-    async (resp: TestResponse) => {
-      const destination = getDestinationSpace(spaceId);
-
-      const result = resp.body as CopyResponse;
-      expect(result).to.eql({
-        [destination]: {
-          success: false,
-          successCount: 0,
-          errors: [
-            {
-              statusCode: 403,
-              error: 'Forbidden',
-              message: 'Unable to bulk_create visualization',
+              message: 'Unable to bulk_create index-pattern,visualization',
             },
           ],
         },
@@ -449,6 +444,7 @@ export function resolveCopyToSpaceConflictsSuite(
 
           const dashboardObject = { type: 'dashboard', id: 'cts_dashboard' };
           const visualizationObject = { type: 'visualization', id: `cts_vis_3_${spaceId}` };
+          const indexPatternObject = { type: 'index-pattern', id: `cts_ip_1_${spaceId}` };
 
           it(`should return ${tests.withReferencesNotOverwriting.statusCode} when not overwriting, with references`, async () => {
             const destination = getDestinationSpace(spaceId);
@@ -462,6 +458,11 @@ export function resolveCopyToSpaceConflictsSuite(
                 createNewCopies: false,
                 retries: {
                   [destination]: [
+                    {
+                      ...indexPatternObject,
+                      destinationId: `cts_ip_1_${destination}`,
+                      overwrite: false,
+                    },
                     {
                       ...visualizationObject,
                       destinationId: `cts_vis_3_${destination}`,
@@ -486,6 +487,11 @@ export function resolveCopyToSpaceConflictsSuite(
                 createNewCopies: false,
                 retries: {
                   [destination]: [
+                    {
+                      ...indexPatternObject,
+                      destinationId: `cts_ip_1_${destination}`,
+                      overwrite: true,
+                    },
                     {
                       ...visualizationObject,
                       destinationId: `cts_vis_3_${destination}`,
@@ -589,7 +595,6 @@ export function resolveCopyToSpaceConflictsSuite(
     createExpectNonOverriddenResponseWithReferences,
     createExpectNonOverriddenResponseWithoutReferences,
     createExpectUnauthorizedAtSpaceWithReferencesResult,
-    createExpectReadonlyAtSpaceWithReferencesResult,
     createExpectUnauthorizedAtSpaceWithoutReferencesResult,
     createMultiNamespaceTestCases,
     originSpaces: ['default', 'space_1'],
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/resolve_copy_to_space_conflicts.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/resolve_copy_to_space_conflicts.ts
index efc7827cf8b9a..1b39cd5d77302 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/resolve_copy_to_space_conflicts.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/resolve_copy_to_space_conflicts.ts
@@ -24,7 +24,6 @@ export default function resolveCopyToSpaceConflictsTestSuite({ getService }: Ftr
     createExpectOverriddenResponseWithoutReferences,
     expectRouteForbiddenResponse,
     createExpectUnauthorizedAtSpaceWithReferencesResult,
-    createExpectReadonlyAtSpaceWithReferencesResult,
     createExpectUnauthorizedAtSpaceWithoutReferencesResult,
     createMultiNamespaceTestCases,
     NON_EXISTENT_SPACE_ID,
@@ -122,11 +121,11 @@ export default function resolveCopyToSpaceConflictsTestSuite({ getService }: Ftr
         tests: {
           withReferencesNotOverwriting: {
             statusCode: 200,
-            response: createExpectReadonlyAtSpaceWithReferencesResult(spaceId),
+            response: createExpectUnauthorizedAtSpaceWithReferencesResult(spaceId),
           },
           withReferencesOverwriting: {
             statusCode: 200,
-            response: createExpectReadonlyAtSpaceWithReferencesResult(spaceId),
+            response: createExpectUnauthorizedAtSpaceWithReferencesResult(spaceId),
           },
           withoutReferencesOverwriting: {
             statusCode: 200,
diff --git a/x-pack/test/timeline/common/config.ts b/x-pack/test/timeline/common/config.ts
index fa8ddb2ad10a7..211f380b133a5 100644
--- a/x-pack/test/timeline/common/config.ts
+++ b/x-pack/test/timeline/common/config.ts
@@ -79,7 +79,9 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           `--xpack.actions.allowedHosts=${JSON.stringify(['localhost', 'some.non.existent.com'])}`,
           `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
           '--xpack.eventLog.logEntries=true',
-          ...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),
+          ...disabledPlugins
+            .filter((k) => k !== 'security')
+            .map((key) => `--xpack.${key}.enabled=false`),
           // TO DO: Remove feature flags once we're good to go
           '--xpack.securitySolution.enableExperimental=["ruleRegistryEnabled"]',
           '--xpack.ruleRegistry.write.enabled=true',
diff --git a/x-pack/test/ui_capabilities/common/config.ts b/x-pack/test/ui_capabilities/common/config.ts
index 1f695e562da05..f676a5eeccee1 100644
--- a/x-pack/test/ui_capabilities/common/config.ts
+++ b/x-pack/test/ui_capabilities/common/config.ts
@@ -42,7 +42,9 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         ...xPackFunctionalTestsConfig.get('kbnTestServer'),
         serverArgs: [
           ...xPackFunctionalTestsConfig.get('kbnTestServer.serverArgs'),
-          ...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),
+          ...disabledPlugins
+            .filter((k) => k !== 'security')
+            .map((key) => `--xpack.${key}.enabled=false`),
           `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'foo_plugin')}`,
         ],
       },
diff --git a/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts b/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts
index b50f11553747c..e694b5be6e024 100644
--- a/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts
+++ b/x-pack/test/ui_capabilities/spaces_only/tests/catalogue.ts
@@ -24,6 +24,13 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
     'watcher',
   ];
 
+  const uiCapabilitiesExceptions = [
+    // enterprise_search plugin is loaded but disabled because security isn't enabled in ES. That means the following 3 capabilities are disabled
+    'enterpriseSearch',
+    'appSearch',
+    'workplaceSearch',
+  ];
+
   describe('catalogue', () => {
     SpaceScenarios.forEach((scenario) => {
       it(`${scenario.name}`, async () => {
@@ -33,7 +40,10 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
             expect(uiCapabilities.success).to.be(true);
             expect(uiCapabilities.value).to.have.property('catalogue');
             // everything is enabled
-            const expected = mapValues(uiCapabilities.value!.catalogue, () => true);
+            const expected = mapValues(
+              uiCapabilities.value!.catalogue,
+              (enabled, catalogueId) => !uiCapabilitiesExceptions.includes(catalogueId)
+            );
             expect(uiCapabilities.value!.catalogue).to.eql(expected);
             break;
           }
@@ -55,7 +65,8 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
             // only foo is disabled
             const expected = mapValues(
               uiCapabilities.value!.catalogue,
-              (value, catalogueId) => catalogueId !== 'foo'
+              (enabled, catalogueId) =>
+                !uiCapabilitiesExceptions.includes(catalogueId) && catalogueId !== 'foo'
             );
             expect(uiCapabilities.value!.catalogue).to.eql(expected);
             break;
diff --git a/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts b/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts
index 17c01888a7024..4ef919ebb46aa 100644
--- a/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts
+++ b/x-pack/test/ui_capabilities/spaces_only/tests/nav_links.ts
@@ -16,6 +16,13 @@ export default function navLinksTests({ getService }: FtrProviderContext) {
   const uiCapabilitiesService: UICapabilitiesService = getService('uiCapabilities');
   const featuresService: FeaturesService = getService('features');
 
+  const uiCapabilitiesExceptions = [
+    // enterprise_search plugin is loaded but disabled because security isn't enabled in ES. That means the following 3 capabilities are disabled
+    'enterpriseSearch',
+    'appSearch',
+    'workplaceSearch',
+  ];
+
   describe('navLinks', () => {
     let navLinksBuilder: NavLinksBuilder;
     before(async () => {
@@ -30,7 +37,9 @@ export default function navLinksTests({ getService }: FtrProviderContext) {
           case 'everything_space':
             expect(uiCapabilities.success).to.be(true);
             expect(uiCapabilities.value).to.have.property('navLinks');
-            expect(uiCapabilities.value!.navLinks).to.eql(navLinksBuilder.all());
+            expect(uiCapabilities.value!.navLinks).to.eql(
+              navLinksBuilder.except(...uiCapabilitiesExceptions)
+            );
             break;
           case 'nothing_space':
             expect(uiCapabilities.success).to.be(true);
@@ -40,7 +49,9 @@ export default function navLinksTests({ getService }: FtrProviderContext) {
           case 'foo_disabled_space':
             expect(uiCapabilities.success).to.be(true);
             expect(uiCapabilities.value).to.have.property('navLinks');
-            expect(uiCapabilities.value!.navLinks).to.eql(navLinksBuilder.except('foo'));
+            expect(uiCapabilities.value!.navLinks).to.eql(
+              navLinksBuilder.except('foo', ...uiCapabilitiesExceptions)
+            );
             break;
           default:
             throw new UnreachableError(scenario);
diff --git a/yarn.lock b/yarn.lock
index 669f8321fb4fc..a36d8e9373685 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2412,10 +2412,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@39.1.1":
-  version "39.1.1"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-39.1.1.tgz#52e59f1dd6448b2e80047259ca60c6c87e9873f0"
-  integrity sha512-zYCNitpp6Ds7U6eaa9QkJqc20ZMo2wjpZokNtd1WalFV22vdfiVizFg7DMtDjJrCDLmoXcLOOCMasKlmmJ1cRg==
+"@elastic/eui@40.0.0":
+  version "40.0.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-40.0.0.tgz#9556a87fa5eb7d9061e85f71ea9d3e6a9022dc3e"
+  integrity sha512-Zsz8eczEjthMgU00YhnsNmkKA8j4hxQpWNnrgecMgpcFEIj+Nn5WBofL/TJux/latS/mB4WWmrq4FTiSIyv/+Q==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"