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 4e44df9d4e183..676f7420c8bb9 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
@@ -261,5 +261,8 @@ readonly links: {
             readonly rubyOverview: string;
             readonly rustGuide: string;
         };
+        readonly endpoints: {
+            readonly troubleshooting: 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 5871a84c5402e..788f0b9de8218 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>            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>            beatsAgentComparison: 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> |  |
+|  [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>            beatsAgentComparison: 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>        readonly endpoints: {</code><br/><code>            readonly troubleshooting: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
 
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index 5dc214407e206..c54922ecd67df 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -507,6 +507,9 @@ export class DocLinksService {
           rubyOverview: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/client/ruby-api/${DOC_LINK_VERSION}/ruby_client.html`,
           rustGuide: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/client/rust-api/${DOC_LINK_VERSION}/index.html`,
         },
+        endpoints: {
+          troubleshooting: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/ts-management.html#ts-endpoints`,
+        },
       },
     });
   }
@@ -770,5 +773,8 @@ export interface DocLinksStart {
       readonly rubyOverview: string;
       readonly rustGuide: string;
     };
+    readonly endpoints: {
+      readonly troubleshooting: string;
+    };
   };
 }
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 1afa9e05e4140..83aea9774bb56 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -729,6 +729,9 @@ export interface DocLinksStart {
             readonly rubyOverview: string;
             readonly rustGuide: string;
         };
+        readonly endpoints: {
+            readonly troubleshooting: string;
+        };
     };
 }
 
diff --git a/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx b/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx
index 8a46a16c1bf0c..effbf8ce980d7 100644
--- a/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx
@@ -231,7 +231,7 @@ export const EditorMenu = ({ dashboardContainer, createNewVisType }: Props) => {
     <SolutionToolbarPopover
       ownFocus
       label={i18n.translate('dashboard.solutionToolbar.editorMenuButtonLabel', {
-        defaultMessage: 'All types',
+        defaultMessage: 'Select type',
       })}
       iconType="arrowDown"
       iconSide="right"
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
index ce77b4852cd2e..356aaf60b423c 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
@@ -444,6 +444,10 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
     type: 'boolean',
     _meta: { description: 'Non-default value of setting.' },
   },
+  'labs:canvas:byValueEmbeddable': {
+    type: 'boolean',
+    _meta: { description: 'Non-default value of setting.' },
+  },
   'labs:canvas:useDataService': {
     type: 'boolean',
     _meta: { description: 'Non-default value of setting.' },
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
index 793ec4302d600..69287d37dfa28 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
@@ -122,6 +122,7 @@ export interface UsageStats {
   'banners:textColor': string;
   'banners:backgroundColor': string;
   'labs:canvas:enable_ui': boolean;
+  'labs:canvas:byValueEmbeddable': boolean;
   'labs:canvas:useDataService': boolean;
   'labs:presentation:timeToPresent': boolean;
   'labs:dashboard:enable_ui': boolean;
diff --git a/src/plugins/presentation_util/common/labs.ts b/src/plugins/presentation_util/common/labs.ts
index cb976e73b5edf..8eefbd6981280 100644
--- a/src/plugins/presentation_util/common/labs.ts
+++ b/src/plugins/presentation_util/common/labs.ts
@@ -11,7 +11,9 @@ import { i18n } from '@kbn/i18n';
 export const LABS_PROJECT_PREFIX = 'labs:';
 export const DEFER_BELOW_FOLD = `${LABS_PROJECT_PREFIX}dashboard:deferBelowFold` as const;
 export const DASHBOARD_CONTROLS = `${LABS_PROJECT_PREFIX}dashboard:dashboardControls` as const;
-export const projectIDs = [DEFER_BELOW_FOLD, DASHBOARD_CONTROLS] as const;
+export const BY_VALUE_EMBEDDABLE = `${LABS_PROJECT_PREFIX}canvas:byValueEmbeddable` as const;
+
+export const projectIDs = [DEFER_BELOW_FOLD, DASHBOARD_CONTROLS, BY_VALUE_EMBEDDABLE] as const;
 export const environmentNames = ['kibana', 'browser', 'session'] as const;
 export const solutionNames = ['canvas', 'dashboard', 'presentation'] as const;
 
@@ -48,6 +50,19 @@ export const projects: { [ID in ProjectID]: ProjectConfig & { id: ID } } = {
     }),
     solutions: ['dashboard'],
   },
+  [BY_VALUE_EMBEDDABLE]: {
+    id: BY_VALUE_EMBEDDABLE,
+    isActive: true,
+    isDisplayed: true,
+    environments: ['kibana', 'browser', 'session'],
+    name: i18n.translate('presentationUtil.labs.enableByValueEmbeddableName', {
+      defaultMessage: 'By-Value Embeddables',
+    }),
+    description: i18n.translate('presentationUtil.labs.enableByValueEmbeddableDescription', {
+      defaultMessage: 'Enables support for by-value embeddables in Canvas',
+    }),
+    solutions: ['canvas'],
+  },
 };
 
 export type ProjectID = typeof projectIDs[number];
diff --git a/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss b/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss
index 434f06b69a684..9f70ae353405b 100644
--- a/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss
+++ b/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss
@@ -1,9 +1,25 @@
 .quickButtonGroup {
-  .quickButtonGroup__button {
-    background-color: $euiColorEmptyShade;
-    // sass-lint:disable-block no-important
-    border-width: $euiBorderWidthThin !important;
-    border-style: solid !important;
-    border-color: $euiBorderColor !important;
+  .euiButtonGroup__buttons {
+    border-radius: $euiBorderRadius;
+
+    .quickButtonGroup__button {
+      background-color: $euiColorEmptyShade;
+      // sass-lint:disable-block no-important
+      border-width: $euiBorderWidthThin !important;
+      border-style: solid !important;
+      border-color: $euiBorderColor !important;
+    }
+
+    .quickButtonGroup__button:first-of-type {
+      // sass-lint:disable-block no-important
+      border-top-left-radius: $euiBorderRadius !important;
+      border-bottom-left-radius: $euiBorderRadius !important;
+    }
+
+    .quickButtonGroup__button:last-of-type {
+      // sass-lint:disable-block no-important
+      border-top-right-radius: $euiBorderRadius !important;
+      border-bottom-right-radius: $euiBorderRadius !important;
+    }
   }
 }
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
index 668bf23403124..21273482dd2b8 100644
--- a/src/plugins/telemetry/schema/oss_plugins.json
+++ b/src/plugins/telemetry/schema/oss_plugins.json
@@ -7683,6 +7683,12 @@
             "description": "Non-default value of setting."
           }
         },
+        "labs:canvas:byValueEmbeddable": {
+          "type": "boolean",
+          "_meta": {
+            "description": "Non-default value of setting."
+          }
+        },
         "labs:canvas:useDataService": {
           "type": "boolean",
           "_meta": {
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index fa7aee4e3c54c..f9328e89cd19e 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -48,7 +48,7 @@ export class DiscoverPageObject extends FtrService {
     await fieldSearch.clearValue();
   }
 
-  public async saveSearch(searchName: string) {
+  public async saveSearch(searchName: string, saveAsNew?: boolean) {
     await this.clickSaveSearchButton();
     // preventing an occasional flakiness when the saved object wasn't set and the form can't be submitted
     await this.retry.waitFor(
@@ -59,6 +59,14 @@ export class DiscoverPageObject extends FtrService {
         return (await saveButton.getAttribute('disabled')) !== 'true';
       }
     );
+
+    if (saveAsNew !== undefined) {
+      await this.retry.waitFor(`save as new switch is set`, async () => {
+        await this.testSubjects.setEuiSwitch('saveAsNewCheckbox', saveAsNew ? 'check' : 'uncheck');
+        return (await this.testSubjects.isEuiSwitchChecked('saveAsNewCheckbox')) === saveAsNew;
+      });
+    }
+
     await this.testSubjects.click('confirmSaveSavedObjectButton');
     await this.header.waitUntilLoadingHasFinished();
     // LeeDr - this additional checking for the saved search name was an attempt
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx
index 058c7d97b43cc..7472eb780f119 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx
@@ -30,7 +30,6 @@ import {
 const INITIAL_STATE = {
   currentPeriod: [],
   previousPeriod: [],
-  throughputUnit: 'minute' as const,
 };
 
 export function ServiceOverviewThroughputChart({
diff --git a/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts b/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts
index 1fbdd1c680c58..5a7e06683f25a 100644
--- a/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts
+++ b/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts
@@ -15,7 +15,6 @@ import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../helpers/setup_request';
 import { getOffsetInMs } from '../../../common/utils/get_offset_in_ms';
 import { getBucketSize } from '../helpers/get_bucket_size';
-import { calculateThroughputWithInterval } from '../helpers/calculate_throughput';
 
 export async function getThroughputChartsForBackend({
   backendName,
@@ -42,7 +41,7 @@ export async function getThroughputChartsForBackend({
     offset,
   });
 
-  const { intervalString, bucketSize } = getBucketSize({
+  const { intervalString } = getBucketSize({
     start: startWithOffset,
     end: endWithOffset,
     minBucketSize: 60,
@@ -73,9 +72,10 @@ export async function getThroughputChartsForBackend({
             extended_bounds: { min: startWithOffset, max: endWithOffset },
           },
           aggs: {
-            spanDestinationLatencySum: {
-              sum: {
+            throughput: {
+              rate: {
                 field: SPAN_DESTINATION_SERVICE_RESPONSE_TIME_COUNT,
+                unit: 'minute',
               },
             },
           },
@@ -88,10 +88,7 @@ export async function getThroughputChartsForBackend({
     response.aggregations?.timeseries.buckets.map((bucket) => {
       return {
         x: bucket.key + offsetInMs,
-        y: calculateThroughputWithInterval({
-          bucketSize,
-          value: bucket.spanDestinationLatencySum.value || 0,
-        }),
+        y: bucket.throughput.value,
       };
     }) ?? []
   );
diff --git a/x-pack/plugins/apm/server/lib/observability_overview/get_transactions_per_minute.ts b/x-pack/plugins/apm/server/lib/observability_overview/get_transactions_per_minute.ts
index 829afa8330164..de4d6dec4e1fe 100644
--- a/x-pack/plugins/apm/server/lib/observability_overview/get_transactions_per_minute.ts
+++ b/x-pack/plugins/apm/server/lib/observability_overview/get_transactions_per_minute.ts
@@ -16,10 +16,7 @@ import {
   getDocumentTypeFilterForTransactions,
   getProcessorEventForTransactions,
 } from '../helpers/transactions';
-import {
-  calculateThroughputWithInterval,
-  calculateThroughputWithRange,
-} from '../helpers/calculate_throughput';
+import { calculateThroughputWithRange } from '../helpers/calculate_throughput';
 
 export async function getTransactionsPerMinute({
   setup,
@@ -70,6 +67,9 @@ export async function getTransactionsPerMinute({
                   fixed_interval: intervalString,
                   min_doc_count: 0,
                 },
+                aggs: {
+                  throughput: { rate: { unit: 'minute' as const } },
+                },
               },
             },
           },
@@ -98,10 +98,7 @@ export async function getTransactionsPerMinute({
     timeseries:
       topTransactionTypeBucket?.timeseries.buckets.map((bucket) => ({
         x: bucket.key,
-        y: calculateThroughputWithInterval({
-          bucketSize,
-          value: bucket.doc_count,
-        }),
+        y: bucket.throughput.value,
       })) || [],
   };
 }
diff --git a/x-pack/plugins/apm/server/lib/services/get_throughput.ts b/x-pack/plugins/apm/server/lib/services/get_throughput.ts
index e31e9dd3b8c9f..8225bff289008 100644
--- a/x-pack/plugins/apm/server/lib/services/get_throughput.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_throughput.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { AggregationsDateInterval } from '@elastic/elasticsearch/lib/api/types';
 import { ESFilter } from '../../../../../../src/core/types/elasticsearch';
 import {
   SERVICE_NAME,
@@ -18,7 +19,6 @@ import {
   getProcessorEventForTransactions,
 } from '../helpers/transactions';
 import { Setup } from '../helpers/setup_request';
-import { calculateThroughputWithInterval } from '../helpers/calculate_throughput';
 
 interface Options {
   environment: string;
@@ -81,6 +81,11 @@ export async function getThroughput({
             min_doc_count: 0,
             extended_bounds: { min: start, max: end },
           },
+          aggs: {
+            throughput: {
+              rate: { unit: 'minute' as AggregationsDateInterval },
+            },
+          },
         },
       },
     },
@@ -95,10 +100,7 @@ export async function getThroughput({
     response.aggregations?.timeseries.buckets.map((bucket) => {
       return {
         x: bucket.key,
-        y: calculateThroughputWithInterval({
-          bucketSize,
-          value: bucket.doc_count,
-        }),
+        y: bucket.throughput.value,
       };
     }) ?? []
   );
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
index 66cb95a4a210a..1f447c7ed834e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
@@ -6,7 +6,7 @@
  */
 
 import { ExpressionTypeDefinition } from '../../../../../src/plugins/expressions';
-import { EmbeddableInput } from '../../../../../src/plugins/embeddable/common/';
+import { EmbeddableInput } from '../../types';
 import { EmbeddableTypes } from './embeddable_types';
 
 export const EmbeddableExpressionType = 'embeddable';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts
index 2cfdebafb70df..d6d7a0f867849 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts
@@ -6,7 +6,6 @@
  */
 
 import { functions as commonFunctions } from '../common';
-import { functions as externalFunctions } from '../external';
 import { location } from './location';
 import { markdown } from './markdown';
 import { urlparam } from './urlparam';
@@ -14,13 +13,4 @@ import { escount } from './escount';
 import { esdocs } from './esdocs';
 import { essql } from './essql';
 
-export const functions = [
-  location,
-  markdown,
-  urlparam,
-  escount,
-  esdocs,
-  essql,
-  ...commonFunctions,
-  ...externalFunctions,
-];
+export const functions = [location, markdown, urlparam, escount, esdocs, essql, ...commonFunctions];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.test.ts
new file mode 100644
index 0000000000000..001fb0e3f62e3
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.test.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { embeddableFunctionFactory } from './embeddable';
+import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
+import { ExpressionValueFilter } from '../../../types';
+import { encode } from '../../../common/lib/embeddable_dataurl';
+import { InitializeArguments } from '.';
+
+const filterContext: ExpressionValueFilter = {
+  type: 'filter',
+  and: [
+    {
+      type: 'filter',
+      and: [],
+      value: 'filter-value',
+      column: 'filter-column',
+      filterType: 'exactly',
+    },
+    {
+      type: 'filter',
+      and: [],
+      column: 'time-column',
+      filterType: 'time',
+      from: '2019-06-04T04:00:00.000Z',
+      to: '2019-06-05T04:00:00.000Z',
+    },
+  ],
+};
+
+describe('embeddable', () => {
+  const fn = embeddableFunctionFactory({} as InitializeArguments)().fn;
+  const config = {
+    id: 'some-id',
+    timerange: { from: '15m', to: 'now' },
+    title: 'test embeddable',
+  };
+
+  const args = {
+    config: encode(config),
+    type: 'visualization',
+  };
+
+  it('accepts null context', () => {
+    const expression = fn(null, args, {} as any);
+
+    expect(expression.input.filters).toEqual([]);
+  });
+
+  it('accepts filter context', () => {
+    const expression = fn(filterContext, args, {} as any);
+    const embeddableFilters = getQueryFilters(filterContext.and);
+
+    expect(expression.input.filters).toEqual(embeddableFilters);
+  });
+});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
new file mode 100644
index 0000000000000..7ef8f0a09eb90
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
@@ -0,0 +1,145 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
+import { ExpressionValueFilter, EmbeddableInput } from '../../../types';
+import { EmbeddableExpressionType, EmbeddableExpression } from '../../expression_types';
+import { getFunctionHelp } from '../../../i18n';
+import { SavedObjectReference } from '../../../../../../src/core/types';
+import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
+import { decode, encode } from '../../../common/lib/embeddable_dataurl';
+import { InitializeArguments } from '.';
+
+export interface Arguments {
+  config: string;
+  type: string;
+}
+
+const defaultTimeRange = {
+  from: 'now-15m',
+  to: 'now',
+};
+
+const baseEmbeddableInput = {
+  timeRange: defaultTimeRange,
+  disableTriggers: true,
+  renderMode: 'noInteractivity',
+};
+
+type Return = EmbeddableExpression<EmbeddableInput>;
+
+type EmbeddableFunction = ExpressionFunctionDefinition<
+  'embeddable',
+  ExpressionValueFilter | null,
+  Arguments,
+  Return
+>;
+
+export function embeddableFunctionFactory({
+  embeddablePersistableStateService,
+}: InitializeArguments): () => EmbeddableFunction {
+  return function embeddable(): EmbeddableFunction {
+    const { help, args: argHelp } = getFunctionHelp().embeddable;
+
+    return {
+      name: 'embeddable',
+      help,
+      args: {
+        config: {
+          aliases: ['_'],
+          types: ['string'],
+          required: true,
+          help: argHelp.config,
+        },
+        type: {
+          types: ['string'],
+          required: true,
+          help: argHelp.type,
+        },
+      },
+      context: {
+        types: ['filter'],
+      },
+      type: EmbeddableExpressionType,
+      fn: (input, args) => {
+        const filters = input ? input.and : [];
+
+        const embeddableInput = decode(args.config) as EmbeddableInput;
+
+        return {
+          type: EmbeddableExpressionType,
+          input: {
+            ...baseEmbeddableInput,
+            ...embeddableInput,
+            filters: getQueryFilters(filters),
+          },
+          generatedAt: Date.now(),
+          embeddableType: args.type,
+        };
+      },
+
+      extract(state) {
+        const input = decode(state.config[0] as string);
+
+        // extracts references for by-reference embeddables
+        if (input.savedObjectId) {
+          const refName = 'embeddable.savedObjectId';
+
+          const references: SavedObjectReference[] = [
+            {
+              name: refName,
+              type: state.type[0] as string,
+              id: input.savedObjectId as string,
+            },
+          ];
+
+          return {
+            state,
+            references,
+          };
+        }
+
+        // extracts references for by-value embeddables
+        const { state: extractedState, references: extractedReferences } =
+          embeddablePersistableStateService.extract({
+            ...input,
+            type: state.type[0],
+          });
+
+        const { type, ...extractedInput } = extractedState;
+
+        return {
+          state: { ...state, config: [encode(extractedInput)], type: [type] },
+          references: extractedReferences,
+        };
+      },
+
+      inject(state, references) {
+        const input = decode(state.config[0] as string);
+        const savedObjectReference = references.find(
+          (ref) => ref.name === 'embeddable.savedObjectId'
+        );
+
+        // injects saved object id for by-references embeddable
+        if (savedObjectReference) {
+          input.savedObjectId = savedObjectReference.id;
+          state.config[0] = encode(input);
+          state.type[0] = savedObjectReference.type;
+        } else {
+          // injects references for by-value embeddables
+          const { type, ...injectedInput } = embeddablePersistableStateService.inject(
+            { ...input, type: state.type[0] },
+            references
+          );
+          state.config[0] = encode(injectedInput);
+          state.type[0] = type;
+        }
+        return state;
+      },
+    };
+  };
+}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
index 407a0e2ebfe05..1d69e181b5fd9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
@@ -5,9 +5,26 @@
  * 2.0.
  */
 
+import { EmbeddableStart } from 'src/plugins/embeddable/public';
+import { embeddableFunctionFactory } from './embeddable';
 import { savedLens } from './saved_lens';
 import { savedMap } from './saved_map';
 import { savedSearch } from './saved_search';
 import { savedVisualization } from './saved_visualization';
 
-export const functions = [savedLens, savedMap, savedVisualization, savedSearch];
+export interface InitializeArguments {
+  embeddablePersistableStateService: {
+    extract: EmbeddableStart['extract'];
+    inject: EmbeddableStart['inject'];
+  };
+}
+
+export function initFunctions(initialize: InitializeArguments) {
+  return [
+    embeddableFunctionFactory(initialize),
+    savedLens,
+    savedMap,
+    savedSearch,
+    savedVisualization,
+  ];
+}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
index 082a69a874cae..67947691f7757 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
@@ -9,9 +9,8 @@ import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
 import { PaletteOutput } from 'src/plugins/charts/common';
 import { Filter as DataFilter } from '@kbn/es-query';
 import { TimeRange } from 'src/plugins/data/common';
-import { EmbeddableInput } from 'src/plugins/embeddable/common';
 import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
-import { ExpressionValueFilter, TimeRange as TimeRangeArg } from '../../../types';
+import { ExpressionValueFilter, EmbeddableInput, TimeRange as TimeRangeArg } from '../../../types';
 import {
   EmbeddableTypes,
   EmbeddableExpressionType,
@@ -27,7 +26,7 @@ interface Arguments {
 }
 
 export type SavedLensInput = EmbeddableInput & {
-  id: string;
+  savedObjectId: string;
   timeRange?: TimeRange;
   filters: DataFilter[];
   palette?: PaletteOutput;
@@ -73,18 +72,19 @@ export function savedLens(): ExpressionFunctionDefinition<
       },
     },
     type: EmbeddableExpressionType,
-    fn: (input, args) => {
+    fn: (input, { id, timerange, title, palette }) => {
       const filters = input ? input.and : [];
 
       return {
         type: EmbeddableExpressionType,
         input: {
-          id: args.id,
+          id,
+          savedObjectId: id,
           filters: getQueryFilters(filters),
-          timeRange: args.timerange || defaultTimeRange,
-          title: args.title === null ? undefined : args.title,
+          timeRange: timerange || defaultTimeRange,
+          title: title === null ? undefined : title,
           disableTriggers: true,
-          palette: args.palette,
+          palette,
         },
         embeddableType: EmbeddableTypes.lens,
         generatedAt: Date.now(),
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
index 538ed3f919823..a7471c755155c 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
@@ -30,7 +30,7 @@ const defaultTimeRange = {
   to: 'now',
 };
 
-type Output = EmbeddableExpression<MapEmbeddableInput>;
+type Output = EmbeddableExpression<MapEmbeddableInput & { savedObjectId: string }>;
 
 export function savedMap(): ExpressionFunctionDefinition<
   'savedMap',
@@ -85,8 +85,9 @@ export function savedMap(): ExpressionFunctionDefinition<
       return {
         type: EmbeddableExpressionType,
         input: {
-          attributes: { title: '' },
           id: args.id,
+          attributes: { title: '' },
+          savedObjectId: args.id,
           filters: getQueryFilters(filters),
           timeRange: args.timerange || defaultTimeRange,
           refreshConfig: {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
index 5c0442b43250c..31e3fb2a8c564 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
@@ -25,7 +25,7 @@ interface Arguments {
   title: string | null;
 }
 
-type Output = EmbeddableExpression<VisualizeInput>;
+type Output = EmbeddableExpression<VisualizeInput & { savedObjectId: string }>;
 
 const defaultTimeRange = {
   from: 'now-15m',
@@ -94,6 +94,7 @@ export function savedVisualization(): ExpressionFunctionDefinition<
         type: EmbeddableExpressionType,
         input: {
           id,
+          savedObjectId: id,
           disableTriggers: true,
           timeRange: timerange || defaultTimeRange,
           filters: getQueryFilters(filters),
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
index 91c573fc4148b..591795637aebe 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
@@ -7,12 +7,14 @@
 
 import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import { ChartsPluginStart } from 'src/plugins/charts/public';
+import { PresentationUtilPluginStart } from 'src/plugins/presentation_util/public';
 import { CanvasSetup } from '../public';
 import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
 import { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
 import { Start as InspectorStart } from '../../../../src/plugins/inspector/public';
 
 import { functions } from './functions/browser';
+import { initFunctions } from './functions/external';
 import { typeFunctions } from './expression_types';
 import { renderFunctions, renderFunctionFactories } from './renderers';
 
@@ -25,6 +27,7 @@ export interface StartDeps {
   uiActions: UiActionsStart;
   inspector: InspectorStart;
   charts: ChartsPluginStart;
+  presentationUtil: PresentationUtilPluginStart;
 }
 
 export type SetupInitializer<T> = (core: CoreSetup<StartDeps>, plugins: SetupDeps) => T;
@@ -39,6 +42,13 @@ export class CanvasSrcPlugin implements Plugin<void, void, SetupDeps, StartDeps>
     plugins.canvas.addRenderers(renderFunctions);
 
     core.getStartServices().then(([coreStart, depsStart]) => {
+      const externalFunctions = initFunctions({
+        embeddablePersistableStateService: {
+          extract: depsStart.embeddable.extract,
+          inject: depsStart.embeddable.inject,
+        },
+      });
+      plugins.canvas.addFunctions(externalFunctions);
       plugins.canvas.addRenderers(
         renderFunctionFactories.map((factory: any) => factory(coreStart, depsStart))
       );
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
index 73e839433c25e..953746c280840 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
@@ -13,16 +13,17 @@ import {
   IEmbeddable,
   EmbeddableFactory,
   EmbeddableFactoryNotFoundError,
+  isErrorEmbeddable,
 } from '../../../../../../src/plugins/embeddable/public';
 import { EmbeddableExpression } from '../../expression_types/embeddable';
 import { RendererStrings } from '../../../i18n';
 import { embeddableInputToExpression } from './embeddable_input_to_expression';
-import { EmbeddableInput } from '../../expression_types';
-import { RendererFactory } from '../../../types';
+import { RendererFactory, EmbeddableInput } from '../../../types';
 import { CANVAS_EMBEDDABLE_CLASSNAME } from '../../../common/lib';
 
 const { embeddable: strings } = RendererStrings;
 
+// registry of references to embeddables on the workpad
 const embeddablesRegistry: {
   [key: string]: IEmbeddable | Promise<IEmbeddable>;
 } = {};
@@ -30,11 +31,11 @@ const embeddablesRegistry: {
 const renderEmbeddableFactory = (core: CoreStart, plugins: StartDeps) => {
   const I18nContext = core.i18n.Context;
 
-  return (embeddableObject: IEmbeddable, domNode: HTMLElement) => {
+  return (embeddableObject: IEmbeddable) => {
     return (
       <div
         className={CANVAS_EMBEDDABLE_CLASSNAME}
-        style={{ width: domNode.offsetWidth, height: domNode.offsetHeight, cursor: 'auto' }}
+        style={{ width: '100%', height: '100%', cursor: 'auto' }}
       >
         <I18nContext>
           <plugins.embeddable.EmbeddablePanel embeddable={embeddableObject} />
@@ -56,6 +57,9 @@ export const embeddableRendererFactory = (
     reuseDomNode: true,
     render: async (domNode, { input, embeddableType }, handlers) => {
       const uniqueId = handlers.getElementId();
+      const isByValueEnabled = plugins.presentationUtil.labsService.isProjectEnabled(
+        'labs:canvas:byValueEmbeddable'
+      );
 
       if (!embeddablesRegistry[uniqueId]) {
         const factory = Array.from(plugins.embeddable.getEmbeddableFactories()).find(
@@ -67,15 +71,27 @@ export const embeddableRendererFactory = (
           throw new EmbeddableFactoryNotFoundError(embeddableType);
         }
 
-        const embeddablePromise = factory
-          .createFromSavedObject(input.id, input)
-          .then((embeddable) => {
-            embeddablesRegistry[uniqueId] = embeddable;
-            return embeddable;
-          });
-        embeddablesRegistry[uniqueId] = embeddablePromise;
-
-        const embeddableObject = await (async () => embeddablePromise)();
+        const embeddableInput = { ...input, id: uniqueId };
+
+        const embeddablePromise = input.savedObjectId
+          ? factory
+              .createFromSavedObject(input.savedObjectId, embeddableInput)
+              .then((embeddable) => {
+                // stores embeddable in registrey
+                embeddablesRegistry[uniqueId] = embeddable;
+                return embeddable;
+              })
+          : factory.create(embeddableInput).then((embeddable) => {
+              if (!embeddable || isErrorEmbeddable(embeddable)) {
+                return;
+              }
+              // stores embeddable in registry
+              embeddablesRegistry[uniqueId] = embeddable as IEmbeddable;
+              return embeddable;
+            });
+        embeddablesRegistry[uniqueId] = embeddablePromise as Promise<IEmbeddable>;
+
+        const embeddableObject = (await (async () => embeddablePromise)()) as IEmbeddable;
 
         const palettes = await plugins.charts.palettes.getPalettes();
 
@@ -86,7 +102,8 @@ export const embeddableRendererFactory = (
           const updatedExpression = embeddableInputToExpression(
             updatedInput,
             embeddableType,
-            palettes
+            palettes,
+            isByValueEnabled
           );
 
           if (updatedExpression) {
@@ -94,15 +111,7 @@ export const embeddableRendererFactory = (
           }
         });
 
-        ReactDOM.render(renderEmbeddable(embeddableObject, domNode), domNode, () =>
-          handlers.done()
-        );
-
-        handlers.onResize(() => {
-          ReactDOM.render(renderEmbeddable(embeddableObject, domNode), domNode, () =>
-            handlers.done()
-          );
-        });
+        ReactDOM.render(renderEmbeddable(embeddableObject), domNode, () => handlers.done());
 
         handlers.onDestroy(() => {
           subscription.unsubscribe();
@@ -115,6 +124,7 @@ export const embeddableRendererFactory = (
       } else {
         const embeddable = embeddablesRegistry[uniqueId];
 
+        // updating embeddable input with changes made to expression or filters
         if ('updateInput' in embeddable) {
           embeddable.updateInput(input);
           embeddable.reload();
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
index 41cefad6a470f..80830eac24021 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
@@ -10,6 +10,7 @@ import { EmbeddableTypes, EmbeddableInput } from '../../expression_types';
 import { toExpression as mapToExpression } from './input_type_to_expression/map';
 import { toExpression as visualizationToExpression } from './input_type_to_expression/visualization';
 import { toExpression as lensToExpression } from './input_type_to_expression/lens';
+import { toExpression as genericToExpression } from './input_type_to_expression/embeddable';
 
 export const inputToExpressionTypeMap = {
   [EmbeddableTypes.map]: mapToExpression,
@@ -23,8 +24,13 @@ export const inputToExpressionTypeMap = {
 export function embeddableInputToExpression(
   input: EmbeddableInput,
   embeddableType: string,
-  palettes: PaletteRegistry
+  palettes: PaletteRegistry,
+  useGenericEmbeddable?: boolean
 ): string | undefined {
+  if (useGenericEmbeddable) {
+    return genericToExpression(input, embeddableType);
+  }
+
   if (inputToExpressionTypeMap[embeddableType]) {
     return inputToExpressionTypeMap[embeddableType](input as any, palettes);
   }
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.test.ts
new file mode 100644
index 0000000000000..4b78acec8750a
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.test.ts
@@ -0,0 +1,128 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { toExpression } from './embeddable';
+import { EmbeddableInput } from '../../../../types';
+import { decode } from '../../../../common/lib/embeddable_dataurl';
+import { fromExpression } from '@kbn/interpreter/common';
+
+describe('toExpression', () => {
+  describe('by-reference embeddable input', () => {
+    const baseEmbeddableInput = {
+      id: 'elementId',
+      savedObjectId: 'embeddableId',
+      filters: [],
+    };
+
+    it('converts to an embeddable expression', () => {
+      const input: EmbeddableInput = baseEmbeddableInput;
+
+      const expression = toExpression(input, 'visualization');
+      const ast = fromExpression(expression);
+
+      expect(ast.type).toBe('expression');
+      expect(ast.chain[0].function).toBe('embeddable');
+      expect(ast.chain[0].arguments.type[0]).toBe('visualization');
+
+      const config = decode(ast.chain[0].arguments.config[0] as string);
+
+      expect(config.savedObjectId).toStrictEqual(input.savedObjectId);
+    });
+
+    it('includes optional input values', () => {
+      const input: EmbeddableInput = {
+        ...baseEmbeddableInput,
+        title: 'title',
+        timeRange: {
+          from: 'now-1h',
+          to: 'now',
+        },
+      };
+
+      const expression = toExpression(input, 'visualization');
+      const ast = fromExpression(expression);
+
+      const config = decode(ast.chain[0].arguments.config[0] as string);
+
+      expect(config).toHaveProperty('title', input.title);
+      expect(config).toHaveProperty('timeRange');
+      expect(config.timeRange).toHaveProperty('from', input.timeRange?.from);
+      expect(config.timeRange).toHaveProperty('to', input.timeRange?.to);
+    });
+
+    it('includes empty panel title', () => {
+      const input: EmbeddableInput = {
+        ...baseEmbeddableInput,
+        title: '',
+      };
+
+      const expression = toExpression(input, 'visualization');
+      const ast = fromExpression(expression);
+
+      const config = decode(ast.chain[0].arguments.config[0] as string);
+
+      expect(config).toHaveProperty('title', input.title);
+    });
+  });
+
+  describe('by-value embeddable input', () => {
+    const baseEmbeddableInput = {
+      id: 'elementId',
+      disableTriggers: true,
+      filters: [],
+    };
+    it('converts to an embeddable expression', () => {
+      const input: EmbeddableInput = baseEmbeddableInput;
+
+      const expression = toExpression(input, 'visualization');
+      const ast = fromExpression(expression);
+
+      expect(ast.type).toBe('expression');
+      expect(ast.chain[0].function).toBe('embeddable');
+      expect(ast.chain[0].arguments.type[0]).toBe('visualization');
+
+      const config = decode(ast.chain[0].arguments.config[0] as string);
+      expect(config.filters).toStrictEqual(input.filters);
+      expect(config.disableTriggers).toStrictEqual(input.disableTriggers);
+    });
+
+    it('includes optional input values', () => {
+      const input: EmbeddableInput = {
+        ...baseEmbeddableInput,
+        title: 'title',
+        timeRange: {
+          from: 'now-1h',
+          to: 'now',
+        },
+      };
+
+      const expression = toExpression(input, 'visualization');
+      const ast = fromExpression(expression);
+
+      const config = decode(ast.chain[0].arguments.config[0] as string);
+
+      expect(config).toHaveProperty('title', input.title);
+      expect(config).toHaveProperty('timeRange');
+      expect(config.timeRange).toHaveProperty('from', input.timeRange?.from);
+      expect(config.timeRange).toHaveProperty('to', input.timeRange?.to);
+    });
+
+    it('includes empty panel title', () => {
+      const input: EmbeddableInput = {
+        ...baseEmbeddableInput,
+        title: '',
+      };
+
+      const expression = toExpression(input, 'visualization');
+      const ast = fromExpression(expression);
+
+      const config = decode(ast.chain[0].arguments.config[0] as string);
+
+      expect(config).toHaveProperty('title', input.title);
+    });
+  });
+});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.ts
new file mode 100644
index 0000000000000..94d86f6640be1
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { encode } from '../../../../common/lib/embeddable_dataurl';
+import { EmbeddableInput } from '../../../expression_types';
+
+export function toExpression(input: EmbeddableInput, embeddableType: string): string {
+  return `embeddable config="${encode(input)}" type="${embeddableType}"`;
+}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
index 24da7238bcee9..224cdfba389d7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
@@ -11,7 +11,8 @@ import { fromExpression, Ast } from '@kbn/interpreter/common';
 import { chartPluginMock } from 'src/plugins/charts/public/mocks';
 
 const baseEmbeddableInput = {
-  id: 'embeddableId',
+  id: 'elementId',
+  savedObjectId: 'embeddableId',
   filters: [],
 };
 
@@ -27,7 +28,7 @@ describe('toExpression', () => {
     expect(ast.type).toBe('expression');
     expect(ast.chain[0].function).toBe('savedLens');
 
-    expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
+    expect(ast.chain[0].arguments.id).toStrictEqual([input.savedObjectId]);
 
     expect(ast.chain[0].arguments).not.toHaveProperty('title');
     expect(ast.chain[0].arguments).not.toHaveProperty('timerange');
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
index 35e106f234fa4..5a13b73b3fe74 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
@@ -14,7 +14,7 @@ export function toExpression(input: SavedLensInput, palettes: PaletteRegistry):
 
   expressionParts.push('savedLens');
 
-  expressionParts.push(`id="${input.id}"`);
+  expressionParts.push(`id="${input.savedObjectId}"`);
 
   if (input.title !== undefined) {
     expressionParts.push(`title="${input.title}"`);
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts
index 804d0d849cc7f..af7b40a9b283d 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts
@@ -6,12 +6,12 @@
  */
 
 import { toExpression } from './map';
-import { MapEmbeddableInput } from '../../../../../../plugins/maps/public/embeddable';
 import { fromExpression, Ast } from '@kbn/interpreter/common';
 
 const baseSavedMapInput = {
+  id: 'elementId',
   attributes: { title: '' },
-  id: 'embeddableId',
+  savedObjectId: 'embeddableId',
   filters: [],
   isLayerTOCOpen: false,
   refreshConfig: {
@@ -23,7 +23,7 @@ const baseSavedMapInput = {
 
 describe('toExpression', () => {
   it('converts to a savedMap expression', () => {
-    const input: MapEmbeddableInput = {
+    const input = {
       ...baseSavedMapInput,
     };
 
@@ -33,7 +33,7 @@ describe('toExpression', () => {
     expect(ast.type).toBe('expression');
     expect(ast.chain[0].function).toBe('savedMap');
 
-    expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
+    expect(ast.chain[0].arguments.id).toStrictEqual([input.savedObjectId]);
 
     expect(ast.chain[0].arguments).not.toHaveProperty('title');
     expect(ast.chain[0].arguments).not.toHaveProperty('center');
@@ -41,7 +41,7 @@ describe('toExpression', () => {
   });
 
   it('includes optional input values', () => {
-    const input: MapEmbeddableInput = {
+    const input = {
       ...baseSavedMapInput,
       mapCenter: {
         lat: 1,
@@ -73,7 +73,7 @@ describe('toExpression', () => {
   });
 
   it('includes empty panel title', () => {
-    const input: MapEmbeddableInput = {
+    const input = {
       ...baseSavedMapInput,
       title: '',
     };
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
index 3fd6a68a327c6..03746f38b4696 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
@@ -5,13 +5,14 @@
  * 2.0.
  */
 
-import { MapEmbeddableInput } from '../../../../../../plugins/maps/public/embeddable';
+import { MapEmbeddableInput } from '../../../../../../plugins/maps/public';
 
-export function toExpression(input: MapEmbeddableInput): string {
+export function toExpression(input: MapEmbeddableInput & { savedObjectId: string }): string {
   const expressionParts = [] as string[];
 
   expressionParts.push('savedMap');
-  expressionParts.push(`id="${input.id}"`);
+
+  expressionParts.push(`id="${input.savedObjectId}"`);
 
   if (input.title !== undefined) {
     expressionParts.push(`title="${input.title}"`);
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts
index c5106b9a102b4..4c61a130f3c95 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts
@@ -9,7 +9,8 @@ import { toExpression } from './visualization';
 import { fromExpression, Ast } from '@kbn/interpreter/common';
 
 const baseInput = {
-  id: 'embeddableId',
+  id: 'elementId',
+  savedObjectId: 'embeddableId',
 };
 
 describe('toExpression', () => {
@@ -24,7 +25,7 @@ describe('toExpression', () => {
     expect(ast.type).toBe('expression');
     expect(ast.chain[0].function).toBe('savedVisualization');
 
-    expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
+    expect(ast.chain[0].arguments.id).toStrictEqual([input.savedObjectId]);
   });
 
   it('includes timerange if given', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
index bcb73b2081fee..364d7cd0755db 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
@@ -7,11 +7,11 @@
 
 import { VisualizeInput } from 'src/plugins/visualizations/public';
 
-export function toExpression(input: VisualizeInput): string {
+export function toExpression(input: VisualizeInput & { savedObjectId: string }): string {
   const expressionParts = [] as string[];
 
   expressionParts.push('savedVisualization');
-  expressionParts.push(`id="${input.id}"`);
+  expressionParts.push(`id="${input.savedObjectId}"`);
 
   if (input.title !== undefined) {
     expressionParts.push(`title="${input.title}"`);
diff --git a/x-pack/plugins/canvas/common/lib/embeddable_dataurl.ts b/x-pack/plugins/canvas/common/lib/embeddable_dataurl.ts
new file mode 100644
index 0000000000000..e76dedfe63b14
--- /dev/null
+++ b/x-pack/plugins/canvas/common/lib/embeddable_dataurl.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EmbeddableInput } from '../../types';
+
+export const encode = (input: Partial<EmbeddableInput>) =>
+  Buffer.from(JSON.stringify(input)).toString('base64');
+export const decode = (serializedInput: string) =>
+  JSON.parse(Buffer.from(serializedInput, 'base64').toString());
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/embeddable.ts b/x-pack/plugins/canvas/i18n/functions/dict/embeddable.ts
new file mode 100644
index 0000000000000..279f58799e8c0
--- /dev/null
+++ b/x-pack/plugins/canvas/i18n/functions/dict/embeddable.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { embeddableFunctionFactory } from '../../../canvas_plugin_src/functions/external/embeddable';
+import { FunctionHelp } from '../function_help';
+import { FunctionFactory } from '../../../types';
+
+export const help: FunctionHelp<FunctionFactory<ReturnType<typeof embeddableFunctionFactory>>> = {
+  help: i18n.translate('xpack.canvas.functions.embeddableHelpText', {
+    defaultMessage: `Returns an embeddable with the provided configuration`,
+  }),
+  args: {
+    config: i18n.translate('xpack.canvas.functions.embeddable.args.idHelpText', {
+      defaultMessage: `The base64 encoded embeddable input object`,
+    }),
+    type: i18n.translate('xpack.canvas.functions.embeddable.args.typeHelpText', {
+      defaultMessage: `The embeddable type`,
+    }),
+  },
+};
diff --git a/x-pack/plugins/canvas/i18n/functions/function_help.ts b/x-pack/plugins/canvas/i18n/functions/function_help.ts
index 5eae785fefa2e..520d32af1c272 100644
--- a/x-pack/plugins/canvas/i18n/functions/function_help.ts
+++ b/x-pack/plugins/canvas/i18n/functions/function_help.ts
@@ -27,6 +27,7 @@ import { help as demodata } from './dict/demodata';
 import { help as doFn } from './dict/do';
 import { help as dropdownControl } from './dict/dropdown_control';
 import { help as eq } from './dict/eq';
+import { help as embeddable } from './dict/embeddable';
 import { help as escount } from './dict/escount';
 import { help as esdocs } from './dict/esdocs';
 import { help as essql } from './dict/essql';
@@ -182,6 +183,7 @@ export const getFunctionHelp = (): FunctionHelpDict => ({
   do: doFn,
   dropdownControl,
   eq,
+  embeddable,
   escount,
   esdocs,
   essql,
diff --git a/x-pack/plugins/canvas/kibana.json b/x-pack/plugins/canvas/kibana.json
index 9c4d1b2179d82..2fd312502a3c7 100644
--- a/x-pack/plugins/canvas/kibana.json
+++ b/x-pack/plugins/canvas/kibana.json
@@ -25,6 +25,7 @@
     "features",
     "inspector",
     "presentationUtil",
+    "visualizations",
     "uiActions",
     "share"
   ],
diff --git a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
index bf731876bf8c8..57f52fcf21f0f 100644
--- a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
+++ b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { FC } from 'react';
+import React, { FC, useCallback } from 'react';
 import { EuiFlyout, EuiFlyoutHeader, EuiFlyoutBody, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
@@ -27,38 +27,44 @@ const strings = {
 };
 export interface Props {
   onClose: () => void;
-  onSelect: (id: string, embeddableType: string) => void;
+  onSelect: (id: string, embeddableType: string, isByValueEnabled?: boolean) => void;
   availableEmbeddables: string[];
+  isByValueEnabled?: boolean;
 }
 
-export const AddEmbeddableFlyout: FC<Props> = ({ onSelect, availableEmbeddables, onClose }) => {
+export const AddEmbeddableFlyout: FC<Props> = ({
+  onSelect,
+  availableEmbeddables,
+  onClose,
+  isByValueEnabled,
+}) => {
   const embeddablesService = useEmbeddablesService();
   const platformService = usePlatformService();
   const { getEmbeddableFactories } = embeddablesService;
   const { getSavedObjects, getUISettings } = platformService;
 
-  const onAddPanel = (id: string, savedObjectType: string, name: string) => {
-    const embeddableFactories = getEmbeddableFactories();
+  const onAddPanel = useCallback(
+    (id: string, savedObjectType: string) => {
+      const embeddableFactories = getEmbeddableFactories();
+      // Find the embeddable type from the saved object type
+      const found = Array.from(embeddableFactories).find((embeddableFactory) => {
+        return Boolean(
+          embeddableFactory.savedObjectMetaData &&
+            embeddableFactory.savedObjectMetaData.type === savedObjectType
+        );
+      });
 
-    // Find the embeddable type from the saved object type
-    const found = Array.from(embeddableFactories).find((embeddableFactory) => {
-      return Boolean(
-        embeddableFactory.savedObjectMetaData &&
-          embeddableFactory.savedObjectMetaData.type === savedObjectType
-      );
-    });
-
-    const foundEmbeddableType = found ? found.type : 'unknown';
+      const foundEmbeddableType = found ? found.type : 'unknown';
 
-    onSelect(id, foundEmbeddableType);
-  };
+      onSelect(id, foundEmbeddableType, isByValueEnabled);
+    },
+    [isByValueEnabled, getEmbeddableFactories, onSelect]
+  );
 
   const embeddableFactories = getEmbeddableFactories();
 
   const availableSavedObjects = Array.from(embeddableFactories)
-    .filter((factory) => {
-      return availableEmbeddables.includes(factory.type);
-    })
+    .filter((factory) => isByValueEnabled || availableEmbeddables.includes(factory.type))
     .map((factory) => factory.savedObjectMetaData)
     .filter<SavedObjectMetaData<{}>>(function (
       maybeSavedObjectMetaData
diff --git a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.tsx b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.tsx
index 770a4cac606b0..4dc8d963932d8 100644
--- a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.tsx
+++ b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.tsx
@@ -8,12 +8,14 @@
 import React, { useMemo, useEffect, useCallback } from 'react';
 import { createPortal } from 'react-dom';
 import { useSelector, useDispatch } from 'react-redux';
+import { encode } from '../../../common/lib/embeddable_dataurl';
 import { AddEmbeddableFlyout as Component, Props as ComponentProps } from './flyout.component';
 // @ts-expect-error untyped local
 import { addElement } from '../../state/actions/elements';
 import { getSelectedPage } from '../../state/selectors/workpad';
 import { EmbeddableTypes } from '../../../canvas_plugin_src/expression_types/embeddable';
 import { State } from '../../../types';
+import { useLabsService } from '../../services';
 
 const allowedEmbeddables = {
   [EmbeddableTypes.map]: (id: string) => {
@@ -65,6 +67,9 @@ export const AddEmbeddablePanel: React.FunctionComponent<FlyoutProps> = ({
   availableEmbeddables,
   ...restProps
 }) => {
+  const labsService = useLabsService();
+  const isByValueEnabled = labsService.isProjectEnabled('labs:canvas:byValueEmbeddable');
+
   const dispatch = useDispatch();
   const pageId = useSelector<State, string>((state) => getSelectedPage(state));
 
@@ -74,18 +79,27 @@ export const AddEmbeddablePanel: React.FunctionComponent<FlyoutProps> = ({
   );
 
   const onSelect = useCallback(
-    (id: string, type: string) => {
+    (id: string, type: string): void => {
       const partialElement = {
         expression: `markdown "Could not find embeddable for type ${type}" | render`,
       };
-      if (allowedEmbeddables[type]) {
+
+      // If by-value is enabled, we'll handle both by-reference and by-value embeddables
+      // with the new generic `embeddable` function.
+      // Otherwise we fallback to the embeddable type specific expressions.
+      if (isByValueEnabled) {
+        const config = encode({ savedObjectId: id });
+        partialElement.expression = `embeddable config="${config}" 
+  type="${type}" 
+| render`;
+      } else if (allowedEmbeddables[type]) {
         partialElement.expression = allowedEmbeddables[type](id);
       }
 
       addEmbeddable(pageId, partialElement);
       restProps.onClose();
     },
-    [addEmbeddable, pageId, restProps]
+    [addEmbeddable, pageId, restProps, isByValueEnabled]
   );
 
   return (
@@ -93,6 +107,7 @@ export const AddEmbeddablePanel: React.FunctionComponent<FlyoutProps> = ({
       {...restProps}
       availableEmbeddables={availableEmbeddables || []}
       onSelect={onSelect}
+      isByValueEnabled={isByValueEnabled}
     />
   );
 };
diff --git a/x-pack/plugins/canvas/public/components/hooks/workpad/index.tsx b/x-pack/plugins/canvas/public/components/hooks/workpad/index.tsx
index 50d527036560a..ffd5b095b12e5 100644
--- a/x-pack/plugins/canvas/public/components/hooks/workpad/index.tsx
+++ b/x-pack/plugins/canvas/public/components/hooks/workpad/index.tsx
@@ -6,3 +6,5 @@
  */
 
 export { useDownloadWorkpad, useDownloadRenderedWorkpad } from './use_download_workpad';
+
+export { useIncomingEmbeddable } from './use_incoming_embeddable';
diff --git a/x-pack/plugins/canvas/public/components/hooks/workpad/use_incoming_embeddable.ts b/x-pack/plugins/canvas/public/components/hooks/workpad/use_incoming_embeddable.ts
new file mode 100644
index 0000000000000..2f8e2503ea57e
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/hooks/workpad/use_incoming_embeddable.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+import { fromExpression } from '@kbn/interpreter/common';
+import { CANVAS_APP } from '../../../../common/lib';
+import { decode, encode } from '../../../../common/lib/embeddable_dataurl';
+import { CanvasElement, CanvasPage } from '../../../../types';
+import { useEmbeddablesService, useLabsService } from '../../../services';
+// @ts-expect-error unconverted file
+import { addElement } from '../../../state/actions/elements';
+// @ts-expect-error unconverted file
+import { selectToplevelNodes } from '../../../state/actions/transient';
+
+import {
+  updateEmbeddableExpression,
+  fetchEmbeddableRenderable,
+} from '../../../state/actions/embeddable';
+import { clearValue } from '../../../state/actions/resolved_args';
+
+export const useIncomingEmbeddable = (selectedPage: CanvasPage) => {
+  const embeddablesService = useEmbeddablesService();
+  const labsService = useLabsService();
+  const dispatch = useDispatch();
+  const isByValueEnabled = labsService.isProjectEnabled('labs:canvas:byValueEmbeddable');
+  const stateTransferService = embeddablesService.getStateTransfer();
+
+  // fetch incoming embeddable from state transfer service.
+  const incomingEmbeddable = stateTransferService.getIncomingEmbeddablePackage(CANVAS_APP, true);
+
+  useEffect(() => {
+    if (isByValueEnabled && incomingEmbeddable) {
+      const { embeddableId, input: incomingInput, type } = incomingEmbeddable;
+
+      // retrieve existing element
+      const originalElement = selectedPage.elements.find(
+        ({ id }: CanvasElement) => id === embeddableId
+      );
+
+      if (originalElement) {
+        const originalAst = fromExpression(originalElement!.expression);
+
+        const functionIndex = originalAst.chain.findIndex(
+          ({ function: fn }) => fn === 'embeddable'
+        );
+
+        const originalInput = decode(
+          originalAst.chain[functionIndex].arguments.config[0] as string
+        );
+
+        // clear out resolved arg for old embeddable
+        const argumentPath = [embeddableId, 'expressionRenderable'];
+        dispatch(clearValue({ path: argumentPath }));
+
+        const updatedInput = { ...originalInput, ...incomingInput };
+
+        const expression = `embeddable config="${encode(updatedInput)}"
+  type="${type}" 
+| render`;
+
+        dispatch(
+          updateEmbeddableExpression({
+            elementId: originalElement.id,
+            embeddableExpression: expression,
+          })
+        );
+
+        // update resolved args
+        dispatch(fetchEmbeddableRenderable(originalElement.id));
+
+        // select new embeddable element
+        dispatch(selectToplevelNodes([embeddableId]));
+      } else {
+        const expression = `embeddable config="${encode(incomingInput)}"
+  type="${type}" 
+| render`;
+        dispatch(addElement(selectedPage.id, { expression }));
+      }
+    }
+  }, [dispatch, selectedPage, incomingEmbeddable, isByValueEnabled]);
+};
diff --git a/x-pack/plugins/canvas/public/components/workpad/workpad.tsx b/x-pack/plugins/canvas/public/components/workpad/workpad.tsx
index 622c885b6ef28..7cc077203c737 100644
--- a/x-pack/plugins/canvas/public/components/workpad/workpad.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad/workpad.tsx
@@ -27,6 +27,7 @@ import { WorkpadRoutingContext } from '../../routes/workpad';
 import { usePlatformService } from '../../services';
 import { Workpad as WorkpadComponent, Props } from './workpad.component';
 import { State } from '../../../types';
+import { useIncomingEmbeddable } from '../hooks';
 
 type ContainerProps = Pick<Props, 'registerLayout' | 'unregisterLayout'>;
 
@@ -58,6 +59,9 @@ export const Workpad: FC<ContainerProps> = (props) => {
     };
   });
 
+  const selectedPage = propsFromState.pages[propsFromState.selectedPageNumber - 1];
+  useIncomingEmbeddable(selectedPage);
+
   const fetchAllRenderables = useCallback(() => {
     dispatch(fetchAllRenderablesAction());
   }, [dispatch]);
diff --git a/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.scss b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.scss
index 4acdca10d61cc..0ddd44ed8f9a8 100644
--- a/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.scss
+++ b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.scss
@@ -31,7 +31,7 @@ $canvasLayoutFontSize: $euiFontSizeS;
 .canvasLayout__stageHeader {
   flex-grow: 0;
   flex-basis: auto;
-  padding: $euiSizeS;
+  padding: $euiSizeS $euiSize;
   font-size: $canvasLayoutFontSize;
   border-bottom: $euiBorderThin;
   background: $euiColorLightestShade;
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/__snapshots__/editor_menu.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/__snapshots__/editor_menu.stories.storyshot
new file mode 100644
index 0000000000000..f4aab0e59e7ee
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/__snapshots__/editor_menu.stories.storyshot
@@ -0,0 +1,81 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots components/WorkpadHeader/EditorMenu dark mode 1`] = `
+<div
+  className="euiPopover euiPopover--anchorDownLeft"
+  data-test-subj="canvasEditorMenuButton"
+>
+  <div
+    className="euiPopover__anchor"
+  >
+    <button
+      className="euiButton euiButton--text solutionToolbarButton undefined"
+      data-test-subj="canvasEditorMenuButton"
+      disabled={false}
+      onClick={[Function]}
+      style={
+        Object {
+          "minWidth": undefined,
+        }
+      }
+      type="button"
+    >
+      <span
+        className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+      >
+        <span
+          className="euiButtonContent__icon"
+          color="inherit"
+          data-euiicon-type="arrowDown"
+          size="m"
+        />
+        <span
+          className="euiButton__text"
+        >
+          Select type
+        </span>
+      </span>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`Storyshots components/WorkpadHeader/EditorMenu default 1`] = `
+<div
+  className="euiPopover euiPopover--anchorDownLeft"
+  data-test-subj="canvasEditorMenuButton"
+>
+  <div
+    className="euiPopover__anchor"
+  >
+    <button
+      className="euiButton euiButton--text solutionToolbarButton undefined"
+      data-test-subj="canvasEditorMenuButton"
+      disabled={false}
+      onClick={[Function]}
+      style={
+        Object {
+          "minWidth": undefined,
+        }
+      }
+      type="button"
+    >
+      <span
+        className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+      >
+        <span
+          className="euiButtonContent__icon"
+          color="inherit"
+          data-euiicon-type="arrowDown"
+          size="m"
+        />
+        <span
+          className="euiButton__text"
+        >
+          Select type
+        </span>
+      </span>
+    </button>
+  </div>
+</div>
+`;
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/editor_menu.stories.tsx b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/editor_menu.stories.tsx
new file mode 100644
index 0000000000000..01048bc0af301
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/editor_menu.stories.tsx
@@ -0,0 +1,107 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import React from 'react';
+import { EmbeddableFactoryDefinition, IEmbeddable } from 'src/plugins/embeddable/public';
+import { BaseVisType, VisTypeAlias } from 'src/plugins/visualizations/public';
+import { EditorMenu } from '../editor_menu.component';
+
+const testFactories: EmbeddableFactoryDefinition[] = [
+  {
+    type: 'ml_anomaly_swimlane',
+    getDisplayName: () => 'Anomaly swimlane',
+    getIconType: () => '',
+    getDescription: () => 'Description for anomaly swimlane',
+    isEditable: () => Promise.resolve(true),
+    create: () => Promise.resolve({ id: 'swimlane_embeddable' } as IEmbeddable),
+    grouping: [
+      {
+        id: 'ml',
+        getDisplayName: () => 'machine learning',
+        getIconType: () => 'machineLearningApp',
+      },
+    ],
+  },
+  {
+    type: 'ml_anomaly_chart',
+    getDisplayName: () => 'Anomaly chart',
+    getIconType: () => '',
+    getDescription: () => 'Description for anomaly chart',
+    isEditable: () => Promise.resolve(true),
+    create: () => Promise.resolve({ id: 'anomaly_chart_embeddable' } as IEmbeddable),
+    grouping: [
+      {
+        id: 'ml',
+        getDisplayName: () => 'machine learning',
+        getIconType: () => 'machineLearningApp',
+      },
+    ],
+  },
+  {
+    type: 'log_stream',
+    getDisplayName: () => 'Log stream',
+    getIconType: () => '',
+    getDescription: () => 'Description for log stream',
+    isEditable: () => Promise.resolve(true),
+    create: () => Promise.resolve({ id: 'anomaly_chart_embeddable' } as IEmbeddable),
+  },
+];
+
+const testVisTypes: BaseVisType[] = [
+  { title: 'TSVB', icon: '', description: 'Description of TSVB', name: 'tsvb' } as BaseVisType,
+  {
+    titleInWizard: 'Custom visualization',
+    title: 'Vega',
+    icon: '',
+    description: 'Description of Vega',
+    name: 'vega',
+  } as BaseVisType,
+];
+
+const testVisTypeAliases: VisTypeAlias[] = [
+  {
+    title: 'Lens',
+    aliasApp: 'lens',
+    aliasPath: 'path/to/lens',
+    icon: 'lensApp',
+    name: 'lens',
+    description: 'Description of Lens app',
+    stage: 'production',
+  },
+  {
+    title: 'Maps',
+    aliasApp: 'maps',
+    aliasPath: 'path/to/maps',
+    icon: 'gisApp',
+    name: 'maps',
+    description: 'Description of Maps app',
+    stage: 'production',
+  },
+];
+
+storiesOf('components/WorkpadHeader/EditorMenu', module)
+  .add('default', () => (
+    <EditorMenu
+      factories={testFactories}
+      promotedVisTypes={testVisTypes}
+      visTypeAliases={testVisTypeAliases}
+      createNewVisType={() => action('createNewVisType')}
+      createNewEmbeddable={() => action('createNewEmbeddable')}
+    />
+  ))
+  .add('dark mode', () => (
+    <EditorMenu
+      factories={testFactories}
+      isDarkThemeEnabled
+      promotedVisTypes={testVisTypes}
+      visTypeAliases={testVisTypeAliases}
+      createNewVisType={() => action('createNewVisType')}
+      createNewEmbeddable={() => action('createNewEmbeddable')}
+    />
+  ));
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.component.tsx
new file mode 100644
index 0000000000000..e8f762f9731a1
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.component.tsx
@@ -0,0 +1,170 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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 {
+  EuiContextMenu,
+  EuiContextMenuPanelItemDescriptor,
+  EuiContextMenuItemIcon,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { EmbeddableFactoryDefinition } from '../../../../../../../src/plugins/embeddable/public';
+import { BaseVisType, VisTypeAlias } from '../../../../../../../src/plugins/visualizations/public';
+import { SolutionToolbarPopover } from '../../../../../../../src/plugins/presentation_util/public';
+
+const strings = {
+  getEditorMenuButtonLabel: () =>
+    i18n.translate('xpack.canvas.solutionToolbar.editorMenuButtonLabel', {
+      defaultMessage: 'Select type',
+    }),
+};
+
+interface FactoryGroup {
+  id: string;
+  appName: string;
+  icon: EuiContextMenuItemIcon;
+  panelId: number;
+  factories: EmbeddableFactoryDefinition[];
+}
+
+interface Props {
+  factories: EmbeddableFactoryDefinition[];
+  isDarkThemeEnabled?: boolean;
+  promotedVisTypes: BaseVisType[];
+  visTypeAliases: VisTypeAlias[];
+  createNewVisType: (visType?: BaseVisType | VisTypeAlias) => () => void;
+  createNewEmbeddable: (factory: EmbeddableFactoryDefinition) => () => void;
+}
+
+export const EditorMenu: FC<Props> = ({
+  factories,
+  isDarkThemeEnabled,
+  promotedVisTypes,
+  visTypeAliases,
+  createNewVisType,
+  createNewEmbeddable,
+}: Props) => {
+  const factoryGroupMap: Record<string, FactoryGroup> = {};
+  const ungroupedFactories: EmbeddableFactoryDefinition[] = [];
+
+  let panelCount = 1;
+
+  // Maps factories with a group to create nested context menus for each group type
+  // and pushes ungrouped factories into a separate array
+  factories.forEach((factory: EmbeddableFactoryDefinition, index) => {
+    const { grouping } = factory;
+
+    if (grouping) {
+      grouping.forEach((group) => {
+        if (factoryGroupMap[group.id]) {
+          factoryGroupMap[group.id].factories.push(factory);
+        } else {
+          factoryGroupMap[group.id] = {
+            id: group.id,
+            appName: group.getDisplayName ? group.getDisplayName({}) : group.id,
+            icon: (group.getIconType ? group.getIconType({}) : 'empty') as EuiContextMenuItemIcon,
+            factories: [factory],
+            panelId: panelCount,
+          };
+
+          panelCount++;
+        }
+      });
+    } else {
+      ungroupedFactories.push(factory);
+    }
+  });
+
+  const getVisTypeMenuItem = (visType: BaseVisType): EuiContextMenuPanelItemDescriptor => {
+    const { name, title, titleInWizard, description, icon = 'empty' } = visType;
+    return {
+      name: titleInWizard || title,
+      icon: icon as string,
+      onClick: createNewVisType(visType),
+      'data-test-subj': `visType-${name}`,
+      toolTipContent: description,
+    };
+  };
+
+  const getVisTypeAliasMenuItem = (
+    visTypeAlias: VisTypeAlias
+  ): EuiContextMenuPanelItemDescriptor => {
+    const { name, title, description, icon = 'empty' } = visTypeAlias;
+
+    return {
+      name: title,
+      icon,
+      onClick: createNewVisType(visTypeAlias),
+      'data-test-subj': `visType-${name}`,
+      toolTipContent: description,
+    };
+  };
+
+  const getEmbeddableFactoryMenuItem = (
+    factory: EmbeddableFactoryDefinition
+  ): EuiContextMenuPanelItemDescriptor => {
+    const icon = factory?.getIconType ? factory.getIconType() : 'empty';
+
+    const toolTipContent = factory?.getDescription ? factory.getDescription() : undefined;
+
+    return {
+      name: factory.getDisplayName(),
+      icon,
+      toolTipContent,
+      onClick: createNewEmbeddable(factory),
+      'data-test-subj': `createNew-${factory.type}`,
+    };
+  };
+
+  const editorMenuPanels = [
+    {
+      id: 0,
+      items: [
+        ...visTypeAliases.map(getVisTypeAliasMenuItem),
+        ...Object.values(factoryGroupMap).map(({ id, appName, icon, panelId }) => ({
+          name: appName,
+          icon,
+          panel: panelId,
+          'data-test-subj': `canvasEditorMenu-${id}Group`,
+        })),
+        ...ungroupedFactories.map(getEmbeddableFactoryMenuItem),
+        ...promotedVisTypes.map(getVisTypeMenuItem),
+      ],
+    },
+    ...Object.values(factoryGroupMap).map(
+      ({ appName, panelId, factories: groupFactories }: FactoryGroup) => ({
+        id: panelId,
+        title: appName,
+        items: groupFactories.map(getEmbeddableFactoryMenuItem),
+      })
+    ),
+  ];
+
+  return (
+    <SolutionToolbarPopover
+      ownFocus
+      label={strings.getEditorMenuButtonLabel()}
+      iconType="arrowDown"
+      iconSide="right"
+      panelPaddingSize="none"
+      data-test-subj="canvasEditorMenuButton"
+    >
+      {() => (
+        <EuiContextMenu
+          initialPanelId={0}
+          panels={editorMenuPanels}
+          className={`canvasSolutionToolbar__editorContextMenu ${
+            isDarkThemeEnabled
+              ? 'canvasSolutionToolbar__editorContextMenu--dark'
+              : 'canvasSolutionToolbar__editorContextMenu--light'
+          }`}
+          data-test-subj="canvasEditorContextMenu"
+        />
+      )}
+    </SolutionToolbarPopover>
+  );
+};
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx
new file mode 100644
index 0000000000000..dad34e6983c5d
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx
@@ -0,0 +1,147 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useCallback } from 'react';
+import { useLocation } from 'react-router-dom';
+import { trackCanvasUiMetric, METRIC_TYPE } from '../../../../public/lib/ui_metric';
+import {
+  useEmbeddablesService,
+  usePlatformService,
+  useVisualizationsService,
+} from '../../../services';
+import {
+  BaseVisType,
+  VisGroups,
+  VisTypeAlias,
+} from '../../../../../../../src/plugins/visualizations/public';
+import {
+  EmbeddableFactoryDefinition,
+  EmbeddableInput,
+} from '../../../../../../../src/plugins/embeddable/public';
+import { CANVAS_APP } from '../../../../common/lib';
+import { encode } from '../../../../common/lib/embeddable_dataurl';
+import { ElementSpec } from '../../../../types';
+import { EditorMenu as Component } from './editor_menu.component';
+
+interface Props {
+  /**
+   * Handler for adding a selected element to the workpad
+   */
+  addElement: (element: Partial<ElementSpec>) => void;
+}
+
+export const EditorMenu: FC<Props> = ({ addElement }) => {
+  const embeddablesService = useEmbeddablesService();
+  const { pathname, search } = useLocation();
+  const platformService = usePlatformService();
+  const stateTransferService = embeddablesService.getStateTransfer();
+  const visualizationsService = useVisualizationsService();
+  const IS_DARK_THEME = platformService.getUISetting('theme:darkMode');
+
+  const createNewVisType = useCallback(
+    (visType?: BaseVisType | VisTypeAlias) => () => {
+      let path = '';
+      let appId = '';
+
+      if (visType) {
+        if (trackCanvasUiMetric) {
+          trackCanvasUiMetric(METRIC_TYPE.CLICK, `${visType.name}:create`);
+        }
+
+        if ('aliasPath' in visType) {
+          appId = visType.aliasApp;
+          path = visType.aliasPath;
+        } else {
+          appId = 'visualize';
+          path = `#/create?type=${encodeURIComponent(visType.name)}`;
+        }
+      } else {
+        appId = 'visualize';
+        path = '#/create?';
+      }
+
+      stateTransferService.navigateToEditor(appId, {
+        path,
+        state: {
+          originatingApp: CANVAS_APP,
+          originatingPath: `#/${pathname}${search}`,
+        },
+      });
+    },
+    [stateTransferService, pathname, search]
+  );
+
+  const createNewEmbeddable = useCallback(
+    (factory: EmbeddableFactoryDefinition) => async () => {
+      if (trackCanvasUiMetric) {
+        trackCanvasUiMetric(METRIC_TYPE.CLICK, factory.type);
+      }
+      let embeddableInput;
+      if (factory.getExplicitInput) {
+        embeddableInput = await factory.getExplicitInput();
+      } else {
+        const newEmbeddable = await factory.create({} as EmbeddableInput);
+        embeddableInput = newEmbeddable?.getInput();
+      }
+
+      if (embeddableInput) {
+        const config = encode(embeddableInput);
+        const expression = `embeddable config="${config}"
+  type="${factory.type}" 
+| render`;
+
+        addElement({ expression });
+      }
+    },
+    [addElement]
+  );
+
+  const getVisTypesByGroup = (group: VisGroups): BaseVisType[] =>
+    visualizationsService
+      .getByGroup(group)
+      .sort(({ name: a }: BaseVisType | VisTypeAlias, { name: b }: BaseVisType | VisTypeAlias) => {
+        if (a < b) {
+          return -1;
+        }
+        if (a > b) {
+          return 1;
+        }
+        return 0;
+      })
+      .filter(({ hidden }: BaseVisType) => !hidden);
+
+  const visTypeAliases = visualizationsService
+    .getAliases()
+    .sort(({ promotion: a = false }: VisTypeAlias, { promotion: b = false }: VisTypeAlias) =>
+      a === b ? 0 : a ? -1 : 1
+    );
+
+  const factories = embeddablesService
+    ? Array.from(embeddablesService.getEmbeddableFactories()).filter(
+        ({ type, isEditable, canCreateNew, isContainerType }) =>
+          isEditable() &&
+          !isContainerType &&
+          canCreateNew() &&
+          !['visualization', 'ml'].some((factoryType) => {
+            return type.includes(factoryType);
+          })
+      )
+    : [];
+
+  const promotedVisTypes = getVisTypesByGroup(VisGroups.PROMOTED);
+
+  return (
+    <Component
+      createNewVisType={createNewVisType}
+      createNewEmbeddable={createNewEmbeddable}
+      promotedVisTypes={promotedVisTypes}
+      isDarkThemeEnabled={IS_DARK_THEME}
+      factories={factories}
+      visTypeAliases={visTypeAliases}
+    />
+  );
+};
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/index.ts b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/index.ts
new file mode 100644
index 0000000000000..0f903b1bbbe2e
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { EditorMenu } from './editor_menu';
+export { EditorMenu as EditorMenuComponent } from './editor_menu.component';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
index 8ac581b0866a4..1cfab236d9a9c 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.component.tsx
@@ -12,11 +12,11 @@ import { EuiContextMenu, EuiIcon, EuiContextMenuPanelItemDescriptor } from '@ela
 import { i18n } from '@kbn/i18n';
 import { PrimaryActionPopover } from '../../../../../../../src/plugins/presentation_util/public';
 import { getId } from '../../../lib/get_id';
-import { ClosePopoverFn } from '../../popover';
 import { CONTEXT_MENU_TOP_BORDER_CLASSNAME } from '../../../../common/lib';
 import { ElementSpec } from '../../../../types';
 import { flattenPanelTree } from '../../../lib/flatten_panel_tree';
 import { AssetManager } from '../../asset_manager';
+import { ClosePopoverFn } from '../../popover';
 import { SavedElementsModal } from '../../saved_elements_modal';
 
 interface CategorizedElementLists {
@@ -112,7 +112,7 @@ const categorizeElementsByType = (elements: ElementSpec[]): { [key: string]: Ele
   return categories;
 };
 
-interface Props {
+export interface Props {
   /**
    * Dictionary of elements from elements registry
    */
@@ -120,7 +120,7 @@ interface Props {
   /**
    * Handler for adding a selected element to the workpad
    */
-  addElement: (element: ElementSpec) => void;
+  addElement: (element: Partial<ElementSpec>) => void;
 }
 
 export const ElementMenu: FunctionComponent<Props> = ({ elements, addElement }) => {
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/index.ts b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/index.ts
index 52c8daece7690..037bb84b0cdba 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/index.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/index.ts
@@ -5,5 +5,4 @@
  * 2.0.
  */
 
-export { ElementMenu } from './element_menu';
-export { ElementMenu as ElementMenuComponent } from './element_menu.component';
+export { ElementMenu } from './element_menu.component';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
index f031d7c263199..b84e4faf2925e 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
@@ -27,6 +27,7 @@ import { ElementMenu } from './element_menu';
 import { ShareMenu } from './share_menu';
 import { ViewMenu } from './view_menu';
 import { LabsControl } from './labs_control';
+import { EditorMenu } from './editor_menu';
 
 const strings = {
   getFullScreenButtonAriaLabel: () =>
@@ -160,24 +161,22 @@ export const WorkpadHeader: FC<Props> = ({
       <EuiFlexGroup
         gutterSize="none"
         alignItems="center"
-        justifyContent="spaceBetween"
         className="canvasLayout__stageHeaderInner"
       >
+        {isWriteable && (
+          <EuiFlexItem grow={false}>
+            <SolutionToolbar>
+              {{
+                primaryActionButton: <ElementMenu addElement={addElement} elements={elements} />,
+                quickButtonGroup: <QuickButtonGroup buttons={quickButtons} />,
+                addFromLibraryButton: <AddFromLibraryButton onClick={showEmbedPanel} />,
+                extraButtons: [<EditorMenu addElement={addElement} />],
+              }}
+            </SolutionToolbar>
+          </EuiFlexItem>
+        )}
         <EuiFlexItem grow={false}>
           <EuiFlexGroup alignItems="center" gutterSize="none">
-            {isWriteable && (
-              <EuiFlexItem>
-                <SolutionToolbar>
-                  {{
-                    primaryActionButton: (
-                      <ElementMenu addElement={addElement} elements={elements} />
-                    ),
-                    quickButtonGroup: <QuickButtonGroup buttons={quickButtons} />,
-                    addFromLibraryButton: <AddFromLibraryButton onClick={showEmbedPanel} />,
-                  }}
-                </SolutionToolbar>
-              </EuiFlexItem>
-            )}
             <EuiFlexItem grow={false}>
               <ViewMenu />
             </EuiFlexItem>
@@ -192,6 +191,7 @@ export const WorkpadHeader: FC<Props> = ({
             </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlexItem>
+        <EuiFlexItem />
         <EuiFlexItem grow={false}>
           <EuiFlexGroup alignItems="center" gutterSize="s">
             <EuiFlexItem grow={false}>
diff --git a/x-pack/plugins/canvas/public/plugin.tsx b/x-pack/plugins/canvas/public/plugin.tsx
index 5d1f05fdbe8bf..d2375064603c3 100644
--- a/x-pack/plugins/canvas/public/plugin.tsx
+++ b/x-pack/plugins/canvas/public/plugin.tsx
@@ -8,6 +8,7 @@
 import { BehaviorSubject } from 'rxjs';
 import type { SharePluginSetup } from 'src/plugins/share/public';
 import { ChartsPluginSetup, ChartsPluginStart } from 'src/plugins/charts/public';
+import { VisualizationsStart } from 'src/plugins/visualizations/public';
 import { ReportingStart } from '../../reporting/public';
 import {
   CoreSetup,
@@ -63,6 +64,7 @@ export interface CanvasStartDeps {
   charts: ChartsPluginStart;
   data: DataPublicPluginStart;
   presentationUtil: PresentationUtilPluginStart;
+  visualizations: VisualizationsStart;
   spaces?: SpacesPluginStart;
 }
 
@@ -122,7 +124,12 @@ export class CanvasPlugin
 
         const { pluginServices } = await import('./services');
         pluginServices.setRegistry(
-          pluginServiceRegistry.start({ coreStart, startPlugins, initContext: this.initContext })
+          pluginServiceRegistry.start({
+            coreStart,
+            startPlugins,
+            appUpdater: this.appUpdater,
+            initContext: this.initContext,
+          })
         );
 
         // Load application bundle
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad.ts
index 963a69a8f11f0..f117998bbd3eb 100644
--- a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad.ts
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad.ts
@@ -50,7 +50,7 @@ export const useWorkpad = (
         setResolveInfo({ aliasId, outcome, id: workpadId });
 
         // If it's an alias match, we know we are going to redirect so don't even dispatch that we got the workpad
-        if (outcome !== 'aliasMatch') {
+        if (storedWorkpad.id !== workpadId && outcome !== 'aliasMatch') {
           workpad.aliasId = aliasId;
 
           dispatch(setAssets(assets));
@@ -61,7 +61,7 @@ export const useWorkpad = (
         setError(e as Error | string);
       }
     })();
-  }, [workpadId, dispatch, setError, loadPages, workpadResolve]);
+  }, [workpadId, dispatch, setError, loadPages, workpadResolve, storedWorkpad.id]);
 
   useEffect(() => {
     // If the resolved info is not for the current workpad id, bail out
diff --git a/x-pack/plugins/canvas/public/services/embeddables.ts b/x-pack/plugins/canvas/public/services/embeddables.ts
index 24d7a57e086f2..26b150b7a5349 100644
--- a/x-pack/plugins/canvas/public/services/embeddables.ts
+++ b/x-pack/plugins/canvas/public/services/embeddables.ts
@@ -5,8 +5,12 @@
  * 2.0.
  */
 
-import { EmbeddableFactory } from '../../../../../src/plugins/embeddable/public';
+import {
+  EmbeddableFactory,
+  EmbeddableStateTransfer,
+} from '../../../../../src/plugins/embeddable/public';
 
 export interface CanvasEmbeddablesService {
   getEmbeddableFactories: () => IterableIterator<EmbeddableFactory>;
+  getStateTransfer: () => EmbeddableStateTransfer;
 }
diff --git a/x-pack/plugins/canvas/public/services/index.ts b/x-pack/plugins/canvas/public/services/index.ts
index f4292810b8089..ed55f919e4c76 100644
--- a/x-pack/plugins/canvas/public/services/index.ts
+++ b/x-pack/plugins/canvas/public/services/index.ts
@@ -17,6 +17,7 @@ import { CanvasNavLinkService } from './nav_link';
 import { CanvasNotifyService } from './notify';
 import { CanvasPlatformService } from './platform';
 import { CanvasReportingService } from './reporting';
+import { CanvasVisualizationsService } from './visualizations';
 import { CanvasWorkpadService } from './workpad';
 
 export interface CanvasPluginServices {
@@ -28,6 +29,7 @@ export interface CanvasPluginServices {
   notify: CanvasNotifyService;
   platform: CanvasPlatformService;
   reporting: CanvasReportingService;
+  visualizations: CanvasVisualizationsService;
   workpad: CanvasWorkpadService;
 }
 
@@ -44,4 +46,6 @@ export const useNavLinkService = () => (() => pluginServices.getHooks().navLink.
 export const useNotifyService = () => (() => pluginServices.getHooks().notify.useService())();
 export const usePlatformService = () => (() => pluginServices.getHooks().platform.useService())();
 export const useReportingService = () => (() => pluginServices.getHooks().reporting.useService())();
+export const useVisualizationsService = () =>
+  (() => pluginServices.getHooks().visualizations.useService())();
 export const useWorkpadService = () => (() => pluginServices.getHooks().workpad.useService())();
diff --git a/x-pack/plugins/canvas/public/services/kibana/embeddables.ts b/x-pack/plugins/canvas/public/services/kibana/embeddables.ts
index 054b9da7409fb..8d1a86edab3d8 100644
--- a/x-pack/plugins/canvas/public/services/kibana/embeddables.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/embeddables.ts
@@ -16,4 +16,5 @@ export type EmbeddablesServiceFactory = KibanaPluginServiceFactory<
 
 export const embeddablesServiceFactory: EmbeddablesServiceFactory = ({ startPlugins }) => ({
   getEmbeddableFactories: startPlugins.embeddable.getEmbeddableFactories,
+  getStateTransfer: startPlugins.embeddable.getStateTransfer,
 });
diff --git a/x-pack/plugins/canvas/public/services/kibana/index.ts b/x-pack/plugins/canvas/public/services/kibana/index.ts
index 1eb010e8d6f9d..91767947bc0a6 100644
--- a/x-pack/plugins/canvas/public/services/kibana/index.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/index.ts
@@ -22,6 +22,7 @@ import { navLinkServiceFactory } from './nav_link';
 import { notifyServiceFactory } from './notify';
 import { platformServiceFactory } from './platform';
 import { reportingServiceFactory } from './reporting';
+import { visualizationsServiceFactory } from './visualizations';
 import { workpadServiceFactory } from './workpad';
 
 export { customElementServiceFactory } from './custom_element';
@@ -31,6 +32,7 @@ export { labsServiceFactory } from './labs';
 export { notifyServiceFactory } from './notify';
 export { platformServiceFactory } from './platform';
 export { reportingServiceFactory } from './reporting';
+export { visualizationsServiceFactory } from './visualizations';
 export { workpadServiceFactory } from './workpad';
 
 export const pluginServiceProviders: PluginServiceProviders<
@@ -45,6 +47,7 @@ export const pluginServiceProviders: PluginServiceProviders<
   notify: new PluginServiceProvider(notifyServiceFactory),
   platform: new PluginServiceProvider(platformServiceFactory),
   reporting: new PluginServiceProvider(reportingServiceFactory),
+  visualizations: new PluginServiceProvider(visualizationsServiceFactory),
   workpad: new PluginServiceProvider(workpadServiceFactory),
 };
 
diff --git a/x-pack/plugins/canvas/public/services/kibana/visualizations.ts b/x-pack/plugins/canvas/public/services/kibana/visualizations.ts
new file mode 100644
index 0000000000000..e319ec1c1f427
--- /dev/null
+++ b/x-pack/plugins/canvas/public/services/kibana/visualizations.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { KibanaPluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { CanvasStartDeps } from '../../plugin';
+import { CanvasVisualizationsService } from '../visualizations';
+
+export type VisualizationsServiceFactory = KibanaPluginServiceFactory<
+  CanvasVisualizationsService,
+  CanvasStartDeps
+>;
+
+export const visualizationsServiceFactory: VisualizationsServiceFactory = ({ startPlugins }) => ({
+  showNewVisModal: startPlugins.visualizations.showNewVisModal,
+  getByGroup: startPlugins.visualizations.getByGroup,
+  getAliases: startPlugins.visualizations.getAliases,
+});
diff --git a/x-pack/plugins/canvas/public/services/stubs/embeddables.ts b/x-pack/plugins/canvas/public/services/stubs/embeddables.ts
index 173d27563e2b2..9c2cf4d0650ab 100644
--- a/x-pack/plugins/canvas/public/services/stubs/embeddables.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/embeddables.ts
@@ -14,4 +14,5 @@ const noop = (..._args: any[]): any => {};
 
 export const embeddablesServiceFactory: EmbeddablesServiceFactory = () => ({
   getEmbeddableFactories: noop,
+  getStateTransfer: noop,
 });
diff --git a/x-pack/plugins/canvas/public/services/stubs/index.ts b/x-pack/plugins/canvas/public/services/stubs/index.ts
index 06a5ff49e9c04..2216013a29c12 100644
--- a/x-pack/plugins/canvas/public/services/stubs/index.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/index.ts
@@ -22,6 +22,7 @@ import { navLinkServiceFactory } from './nav_link';
 import { notifyServiceFactory } from './notify';
 import { platformServiceFactory } from './platform';
 import { reportingServiceFactory } from './reporting';
+import { visualizationsServiceFactory } from './visualizations';
 import { workpadServiceFactory } from './workpad';
 
 export { customElementServiceFactory } from './custom_element';
@@ -31,6 +32,7 @@ export { navLinkServiceFactory } from './nav_link';
 export { notifyServiceFactory } from './notify';
 export { platformServiceFactory } from './platform';
 export { reportingServiceFactory } from './reporting';
+export { visualizationsServiceFactory } from './visualizations';
 export { workpadServiceFactory } from './workpad';
 
 export const pluginServiceProviders: PluginServiceProviders<CanvasPluginServices> = {
@@ -42,6 +44,7 @@ export const pluginServiceProviders: PluginServiceProviders<CanvasPluginServices
   notify: new PluginServiceProvider(notifyServiceFactory),
   platform: new PluginServiceProvider(platformServiceFactory),
   reporting: new PluginServiceProvider(reportingServiceFactory),
+  visualizations: new PluginServiceProvider(visualizationsServiceFactory),
   workpad: new PluginServiceProvider(workpadServiceFactory),
 };
 
diff --git a/x-pack/plugins/canvas/public/services/stubs/visualizations.ts b/x-pack/plugins/canvas/public/services/stubs/visualizations.ts
new file mode 100644
index 0000000000000..4c5525aea143a
--- /dev/null
+++ b/x-pack/plugins/canvas/public/services/stubs/visualizations.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { PluginServiceFactory } from '../../../../../../src/plugins/presentation_util/public';
+import { CanvasVisualizationsService } from '../visualizations';
+
+type VisualizationsServiceFactory = PluginServiceFactory<CanvasVisualizationsService>;
+
+const noop = (..._args: any[]): any => {};
+
+export const visualizationsServiceFactory: VisualizationsServiceFactory = () => ({
+  showNewVisModal: noop,
+  getByGroup: noop,
+  getAliases: noop,
+});
diff --git a/x-pack/plugins/canvas/public/services/visualizations.ts b/x-pack/plugins/canvas/public/services/visualizations.ts
new file mode 100644
index 0000000000000..c602b1dd39f3d
--- /dev/null
+++ b/x-pack/plugins/canvas/public/services/visualizations.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { VisualizationsStart } from '../../../../../src/plugins/visualizations/public';
+
+export interface CanvasVisualizationsService {
+  showNewVisModal: VisualizationsStart['showNewVisModal'];
+  getByGroup: VisualizationsStart['getByGroup'];
+  getAliases: VisualizationsStart['getAliases'];
+}
diff --git a/x-pack/plugins/canvas/public/state/reducers/embeddable.ts b/x-pack/plugins/canvas/public/state/reducers/embeddable.ts
index 4cfdc7f21945f..092d4300d86b7 100644
--- a/x-pack/plugins/canvas/public/state/reducers/embeddable.ts
+++ b/x-pack/plugins/canvas/public/state/reducers/embeddable.ts
@@ -40,7 +40,7 @@ export const embeddableReducer = handleActions<
 
       const element = pageWithElement.elements.find((elem) => elem.id === elementId);
 
-      if (!element) {
+      if (!element || element.expression === embeddableExpression) {
         return workpadState;
       }
 
diff --git a/x-pack/plugins/canvas/server/plugin.ts b/x-pack/plugins/canvas/server/plugin.ts
index 4071b891e4c3d..ebe43ba76a46a 100644
--- a/x-pack/plugins/canvas/server/plugin.ts
+++ b/x-pack/plugins/canvas/server/plugin.ts
@@ -14,6 +14,7 @@ import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
 import { BfetchServerSetup } from 'src/plugins/bfetch/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { HomeServerPluginSetup } from 'src/plugins/home/server';
+import { EmbeddableSetup } from 'src/plugins/embeddable/server';
 import { ESSQL_SEARCH_STRATEGY } from '../common/lib/constants';
 import { ReportingSetup } from '../../reporting/server';
 import { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
@@ -30,6 +31,7 @@ import { CanvasRouteHandlerContext, createWorkpadRouteContext } from './workpad_
 
 interface PluginsSetup {
   expressions: ExpressionsServerSetup;
+  embeddable: EmbeddableSetup;
   features: FeaturesPluginSetup;
   home: HomeServerPluginSetup;
   bfetch: BfetchServerSetup;
@@ -82,7 +84,12 @@ export class CanvasPlugin implements Plugin {
     const kibanaIndex = coreSetup.savedObjects.getKibanaIndex();
     registerCanvasUsageCollector(plugins.usageCollection, kibanaIndex);
 
-    setupInterpreter(expressionsFork);
+    setupInterpreter(expressionsFork, {
+      embeddablePersistableStateService: {
+        extract: plugins.embeddable.extract,
+        inject: plugins.embeddable.inject,
+      },
+    });
 
     coreSetup.getStartServices().then(([_, depsStart]) => {
       const strategy = essqlSearchStrategyProvider();
diff --git a/x-pack/plugins/canvas/server/setup_interpreter.ts b/x-pack/plugins/canvas/server/setup_interpreter.ts
index 2fe23eb86c086..849ad79717056 100644
--- a/x-pack/plugins/canvas/server/setup_interpreter.ts
+++ b/x-pack/plugins/canvas/server/setup_interpreter.ts
@@ -7,9 +7,15 @@
 
 import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
 import { functions } from '../canvas_plugin_src/functions/server';
-import { functions as externalFunctions } from '../canvas_plugin_src/functions/external';
+import {
+  initFunctions as initExternalFunctions,
+  InitializeArguments,
+} from '../canvas_plugin_src/functions/external';
 
-export function setupInterpreter(expressions: ExpressionsServerSetup) {
+export function setupInterpreter(
+  expressions: ExpressionsServerSetup,
+  dependencies: InitializeArguments
+) {
   functions.forEach((f) => expressions.registerFunction(f));
-  externalFunctions.forEach((f) => expressions.registerFunction(f));
+  initExternalFunctions(dependencies).forEach((f) => expressions.registerFunction(f));
 }
diff --git a/x-pack/plugins/canvas/types/embeddables.ts b/x-pack/plugins/canvas/types/embeddables.ts
new file mode 100644
index 0000000000000..b78efece59d8f
--- /dev/null
+++ b/x-pack/plugins/canvas/types/embeddables.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { TimeRange } from 'src/plugins/data/public';
+import { Filter } from '@kbn/es-query';
+import { EmbeddableInput as Input } from '../../../../src/plugins/embeddable/common/';
+
+export type EmbeddableInput = Input & {
+  timeRange?: TimeRange;
+  filters?: Filter[];
+  savedObjectId?: string;
+};
diff --git a/x-pack/plugins/canvas/types/functions.ts b/x-pack/plugins/canvas/types/functions.ts
index 2569e0b10685b..c80102915ed95 100644
--- a/x-pack/plugins/canvas/types/functions.ts
+++ b/x-pack/plugins/canvas/types/functions.ts
@@ -10,8 +10,8 @@ import { UnwrapPromiseOrReturn } from '@kbn/utility-types';
 import { functions as commonFunctions } from '../canvas_plugin_src/functions/common';
 import { functions as browserFunctions } from '../canvas_plugin_src/functions/browser';
 import { functions as serverFunctions } from '../canvas_plugin_src/functions/server';
-import { functions as externalFunctions } from '../canvas_plugin_src/functions/external';
-import { initFunctions } from '../public/functions';
+import { initFunctions as initExternalFunctions } from '../canvas_plugin_src/functions/external';
+import { initFunctions as initClientFunctions } from '../public/functions';
 
 /**
  * A `ExpressionFunctionFactory` is a powerful type used for any function that produces
@@ -90,9 +90,11 @@ export type FunctionFactory<FnFactory> =
 type CommonFunction = FunctionFactory<typeof commonFunctions[number]>;
 type BrowserFunction = FunctionFactory<typeof browserFunctions[number]>;
 type ServerFunction = FunctionFactory<typeof serverFunctions[number]>;
-type ExternalFunction = FunctionFactory<typeof externalFunctions[number]>;
+type ExternalFunction = FunctionFactory<
+  ReturnType<typeof initExternalFunctions> extends Array<infer U> ? U : never
+>;
 type ClientFunctions = FunctionFactory<
-  ReturnType<typeof initFunctions> extends Array<infer U> ? U : never
+  ReturnType<typeof initClientFunctions> extends Array<infer U> ? U : never
 >;
 
 /**
diff --git a/x-pack/plugins/canvas/types/index.ts b/x-pack/plugins/canvas/types/index.ts
index 09ae1510be6da..930f337292088 100644
--- a/x-pack/plugins/canvas/types/index.ts
+++ b/x-pack/plugins/canvas/types/index.ts
@@ -9,6 +9,7 @@ export * from '../../../../src/plugins/expressions/common';
 export * from './assets';
 export * from './canvas';
 export * from './elements';
+export * from './embeddables';
 export * from './filters';
 export * from './functions';
 export * from './renderers';
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
index 4d57674c94dad..095ce9f78cdff 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
@@ -261,6 +261,11 @@ export const Expressions: React.FC<Props> = (props) => {
     [alertParams.groupBy]
   );
 
+  const disableNoData = useMemo(
+    () => alertParams.criteria?.every((c) => c.aggType === Aggregators.COUNT),
+    [alertParams.criteria]
+  );
+
   // Test to see if any of the group fields in groupBy are already filtered down to a single
   // group by the filterQuery. If this is the case, then a groupBy is unnecessary, as it would only
   // ever produce one group instance
@@ -358,6 +363,7 @@ export const Expressions: React.FC<Props> = (props) => {
       >
         <EuiPanel color="subdued">
           <EuiCheckbox
+            disabled={disableNoData}
             id="metrics-alert-no-data-toggle"
             label={
               <>
@@ -365,10 +371,13 @@ export const Expressions: React.FC<Props> = (props) => {
                   defaultMessage: "Alert me if there's no data",
                 })}{' '}
                 <EuiToolTip
-                  content={i18n.translate('xpack.infra.metrics.alertFlyout.noDataHelpText', {
-                    defaultMessage:
-                      'Enable this to trigger the action if the metric(s) do not report any data over the expected time period, or if the alert fails to query Elasticsearch',
-                  })}
+                  content={
+                    (disableNoData ? `${docCountNoDataDisabledHelpText} ` : '') +
+                    i18n.translate('xpack.infra.metrics.alertFlyout.noDataHelpText', {
+                      defaultMessage:
+                        'Enable this to trigger the action if the metric(s) do not report any data over the expected time period, or if the alert fails to query Elasticsearch',
+                    })
+                  }
                 >
                   <EuiIcon type="questionInCircle" color="subdued" />
                 </EuiToolTip>
@@ -488,16 +497,19 @@ export const Expressions: React.FC<Props> = (props) => {
               defaultMessage: 'Alert me if a group stops reporting data',
             })}{' '}
             <EuiToolTip
-              content={i18n.translate('xpack.infra.metrics.alertFlyout.groupDisappearHelpText', {
-                defaultMessage:
-                  'Enable this to trigger the action if a previously detected group begins to report no results. This is not recommended for dynamically scaling infrastructures that may rapidly start and stop nodes automatically.',
-              })}
+              content={
+                (disableNoData ? `${docCountNoDataDisabledHelpText} ` : '') +
+                i18n.translate('xpack.infra.metrics.alertFlyout.groupDisappearHelpText', {
+                  defaultMessage:
+                    'Enable this to trigger the action if a previously detected group begins to report no results. This is not recommended for dynamically scaling infrastructures that may rapidly start and stop nodes automatically.',
+                })
+              }
             >
               <EuiIcon type="questionInCircle" color="subdued" />
             </EuiToolTip>
           </>
         }
-        disabled={!hasGroupBy}
+        disabled={disableNoData || !hasGroupBy}
         checked={Boolean(hasGroupBy && alertParams.alertOnGroupDisappear)}
         onChange={(e) => setAlertParams('alertOnGroupDisappear', e.target.checked)}
       />
@@ -506,6 +518,13 @@ export const Expressions: React.FC<Props> = (props) => {
   );
 };
 
+const docCountNoDataDisabledHelpText = i18n.translate(
+  'xpack.infra.metrics.alertFlyout.docCountNoDataDisabledHelpText',
+  {
+    defaultMessage: '[This setting is not applicable to the Document Count aggregator.]',
+  }
+);
+
 // required for dynamic import
 // eslint-disable-next-line import/no-default-export
 export default Expressions;
diff --git a/x-pack/plugins/monitoring/server/deprecations.ts b/x-pack/plugins/monitoring/server/deprecations.ts
index 42868e3fa2584..14c3b9cdc6474 100644
--- a/x-pack/plugins/monitoring/server/deprecations.ts
+++ b/x-pack/plugins/monitoring/server/deprecations.ts
@@ -23,27 +23,39 @@ export const deprecations = ({
 }: ConfigDeprecationFactory): ConfigDeprecation[] => {
   return [
     // This order matters. The "blanket rename" needs to happen at the end
-    renameFromRoot('xpack.monitoring.max_bucket_size', 'monitoring.ui.max_bucket_size'),
-    renameFromRoot('xpack.monitoring.min_interval_seconds', 'monitoring.ui.min_interval_seconds'),
+    renameFromRoot('xpack.monitoring.max_bucket_size', 'monitoring.ui.max_bucket_size', {
+      level: 'warning',
+    }),
+    renameFromRoot('xpack.monitoring.min_interval_seconds', 'monitoring.ui.min_interval_seconds', {
+      level: 'warning',
+    }),
     renameFromRoot(
       'xpack.monitoring.show_license_expiration',
-      'monitoring.ui.show_license_expiration'
+      'monitoring.ui.show_license_expiration',
+      { level: 'warning' }
     ),
     renameFromRoot(
       'xpack.monitoring.ui.container.elasticsearch.enabled',
-      'monitoring.ui.container.elasticsearch.enabled'
+      'monitoring.ui.container.elasticsearch.enabled',
+      { level: 'warning' }
     ),
     renameFromRoot(
       'xpack.monitoring.ui.container.logstash.enabled',
-      'monitoring.ui.container.logstash.enabled'
+      'monitoring.ui.container.logstash.enabled',
+      { level: 'warning' }
     ),
-    renameFromRoot('xpack.monitoring.elasticsearch', 'monitoring.ui.elasticsearch'),
-    renameFromRoot('xpack.monitoring.ccs.enabled', 'monitoring.ui.ccs.enabled'),
+    renameFromRoot('xpack.monitoring.elasticsearch', 'monitoring.ui.elasticsearch', {
+      level: 'warning',
+    }),
+    renameFromRoot('xpack.monitoring.ccs.enabled', 'monitoring.ui.ccs.enabled', {
+      level: 'warning',
+    }),
     renameFromRoot(
       'xpack.monitoring.elasticsearch.logFetchCount',
-      'monitoring.ui.elasticsearch.logFetchCount'
+      'monitoring.ui.elasticsearch.logFetchCount',
+      { level: 'warning' }
     ),
-    renameFromRoot('xpack.monitoring', 'monitoring'),
+    renameFromRoot('xpack.monitoring', 'monitoring', { level: 'warning' }),
     (config, fromPath, addDeprecation) => {
       const emailNotificationsEnabled = get(config, 'cluster_alerts.email_notifications.enabled');
       if (emailNotificationsEnabled && !get(config, CLUSTER_ALERTS_ADDRESS_CONFIG_KEY)) {
@@ -55,11 +67,14 @@ export const deprecations = ({
               `Add [${fromPath}.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}] to your kibana configs."`,
             ],
           },
+          level: 'critical',
         });
       }
       return config;
     },
-    rename('xpack_api_polling_frequency_millis', 'licensing.api_polling_frequency'),
+    rename('xpack_api_polling_frequency_millis', 'licensing.api_polling_frequency', {
+      level: 'warning',
+    }),
 
     // TODO: Add deprecations for "monitoring.ui.elasticsearch.username: elastic" and "monitoring.ui.elasticsearch.username: kibana".
     // TODO: Add deprecations for using "monitoring.ui.elasticsearch.ssl.certificate" without "monitoring.ui.elasticsearch.ssl.key", and
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 45dcf5f7a0f7d..c6d41fbdc4b1b 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
@@ -50,7 +50,10 @@ import {
   TRANSFORM_STATES,
 } from '../../../../../common/constants';
 import { TransformStats } from '../types';
-import { metadataTransformPrefix } from '../../../../../common/endpoint/constants';
+import {
+  metadataTransformPrefix,
+  METADATA_UNITED_TRANSFORM,
+} from '../../../../../common/endpoint/constants';
 
 // not sure why this can't be imported from '../../../../common/mock/formatted_relative';
 // but sure enough it needs to be inline in this one file
@@ -1457,5 +1460,23 @@ describe('when on the endpoint list page', () => {
       const banner = await screen.findByTestId('callout-endpoints-list-transform-failed');
       expect(banner).toBeInTheDocument();
     });
+
+    it('displays correct transform id when in failed state', async () => {
+      const transforms: TransformStats[] = [
+        {
+          id: `${metadataTransformPrefix}-0.20.0`,
+          state: TRANSFORM_STATES.STARTED,
+        } as TransformStats,
+        {
+          id: `${METADATA_UNITED_TRANSFORM}-1.2.1`,
+          state: TRANSFORM_STATES.FAILED,
+        } as TransformStats,
+      ];
+      setEndpointListApiMockImplementation(coreStart.http, { transforms });
+      render();
+      const banner = await screen.findByTestId('callout-endpoints-list-transform-failed');
+      expect(banner).not.toHaveTextContent(transforms[0].id);
+      expect(banner).toHaveTextContent(transforms[1].id);
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
index 7845409353898..7332510736534 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
@@ -534,14 +534,19 @@ export const EndpointList = () => {
     return endpointsExist && !patternsError;
   }, [endpointsExist, patternsError]);
 
-  const transformFailedCalloutDescription = useMemo(
-    () => (
+  const transformFailedCalloutDescription = useMemo(() => {
+    const failingTransformIds = metadataTransformStats
+      .filter((transformStat) => WARNING_TRANSFORM_STATES.has(transformStat.state))
+      .map((transformStat) => transformStat.id)
+      .join(', ');
+
+    return (
       <>
         <FormattedMessage
           id="xpack.securitySolution.endpoint.list.transformFailed.message"
           defaultMessage="A required transform, {transformId}, is currently failing. Most of the time this can be fixed by {transformsPage}. For additional help, please visit the {docsPage}"
           values={{
-            transformId: metadataTransformStats[0]?.id || metadataTransformPrefix,
+            transformId: failingTransformIds || metadataTransformPrefix,
             transformsPage: (
               <LinkToApp
                 data-test-subj="failed-transform-restart-link"
@@ -557,7 +562,7 @@ export const EndpointList = () => {
             docsPage: (
               <EuiLink
                 data-test-subj="failed-transform-docs-link"
-                href={services?.docLinks?.links.transforms.guide}
+                href={services?.docLinks?.links.endpoints.troubleshooting}
                 target="_blank"
               >
                 <FormattedMessage
@@ -570,9 +575,8 @@ export const EndpointList = () => {
         />
         <EuiSpacer size="s" />
       </>
-    ),
-    [metadataTransformStats, services?.docLinks?.links.transforms.guide]
-  );
+    );
+  }, [metadataTransformStats, services?.docLinks?.links.endpoints.troubleshooting]);
 
   const transformFailedCallout = useMemo(() => {
     if (!showTransformFailedCallout) {
diff --git a/x-pack/test/apm_api_integration/tests/alerts/chart_preview.ts b/x-pack/test/apm_api_integration/tests/alerts/chart_preview.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/alerts/chart_preview.ts
rename to x-pack/test/apm_api_integration/tests/alerts/chart_preview.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts b/x-pack/test/apm_api_integration/tests/alerts/rule_registry.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts
rename to x-pack/test/apm_api_integration/tests/alerts/rule_registry.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/correlations/failed_transactions.ts b/x-pack/test/apm_api_integration/tests/correlations/failed_transactions.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/correlations/failed_transactions.ts
rename to x-pack/test/apm_api_integration/tests/correlations/failed_transactions.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/correlations/latency.ts b/x-pack/test/apm_api_integration/tests/correlations/latency.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/correlations/latency.ts
rename to x-pack/test/apm_api_integration/tests/correlations/latency.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_load_dist.snap b/x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_load_dist.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_load_dist.snap
rename to x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_load_dist.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_views.snap b/x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_views.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_views.snap
rename to x-pack/test/apm_api_integration/tests/csm/__snapshots__/page_views.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/csm/csm_services.ts b/x-pack/test/apm_api_integration/tests/csm/csm_services.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/csm/csm_services.ts
rename to x-pack/test/apm_api_integration/tests/csm/csm_services.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/csm/has_rum_data.ts b/x-pack/test/apm_api_integration/tests/csm/has_rum_data.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/csm/has_rum_data.ts
rename to x-pack/test/apm_api_integration/tests/csm/has_rum_data.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/csm/js_errors.ts b/x-pack/test/apm_api_integration/tests/csm/js_errors.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/csm/js_errors.ts
rename to x-pack/test/apm_api_integration/tests/csm/js_errors.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/csm/long_task_metrics.ts b/x-pack/test/apm_api_integration/tests/csm/long_task_metrics.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/csm/long_task_metrics.ts
rename to x-pack/test/apm_api_integration/tests/csm/long_task_metrics.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/csm/page_load_dist.ts b/x-pack/test/apm_api_integration/tests/csm/page_load_dist.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/csm/page_load_dist.ts
rename to x-pack/test/apm_api_integration/tests/csm/page_load_dist.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/csm/page_views.ts b/x-pack/test/apm_api_integration/tests/csm/page_views.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/csm/page_views.ts
rename to x-pack/test/apm_api_integration/tests/csm/page_views.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/csm/url_search.ts b/x-pack/test/apm_api_integration/tests/csm/url_search.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/csm/url_search.ts
rename to x-pack/test/apm_api_integration/tests/csm/url_search.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/csm/web_core_vitals.ts b/x-pack/test/apm_api_integration/tests/csm/web_core_vitals.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/csm/web_core_vitals.ts
rename to x-pack/test/apm_api_integration/tests/csm/web_core_vitals.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/dependencies/metadata.ts b/x-pack/test/apm_api_integration/tests/dependencies/metadata.spec.ts
similarity index 97%
rename from x-pack/test/apm_api_integration/tests/dependencies/metadata.ts
rename to x-pack/test/apm_api_integration/tests/dependencies/metadata.spec.ts
index e7092b31d6432..89e79751cb7ec 100644
--- a/x-pack/test/apm_api_integration/tests/dependencies/metadata.ts
+++ b/x-pack/test/apm_api_integration/tests/dependencies/metadata.spec.ts
@@ -46,6 +46,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     'Dependency metadata when data is generated',
     { config: 'basic', archives: ['apm_mappings_only_8.0.0'] },
     () => {
+      after(() => synthtraceEsClient.clean());
+
       it('returns correct metadata for the dependency', async () => {
         await generateData({ synthtraceEsClient, start, end });
         const { status, body } = await callApi();
diff --git a/x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.ts b/x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.ts
rename to x-pack/test/apm_api_integration/tests/dependencies/top_dependencies.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/error_rate/service_apis.ts b/x-pack/test/apm_api_integration/tests/error_rate/service_apis.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/error_rate/service_apis.ts
rename to x-pack/test/apm_api_integration/tests/error_rate/service_apis.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/errors/distribution.ts b/x-pack/test/apm_api_integration/tests/errors/distribution.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/errors/distribution.ts
rename to x-pack/test/apm_api_integration/tests/errors/distribution.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/errors/error_group_list.ts b/x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/errors/error_group_list.ts
rename to x-pack/test/apm_api_integration/tests/errors/error_group_list.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/errors/group_id.ts b/x-pack/test/apm_api_integration/tests/errors/group_id.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/errors/group_id.ts
rename to x-pack/test/apm_api_integration/tests/errors/group_id.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.ts b/x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.ts
rename to x-pack/test/apm_api_integration/tests/event_metadata/event_metadata.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/feature_controls.ts b/x-pack/test/apm_api_integration/tests/feature_controls.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/feature_controls.ts
rename to x-pack/test/apm_api_integration/tests/feature_controls.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/historical_data/has_data.ts b/x-pack/test/apm_api_integration/tests/historical_data/has_data.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/historical_data/has_data.ts
rename to x-pack/test/apm_api_integration/tests/historical_data/has_data.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/index.ts b/x-pack/test/apm_api_integration/tests/index.ts
index a4a58ed7bf5c2..59764cf021c4a 100644
--- a/x-pack/test/apm_api_integration/tests/index.ts
+++ b/x-pack/test/apm_api_integration/tests/index.ts
@@ -4,262 +4,23 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import glob from 'glob';
+import path from 'path';
 import { FtrProviderContext } from '../common/ftr_provider_context';
 
+const cwd = path.join(__dirname);
+
 export default function apmApiIntegrationTests({ getService, loadTestFile }: FtrProviderContext) {
   const registry = getService('registry');
 
   describe('APM API tests', function () {
     this.tags('ciGroup1');
 
-    // inspect feature
-    describe('inspect/inspect', function () {
-      loadTestFile(require.resolve('./inspect/inspect'));
-    });
-
-    // alerts
-    describe('alerts/chart_preview', function () {
-      loadTestFile(require.resolve('./alerts/chart_preview'));
-    });
-
-    describe('alerts/rule_registry', function () {
-      loadTestFile(require.resolve('./alerts/rule_registry'));
-    });
-
-    // correlations
-    describe('correlations/failed_transactions', function () {
-      loadTestFile(require.resolve('./correlations/failed_transactions'));
-    });
-
-    describe('correlations/latency', function () {
-      loadTestFile(require.resolve('./correlations/latency'));
-    });
-
-    describe('event_metadata/event_metadata', function () {
-      loadTestFile(require.resolve('./event_metadata/event_metadata'));
-    });
-
-    describe('metrics_charts/metrics_charts', function () {
-      loadTestFile(require.resolve('./metrics_charts/metrics_charts'));
-    });
-
-    describe('observability_overview/has_data', function () {
-      loadTestFile(require.resolve('./observability_overview/has_data'));
-    });
-
-    describe('observability_overview/observability_overview', function () {
-      loadTestFile(require.resolve('./observability_overview/observability_overview'));
-    });
-
-    describe('service_maps/service_maps', function () {
-      loadTestFile(require.resolve('./service_maps/service_maps'));
-    });
-
-    // Service overview
-    describe('service_overview/dependencies', function () {
-      loadTestFile(require.resolve('./service_overview/dependencies'));
-    });
-
-    describe('service_overview/instances_main_statistics', function () {
-      loadTestFile(require.resolve('./service_overview/instances_main_statistics'));
-    });
-
-    describe('service_overview/instances_detailed_statistics', function () {
-      loadTestFile(require.resolve('./service_overview/instances_detailed_statistics'));
-    });
-
-    describe('service_overview/instance_details', function () {
-      loadTestFile(require.resolve('./service_overview/instance_details'));
-    });
-
-    // Services
-    describe('services/agent', function () {
-      loadTestFile(require.resolve('./services/agent'));
-    });
-
-    describe('services/annotations', function () {
-      loadTestFile(require.resolve('./services/annotations'));
-      loadTestFile(require.resolve('./services/derived_annotations'));
-    });
-
-    describe('services/service_details', function () {
-      loadTestFile(require.resolve('./services/service_details'));
-    });
-
-    describe('services/service_icons', function () {
-      loadTestFile(require.resolve('./services/service_icons'));
-    });
-
-    describe('services/throughput', function () {
-      loadTestFile(require.resolve('./services/throughput'));
-    });
-
-    describe('service apis throughput', function () {
-      loadTestFile(require.resolve('./throughput/service_apis'));
-    });
-
-    describe('dependencies throughput', function () {
-      loadTestFile(require.resolve('./throughput/dependencies_apis'));
-    });
-
-    describe('services/top_services', function () {
-      loadTestFile(require.resolve('./services/top_services'));
-    });
-
-    describe('services/transaction_types', function () {
-      loadTestFile(require.resolve('./services/transaction_types'));
-    });
-
-    describe('services/error_groups_main_statistics', function () {
-      loadTestFile(require.resolve('./services/error_groups/error_groups_main_statistics'));
-    });
-
-    describe('services/error_groups_detailed_statistics', function () {
-      loadTestFile(require.resolve('./services/error_groups/error_groups_detailed_statistics'));
-    });
-
-    describe('services/detailed_statistics', function () {
-      loadTestFile(require.resolve('./services/services_detailed_statistics'));
-    });
-
-    // Settinges
-    describe('settings/anomaly_detection/basic', function () {
-      loadTestFile(require.resolve('./settings/anomaly_detection/basic'));
-    });
-
-    describe('settings/anomaly_detection/no_access_user', function () {
-      loadTestFile(require.resolve('./settings/anomaly_detection/no_access_user'));
-    });
-
-    describe('settings/anomaly_detection/read_user', function () {
-      loadTestFile(require.resolve('./settings/anomaly_detection/read_user'));
-    });
-
-    describe('settings/anomaly_detection/write_user', function () {
-      loadTestFile(require.resolve('./settings/anomaly_detection/write_user'));
-    });
-
-    describe('settings/agent_configuration', function () {
-      loadTestFile(require.resolve('./settings/agent_configuration'));
-    });
-
-    describe('settings/custom_link', function () {
-      loadTestFile(require.resolve('./settings/custom_link'));
-    });
-
-    // suggestions
-    describe('suggestions', function () {
-      loadTestFile(require.resolve('./suggestions/suggestions'));
-    });
-
-    // traces
-    describe('traces/top_traces', function () {
-      loadTestFile(require.resolve('./traces/top_traces'));
-    });
-    describe('/internal/apm/traces/{traceId}', function () {
-      loadTestFile(require.resolve('./traces/trace_by_id'));
-    });
-
-    // transactions
-    describe('transactions/breakdown', function () {
-      loadTestFile(require.resolve('./transactions/breakdown'));
-    });
-
-    describe('transactions/trace_samples', function () {
-      loadTestFile(require.resolve('./transactions/trace_samples'));
-    });
-
-    describe('transactions/error_rate', function () {
-      loadTestFile(require.resolve('./transactions/error_rate'));
-    });
-
-    describe('transactions/latency_overall_distribution', function () {
-      loadTestFile(require.resolve('./transactions/latency_overall_distribution'));
-    });
-
-    describe('transactions/latency', function () {
-      loadTestFile(require.resolve('./transactions/latency'));
-    });
-
-    describe('transactions/transactions_groups_main_statistics', function () {
-      loadTestFile(require.resolve('./transactions/transactions_groups_main_statistics'));
-    });
-
-    describe('transactions/transactions_groups_detailed_statistics', function () {
-      loadTestFile(require.resolve('./transactions/transactions_groups_detailed_statistics'));
-    });
-
-    // feature control
-    describe('feature_controls', function () {
-      loadTestFile(require.resolve('./feature_controls'));
-    });
-
-    // CSM
-    describe('csm/csm_services', function () {
-      loadTestFile(require.resolve('./csm/csm_services'));
-    });
-
-    describe('csm/has_rum_data', function () {
-      loadTestFile(require.resolve('./csm/has_rum_data'));
-    });
-
-    describe('csm/js_errors', function () {
-      loadTestFile(require.resolve('./csm/js_errors'));
-    });
-
-    describe('csm/long_task_metrics', function () {
-      loadTestFile(require.resolve('./csm/long_task_metrics'));
-    });
-
-    describe('csm/page_load_dist', function () {
-      loadTestFile(require.resolve('./csm/page_load_dist'));
-    });
-
-    describe('csm/page_views', function () {
-      loadTestFile(require.resolve('./csm/page_views'));
-    });
-
-    describe('csm/url_search', function () {
-      loadTestFile(require.resolve('./csm/url_search'));
-    });
-
-    describe('csm/web_core_vitals', function () {
-      loadTestFile(require.resolve('./csm/web_core_vitals'));
-    });
-
-    describe('historical_data/has_data', function () {
-      loadTestFile(require.resolve('./historical_data/has_data'));
-    });
-
-    describe('error_rate/service_apis', function () {
-      loadTestFile(require.resolve('./error_rate/service_apis'));
-    });
-
-    describe('latency/service_apis', function () {
-      loadTestFile(require.resolve('./latency/service_apis'));
-    });
-
-    // Errors
-    describe('errors/group_id', function () {
-      loadTestFile(require.resolve('./errors/group_id'));
-    });
-
-    describe('errors/distribution', function () {
-      loadTestFile(require.resolve('./errors/distribution'));
-    });
-
-    describe('errors/error_group_list', function () {
-      loadTestFile(require.resolve('./errors/error_group_list'));
-    });
-
-    // Dependencies
-    describe('dependencies/metadata', function () {
-      loadTestFile(require.resolve('./dependencies/metadata'));
-    });
-
-    describe('dependencies/top_dependencies', function () {
-      loadTestFile(require.resolve('./dependencies/top_dependencies'));
+    const tests = glob.sync('**/*.spec.ts', { cwd });
+    tests.forEach((test) => {
+      describe(test, function () {
+        loadTestFile(require.resolve(`./${test}`));
+      });
     });
 
     registry.run();
diff --git a/x-pack/test/apm_api_integration/tests/inspect/inspect.ts b/x-pack/test/apm_api_integration/tests/inspect/inspect.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/inspect/inspect.ts
rename to x-pack/test/apm_api_integration/tests/inspect/inspect.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/latency/service_apis.ts b/x-pack/test/apm_api_integration/tests/latency/service_apis.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/latency/service_apis.ts
rename to x-pack/test/apm_api_integration/tests/latency/service_apis.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.ts b/x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.ts
rename to x-pack/test/apm_api_integration/tests/metrics_charts/metrics_charts.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/observability_overview/has_data.ts b/x-pack/test/apm_api_integration/tests/observability_overview/has_data.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/observability_overview/has_data.ts
rename to x-pack/test/apm_api_integration/tests/observability_overview/has_data.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts
rename to x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts
rename to x-pack/test/apm_api_integration/tests/service_maps/service_maps.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap
rename to x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.snap b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.snap
rename to x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.ts b/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.ts
rename to x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts b/x-pack/test/apm_api_integration/tests/service_overview/instance_details.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts
rename to x-pack/test/apm_api_integration/tests/service_overview/instance_details.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.ts
rename to x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts
rename to x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_detailed_statistics.snap b/x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_detailed_statistics.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_detailed_statistics.snap
rename to x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_detailed_statistics.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/services/agent.ts b/x-pack/test/apm_api_integration/tests/services/agent.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/agent.ts
rename to x-pack/test/apm_api_integration/tests/services/agent.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/services/annotations.ts b/x-pack/test/apm_api_integration/tests/services/annotations.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/annotations.ts
rename to x-pack/test/apm_api_integration/tests/services/annotations.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/services/derived_annotations.ts b/x-pack/test/apm_api_integration/tests/services/derived_annotations.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/derived_annotations.ts
rename to x-pack/test/apm_api_integration/tests/services/derived_annotations.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.ts
rename to x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_detailed_statistics.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.ts b/x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.ts
rename to x-pack/test/apm_api_integration/tests/services/error_groups/error_groups_main_statistics.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/services/service_details.ts b/x-pack/test/apm_api_integration/tests/services/service_details.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/service_details.ts
rename to x-pack/test/apm_api_integration/tests/services/service_details.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/services/service_icons.ts b/x-pack/test/apm_api_integration/tests/services/service_icons.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/service_icons.ts
rename to x-pack/test/apm_api_integration/tests/services/service_icons.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.ts
rename to x-pack/test/apm_api_integration/tests/services/services_detailed_statistics.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/services/throughput.ts b/x-pack/test/apm_api_integration/tests/services/throughput.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/throughput.ts
rename to x-pack/test/apm_api_integration/tests/services/throughput.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/services/top_services.ts b/x-pack/test/apm_api_integration/tests/services/top_services.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/top_services.ts
rename to x-pack/test/apm_api_integration/tests/services/top_services.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/services/transaction_types.ts b/x-pack/test/apm_api_integration/tests/services/transaction_types.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/services/transaction_types.ts
rename to x-pack/test/apm_api_integration/tests/services/transaction_types.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/settings/agent_configuration.ts b/x-pack/test/apm_api_integration/tests/settings/agent_configuration.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/settings/agent_configuration.ts
rename to x-pack/test/apm_api_integration/tests/settings/agent_configuration.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/settings/anomaly_detection/basic.ts b/x-pack/test/apm_api_integration/tests/settings/anomaly_detection/basic.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/settings/anomaly_detection/basic.ts
rename to x-pack/test/apm_api_integration/tests/settings/anomaly_detection/basic.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/settings/anomaly_detection/no_access_user.ts b/x-pack/test/apm_api_integration/tests/settings/anomaly_detection/no_access_user.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/settings/anomaly_detection/no_access_user.ts
rename to x-pack/test/apm_api_integration/tests/settings/anomaly_detection/no_access_user.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/settings/anomaly_detection/read_user.ts b/x-pack/test/apm_api_integration/tests/settings/anomaly_detection/read_user.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/settings/anomaly_detection/read_user.ts
rename to x-pack/test/apm_api_integration/tests/settings/anomaly_detection/read_user.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/settings/anomaly_detection/write_user.ts b/x-pack/test/apm_api_integration/tests/settings/anomaly_detection/write_user.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/settings/anomaly_detection/write_user.ts
rename to x-pack/test/apm_api_integration/tests/settings/anomaly_detection/write_user.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/settings/custom_link.ts b/x-pack/test/apm_api_integration/tests/settings/custom_link.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/settings/custom_link.ts
rename to x-pack/test/apm_api_integration/tests/settings/custom_link.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/suggestions/suggestions.ts b/x-pack/test/apm_api_integration/tests/suggestions/suggestions.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/suggestions/suggestions.ts
rename to x-pack/test/apm_api_integration/tests/suggestions/suggestions.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.ts b/x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.ts
rename to x-pack/test/apm_api_integration/tests/throughput/dependencies_apis.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/throughput/service_apis.ts b/x-pack/test/apm_api_integration/tests/throughput/service_apis.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/throughput/service_apis.ts
rename to x-pack/test/apm_api_integration/tests/throughput/service_apis.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.snap b/x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.snap
rename to x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/traces/top_traces.ts b/x-pack/test/apm_api_integration/tests/traces/top_traces.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/traces/top_traces.ts
rename to x-pack/test/apm_api_integration/tests/traces/top_traces.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/traces/trace_by_id.tsx b/x-pack/test/apm_api_integration/tests/traces/trace_by_id.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/traces/trace_by_id.tsx
rename to x-pack/test/apm_api_integration/tests/traces/trace_by_id.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/breakdown.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/breakdown.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/__snapshots__/breakdown.snap
rename to x-pack/test/apm_api_integration/tests/transactions/__snapshots__/breakdown.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap
rename to x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.snap
rename to x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/top_transaction_groups.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/top_transaction_groups.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/__snapshots__/top_transaction_groups.snap
rename to x-pack/test/apm_api_integration/tests/transactions/__snapshots__/top_transaction_groups.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transaction_charts.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transaction_charts.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transaction_charts.snap
rename to x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transaction_charts.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_charts.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_charts.spec.snap
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_charts.snap
rename to x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_charts.spec.snap
diff --git a/x-pack/test/apm_api_integration/tests/transactions/breakdown.ts b/x-pack/test/apm_api_integration/tests/transactions/breakdown.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/breakdown.ts
rename to x-pack/test/apm_api_integration/tests/transactions/breakdown.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts b/x-pack/test/apm_api_integration/tests/transactions/error_rate.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/error_rate.ts
rename to x-pack/test/apm_api_integration/tests/transactions/error_rate.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/transactions/latency.ts b/x-pack/test/apm_api_integration/tests/transactions/latency.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/latency.ts
rename to x-pack/test/apm_api_integration/tests/transactions/latency.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/transactions/latency_overall_distribution.ts b/x-pack/test/apm_api_integration/tests/transactions/latency_overall_distribution.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/latency_overall_distribution.ts
rename to x-pack/test/apm_api_integration/tests/transactions/latency_overall_distribution.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/transactions/trace_samples.ts b/x-pack/test/apm_api_integration/tests/transactions/trace_samples.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/trace_samples.ts
rename to x-pack/test/apm_api_integration/tests/transactions/trace_samples.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts
rename to x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.spec.ts
diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.spec.ts
similarity index 100%
rename from x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts
rename to x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.spec.ts
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index.ts b/x-pack/test/functional/apps/ml/data_visualizer/index.ts
index c1e5d0b4b6aae..3bb8e3d728318 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index.ts
@@ -13,6 +13,7 @@ export default function ({ loadTestFile }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./index_data_visualizer'));
     loadTestFile(require.resolve('./index_data_visualizer_grid_in_discover'));
+    loadTestFile(require.resolve('./index_data_visualizer_grid_in_dashboard'));
     loadTestFile(require.resolve('./index_data_visualizer_actions_panel'));
     loadTestFile(require.resolve('./index_data_visualizer_index_pattern_management'));
     loadTestFile(require.resolve('./file_data_visualizer'));
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts
index ff0d489293682..bcdf978d46cad 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts
@@ -9,6 +9,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 import { TestData, MetricFieldVisConfig } from './types';
 import {
   farequoteDataViewTestData,
+  farequoteKQLFiltersSearchTestData,
   farequoteKQLSearchTestData,
   farequoteLuceneSearchTestData,
   sampleLogTestData,
@@ -76,6 +77,13 @@ export default function ({ getService }: FtrProviderContext) {
       );
       await ml.dataVisualizerIndexBased.assertTotalFieldsCount(testData.expected.totalFieldsCount);
 
+      if (testData.expected.filters) {
+        await ml.testExecution.logTestStep('displays filters in filter bar correctly');
+        for (const filter of testData.expected.filters!) {
+          await ml.dataVisualizerIndexBased.assertFilterBarFilterContent(filter);
+        }
+      }
+
       await ml.testExecution.logTestStep(
         'displays details for metric fields and non-metric fields correctly'
       );
@@ -96,7 +104,9 @@ export default function ({ getService }: FtrProviderContext) {
           fieldRow.fieldName!,
           fieldRow.docCountFormatted,
           fieldRow.exampleCount,
-          fieldRow.viewableInLens
+          fieldRow.viewableInLens,
+          false,
+          fieldRow.exampleContent
         );
       }
 
@@ -150,6 +160,7 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.testResources.createIndexPatternIfNeeded('ft_module_sample_logs', '@timestamp');
       await ml.testResources.createSavedSearchFarequoteLuceneIfNeeded();
       await ml.testResources.createSavedSearchFarequoteKueryIfNeeded();
+      await ml.testResources.createSavedSearchFarequoteFilterAndKueryIfNeeded();
       await ml.testResources.setKibanaTimeZoneToUTC();
 
       await ml.securityUI.loginAsMlPowerUser();
@@ -182,6 +193,14 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       runTests(farequoteLuceneSearchTestData);
+
+      it(`${farequoteKQLFiltersSearchTestData.suiteTitle} loads the data visualizer selector page`, async () => {
+        // Start navigation from the base of the ML app.
+        await ml.navigation.navigateToMl();
+        await ml.navigation.navigateToDataVisualizer();
+      });
+
+      runTests(farequoteKQLFiltersSearchTestData);
     });
 
     describe('with module_sample_logs ', function () {
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_grid_in_dashboard.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_grid_in_dashboard.ts
new file mode 100644
index 0000000000000..97c6c06bc3225
--- /dev/null
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_grid_in_dashboard.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { TestData, MetricFieldVisConfig } from './types';
+import { farequoteLuceneFiltersSearchTestData } from './index_test_data';
+
+const SHOW_FIELD_STATISTICS = 'discover:showFieldStatistics';
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const PageObjects = getPageObjects(['common', 'discover', 'timePicker', 'settings', 'dashboard']);
+  const ml = getService('ml');
+  const retry = getService('retry');
+  const dashboardAddPanel = getService('dashboardAddPanel');
+
+  function runTests(testData: TestData) {
+    const savedSearchTitle = `Field stats for ${testData.suiteTitle} ${Date.now()}`;
+    const dashboardTitle = `Dashboard for ${testData.suiteTitle} ${Date.now()}`;
+    const startTime = 'Jan 1, 2016 @ 00:00:00.000';
+    const endTime = 'Nov 1, 2020 @ 00:00:00.000';
+
+    describe(`with ${testData.suiteTitle}`, function () {
+      after(async function () {
+        await ml.testResources.deleteSavedSearchByTitle(savedSearchTitle);
+        await ml.testResources.deleteDashboardByTitle(dashboardTitle);
+      });
+
+      it(`saves search with Field statistics table in Discover`, async function () {
+        await ml.testResources.setAdvancedSettingProperty(SHOW_FIELD_STATISTICS, true);
+
+        await PageObjects.common.navigateToApp('discover');
+        if (testData.isSavedSearch) {
+          await retry.tryForTime(2 * 1000, async () => {
+            await PageObjects.discover.loadSavedSearch(testData.sourceIndexOrSavedSearch);
+          });
+        } else {
+          await ml.dashboardEmbeddables.selectDiscoverIndexPattern(
+            testData.sourceIndexOrSavedSearch
+          );
+        }
+        await PageObjects.timePicker.setAbsoluteRange(startTime, endTime);
+
+        await PageObjects.discover.assertViewModeToggleExists();
+        await PageObjects.discover.clickViewModeFieldStatsButton();
+        await ml.testExecution.logTestStep('saves as new search');
+        await PageObjects.discover.saveSearch(savedSearchTitle, true);
+      });
+
+      it(`displays Field statistics table in Dashboard when enabled`, async function () {
+        await PageObjects.common.navigateToApp('dashboard');
+        await PageObjects.dashboard.gotoDashboardLandingPage();
+        await PageObjects.dashboard.clickNewDashboard();
+        await dashboardAddPanel.addSavedSearch(savedSearchTitle);
+        await PageObjects.dashboard.waitForRenderComplete();
+
+        await PageObjects.timePicker.setAbsoluteRange(startTime, endTime);
+        await PageObjects.dashboard.waitForRenderComplete();
+
+        for (const fieldRow of testData.expected.metricFields as Array<
+          Required<MetricFieldVisConfig>
+        >) {
+          await ml.dataVisualizerTable.assertNumberFieldContents(
+            fieldRow.fieldName,
+            fieldRow.docCountFormatted,
+            fieldRow.topValuesCount,
+            fieldRow.viewableInLens
+          );
+        }
+
+        for (const fieldRow of testData.expected.nonMetricFields!) {
+          await ml.dataVisualizerTable.assertNonMetricFieldContents(
+            fieldRow.type,
+            fieldRow.fieldName!,
+            fieldRow.docCountFormatted,
+            fieldRow.exampleCount,
+            fieldRow.viewableInLens,
+            false,
+            fieldRow.exampleContent
+          );
+        }
+
+        await PageObjects.dashboard.saveDashboard(dashboardTitle);
+      });
+
+      it(`doesn't display Field statistics table in Dashboard when disabled`, async function () {
+        await ml.testResources.setAdvancedSettingProperty(SHOW_FIELD_STATISTICS, false);
+
+        await PageObjects.common.navigateToApp('dashboard');
+        await PageObjects.dashboard.gotoDashboardEditMode(dashboardTitle);
+        await PageObjects.dashboard.waitForRenderComplete();
+
+        await dashboardAddPanel.addSavedSearch(savedSearchTitle);
+        await PageObjects.dashboard.waitForRenderComplete();
+
+        await PageObjects.timePicker.setAbsoluteRange(startTime, endTime);
+        await PageObjects.dashboard.waitForRenderComplete();
+
+        await PageObjects.discover.assertFieldStatsTableNotExists();
+        await PageObjects.dashboard.saveDashboard(dashboardTitle);
+      });
+    });
+  }
+
+  describe('field statistics in Dashboard', function () {
+    before(async function () {
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+      await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
+      await ml.testResources.createSavedSearchFarequoteFilterAndLuceneIfNeeded();
+      await ml.securityUI.loginAsMlPowerUser();
+    });
+
+    after(async function () {
+      await ml.testResources.clearAdvancedSettingProperty(SHOW_FIELD_STATISTICS);
+    });
+
+    runTests(farequoteLuceneFiltersSearchTestData);
+  });
+}
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_grid_in_discover.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_grid_in_discover.ts
index ba24684e13036..fff2c6fdbf232 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_grid_in_discover.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_grid_in_discover.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { TestData, MetricFieldVisConfig } from './types';
 
@@ -22,39 +21,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const PageObjects = getPageObjects(['common', 'discover', 'timePicker', 'settings']);
   const ml = getService('ml');
-  const testSubjects = getService('testSubjects');
   const retry = getService('retry');
-  const toasts = getService('toasts');
 
-  const selectIndexPattern = async (indexPattern: string) => {
-    await retry.tryForTime(2 * 1000, async () => {
-      await PageObjects.discover.selectIndexPattern(indexPattern);
-      const indexPatternTitle = await testSubjects.getVisibleText('indexPattern-switch-link');
-      expect(indexPatternTitle).to.be(indexPattern);
-    });
-  };
-
-  const clearAdvancedSetting = async (propertyName: string) => {
-    await retry.tryForTime(2 * 1000, async () => {
-      await PageObjects.common.navigateToUrl('management', 'kibana/settings', {
-        shouldUseHashForSubUrl: false,
-      });
-      if ((await PageObjects.settings.getAdvancedSettingCheckbox(propertyName)) === 'true') {
-        await PageObjects.settings.clearAdvancedSettings(propertyName);
-      }
-    });
-  };
-
-  const setAdvancedSettingCheckbox = async (propertyName: string, checkedState: boolean) => {
-    await retry.tryForTime(2 * 1000, async () => {
-      await PageObjects.common.navigateToUrl('management', 'kibana/settings', {
-        shouldUseHashForSubUrl: false,
-      });
-      await testSubjects.click('settings');
-      await toasts.dismissAllToasts();
-      await PageObjects.settings.toggleAdvancedSettingCheckbox(propertyName, checkedState);
-    });
-  };
+  const startTime = 'Jan 1, 2016 @ 00:00:00.000';
+  const endTime = 'Nov 1, 2020 @ 00:00:00.000';
 
   function runTestsWhenDisabled(testData: TestData) {
     it('should not show view mode toggle or Field stats table', async function () {
@@ -64,13 +34,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           await PageObjects.discover.loadSavedSearch(testData.sourceIndexOrSavedSearch);
         });
       } else {
-        await selectIndexPattern(testData.sourceIndexOrSavedSearch);
+        await ml.dashboardEmbeddables.selectDiscoverIndexPattern(testData.sourceIndexOrSavedSearch);
       }
 
-      await PageObjects.timePicker.setAbsoluteRange(
-        'Jan 1, 2016 @ 00:00:00.000',
-        'Nov 1, 2020 @ 00:00:00.000'
-      );
+      await PageObjects.timePicker.setAbsoluteRange(startTime, endTime);
 
       await PageObjects.discover.assertViewModeToggleNotExists();
       await PageObjects.discover.assertFieldStatsTableNotExists();
@@ -86,12 +53,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
             await PageObjects.discover.loadSavedSearch(testData.sourceIndexOrSavedSearch);
           });
         } else {
-          await selectIndexPattern(testData.sourceIndexOrSavedSearch);
+          await ml.dashboardEmbeddables.selectDiscoverIndexPattern(
+            testData.sourceIndexOrSavedSearch
+          );
         }
-        await PageObjects.timePicker.setAbsoluteRange(
-          'Jan 1, 2016 @ 00:00:00.000',
-          'Nov 1, 2020 @ 00:00:00.000'
-        );
+        await PageObjects.timePicker.setAbsoluteRange(startTime, endTime);
 
         await PageObjects.discover.assertHitCount(testData.expected.totalDocCountFormatted);
         await PageObjects.discover.assertViewModeToggleExists();
@@ -140,16 +106,16 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async function () {
-      await clearAdvancedSetting(SHOW_FIELD_STATISTICS);
+      await ml.testResources.clearAdvancedSettingProperty(SHOW_FIELD_STATISTICS);
     });
 
     describe('when enabled', function () {
       before(async function () {
-        await setAdvancedSettingCheckbox(SHOW_FIELD_STATISTICS, true);
+        await ml.testResources.setAdvancedSettingProperty(SHOW_FIELD_STATISTICS, true);
       });
 
       after(async function () {
-        await clearAdvancedSetting(SHOW_FIELD_STATISTICS);
+        await ml.testResources.clearAdvancedSettingProperty(SHOW_FIELD_STATISTICS);
       });
 
       runTests(farequoteDataViewTestData);
@@ -163,7 +129,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     describe('when disabled', function () {
       before(async function () {
         // Ensure that the setting is set to default state which is false
-        await setAdvancedSettingCheckbox(SHOW_FIELD_STATISTICS, false);
+        await ml.testResources.setAdvancedSettingProperty(SHOW_FIELD_STATISTICS, false);
       });
 
       runTestsWhenDisabled(farequoteDataViewTestData);
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts
index 6dd782487fdf8..b4279e9c2c440 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_test_data.ts
@@ -213,6 +213,7 @@ export const farequoteKQLFiltersSearchTestData: TestData = {
     { size: 5000, expected: { field: '@timestamp', docCountFormatted: '5000 (100%)' } },
   ],
   expected: {
+    filters: [{ key: 'airline', value: 'ASA' }],
     totalDocCountFormatted: '5,674',
     metricFields: [
       {
@@ -408,6 +409,7 @@ export const farequoteLuceneFiltersSearchTestData: TestData = {
     { size: 5000, expected: { field: '@timestamp', docCountFormatted: '5000 (100%)' } },
   ],
   expected: {
+    filters: [{ key: 'airline', value: 'ASA' }],
     totalDocCountFormatted: '5,673',
     metricFields: [
       {
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/types.ts b/x-pack/test/functional/apps/ml/data_visualizer/types.ts
index 5c3f890dba561..dc38bc31f568b 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/types.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/types.ts
@@ -33,6 +33,13 @@ export interface TestData {
     expected: { field: string; docCountFormatted: string };
   }>;
   expected: {
+    filters?: Array<{
+      key: string;
+      value: string;
+      enabled?: boolean;
+      pinned?: boolean;
+      negated?: boolean;
+    }>;
     totalDocCountFormatted: string;
     metricFields?: MetricFieldVisConfig[];
     nonMetricFields?: NonMetricFieldVisConfig[];
diff --git a/x-pack/test/functional/services/ml/dashboard_embeddables.ts b/x-pack/test/functional/services/ml/dashboard_embeddables.ts
index 5c55a16698cb6..1eb4e25a4edd5 100644
--- a/x-pack/test/functional/services/ml/dashboard_embeddables.ts
+++ b/x-pack/test/functional/services/ml/dashboard_embeddables.ts
@@ -10,13 +10,14 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 import { MlDashboardJobSelectionTable } from './dashboard_job_selection_table';
 
 export function MachineLearningDashboardEmbeddablesProvider(
-  { getService }: FtrProviderContext,
+  { getService, getPageObjects }: FtrProviderContext,
   mlDashboardJobSelectionTable: MlDashboardJobSelectionTable
 ) {
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
   const find = getService('find');
   const dashboardAddPanel = getService('dashboardAddPanel');
+  const PageObjects = getPageObjects(['discover']);
 
   return {
     async assertAnomalyChartsEmbeddableInitializerExists() {
@@ -112,5 +113,13 @@ export function MachineLearningDashboardEmbeddablesProvider(
         await mlDashboardJobSelectionTable.assertJobSelectionTableExists();
       });
     },
+
+    async selectDiscoverIndexPattern(indexPattern: string) {
+      await retry.tryForTime(2 * 1000, async () => {
+        await PageObjects.discover.selectIndexPattern(indexPattern);
+        const indexPatternTitle = await testSubjects.getVisibleText('indexPattern-switch-link');
+        expect(indexPatternTitle).to.be(indexPattern);
+      });
+    },
   };
 }
diff --git a/x-pack/test/functional/services/ml/data_visualizer_index_based.ts b/x-pack/test/functional/services/ml/data_visualizer_index_based.ts
index 6883946452629..82ec33452a5b9 100644
--- a/x-pack/test/functional/services/ml/data_visualizer_index_based.ts
+++ b/x-pack/test/functional/services/ml/data_visualizer_index_based.ts
@@ -16,6 +16,7 @@ export function MachineLearningDataVisualizerIndexBasedProvider({
   const retry = getService('retry');
   const PageObjects = getPageObjects(['discover']);
   const queryBar = getService('queryBar');
+  const filterBar = getService('filterBar');
 
   return {
     async assertTimeRangeSelectorSectionExists() {
@@ -208,5 +209,27 @@ export function MachineLearningDataVisualizerIndexBasedProvider({
         );
       });
     },
+
+    async assertFilterBarFilterContent(filter: {
+      key: string;
+      value: string;
+      enabled?: boolean;
+      pinned?: boolean;
+      negated?: boolean;
+    }) {
+      await retry.waitForWithTimeout(
+        `filter ${JSON.stringify(filter)} to exist`,
+        2000,
+        async () => {
+          return await filterBar.hasFilter(
+            filter.key,
+            filter.value,
+            filter.enabled,
+            filter.pinned,
+            filter.negated
+          );
+        }
+      );
+    },
   };
 }
diff --git a/x-pack/test/functional/services/ml/security_common.ts b/x-pack/test/functional/services/ml/security_common.ts
index 925565143bda0..7af8312855357 100644
--- a/x-pack/test/functional/services/ml/security_common.ts
+++ b/x-pack/test/functional/services/ml/security_common.ts
@@ -144,7 +144,9 @@ export function MachineLearningSecurityCommonProvider({ getService }: FtrProvide
           // such as "View in Lens", "Add to Dashboard", and creating anomaly detection rules. These feature privileges are the minimal ones
           // necessary to satisfy all of those functional tests.
           feature: {
-            discover: ['read'],
+            // FIXME: We need permission to save search in Discover to test the data viz embeddable
+            // change permission back to read once tests are moved out of ML
+            discover: ['all'],
             visualize: ['read'],
             dashboard: ['all'],
             actions: ['all'],
diff --git a/x-pack/test/functional/services/ml/test_resources.ts b/x-pack/test/functional/services/ml/test_resources.ts
index 071db63125a55..affd317d22e81 100644
--- a/x-pack/test/functional/services/ml/test_resources.ts
+++ b/x-pack/test/functional/services/ml/test_resources.ts
@@ -509,5 +509,18 @@ export function MachineLearningTestResourcesProvider({ getService }: FtrProvider
       log.debug(` > found version '${packageVersion}'`);
       return packageVersion;
     },
+
+    async setAdvancedSettingProperty(
+      propertyName: string,
+      propertyValue: string | number | boolean
+    ) {
+      await kibanaServer.uiSettings.update({
+        [propertyName]: propertyValue,
+      });
+    },
+
+    async clearAdvancedSettingProperty(propertyName: string) {
+      await kibanaServer.uiSettings.unset(propertyName);
+    },
   };
 }
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts
index 51a70026339c9..51aae6f4d134c 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alert_create_flyout.ts
@@ -104,7 +104,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     await testSubjects.click('test.always-firing-SelectOption');
   }
 
-  describe('create alert', function () {
+  // Failing: See https://github.com/elastic/kibana/issues/89397
+  describe.skip('create alert', function () {
     before(async () => {
       await pageObjects.common.navigateToApp('triggersActions');
       await testSubjects.click('rulesTab');