diff --git a/.gitignore b/.gitignore
index efb5c57774633..02b20da297fc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ package-lock.json
 *.sublime-*
 npm-debug.log*
 .tern-project
+x-pack/legacy/plugins/apm/tsconfig.json
+apm.tsconfig.json
diff --git a/docs/getting-started/tutorial-dashboard.asciidoc b/docs/getting-started/tutorial-dashboard.asciidoc
index aab93eb51ca23..87a1e38efcfe0 100644
--- a/docs/getting-started/tutorial-dashboard.asciidoc
+++ b/docs/getting-started/tutorial-dashboard.asciidoc
@@ -2,11 +2,12 @@
 === Add visualizations to a dashboard
 
 A dashboard is a collection of visualizations that you can arrange and share.
-You'll build a dashboard that contains the visualizations you saved during
+You'll build a dashboard that contains the visualizations and map that you saved during
 this tutorial.
 
 . Open *Dashboard*.
 . On the Dashboard overview page, click *Create new dashboard*.
+. Set the time filter to May 18, 2015 to May 20, 2015.
 . Click *Add* in the menu bar.
 . Add *Bar Example*, *Map Example*, *Markdown Example*, and *Pie Example*.
 +
@@ -26,12 +27,12 @@ is on the lower right.
 
 ==== Inspect the data
 
-Seeing visualizations of your data is great, 
+Seeing visualizations of your data is great,
 but sometimes you need to look at the actual data to
 understand what's really going on. You can inspect the data behind any visualization
 and view the {es} query used to retrieve it.
 
-. In the dashboard, hover the pointer over the pie chart, and then click the icon in the upper right. 
+. In the dashboard, hover the pointer over the pie chart, and then click the icon in the upper right.
 . From the *Options* menu, select *Inspect*.
 +
 [role="screenshot"]
diff --git a/docs/getting-started/tutorial-visualizing.asciidoc b/docs/getting-started/tutorial-visualizing.asciidoc
index 5e61475cf2839..a16343aa4850a 100644
--- a/docs/getting-started/tutorial-visualizing.asciidoc
+++ b/docs/getting-started/tutorial-visualizing.asciidoc
@@ -3,11 +3,11 @@
 
 In the Visualize application, you can shape your data using a variety
 of charts, tables, and maps, and more. In this tutorial, you'll create four
-visualizations: 
+visualizations:
 
 * <<tutorial-visualize-pie, Pie chart>>
 * <<tutorial-visualize-bar, Bar chart>>
-* <<tutorial-visualize-map, Coordinate map>>
+* <<tutorial-visualize-map, Map>>
 * <<tutorial-visualize-markdown, Markdown widget>>
 
 [float]
@@ -25,7 +25,7 @@ types in Kibana.
 image::images/tutorial-visualize-wizard-step-1.png[]
 . Click *Pie*.
 
-. In *Choose a source*, select the `ba*` index pattern. 
+. In *Choose a source*, select the `ba*` index pattern.
 +
 Initially, the pie contains a single "slice."
 That's because the default search matched all documents.
@@ -76,7 +76,7 @@ in a ring around the balance ranges.
 [role="screenshot"]
 image::images/tutorial-visualize-pie-3.png[]
 
-. To save this chart so you can use it later, click *Save* in 
+. To save this chart so you can use it later, click *Save* in
 the top menu bar and enter `Pie Example`.
 
 [float]
@@ -123,14 +123,36 @@ you did at the beginning of the tutorial, when you marked the `play_name` field
 as `not analyzed`.
 
 [float]
-[[tutorial-visualize-map]]
-=== Coordinate map
+[[tutorial-visualize-markdown]]
+=== Markdown
 
-Using a coordinate map, you can visualize geographic information in the log file sample data.
+Create a Markdown widget to add formatted text to your dashboard.
+
+. Create a *Markdown* visualization.
+. Copy the following text into the text box.
++
+[source,markdown]
+# This is a tutorial dashboard!
+The Markdown widget uses **markdown** syntax.
+> Blockquotes in Markdown use the > character.
 
-. Create a *Coordinate map* and set the search source to `logstash*`.
+. Click *Apply changes* image:images/apply-changes-button.png[].
 +
-You haven't defined any buckets yet, so the visualization is a map of the world.
+The Markdown renders in the preview pane.
++
+[role="screenshot"]
+image::images/tutorial-visualize-md-2.png[]
+
+. *Save* this visualization with the name `Markdown Example`.
+
+[float]
+[[tutorial-visualize-map]]
+=== Map
+
+Using <<maps>>, you can visualize geographic information in the log file sample data.
+
+. Click *Maps* in the New Visualization
+menu to create a Map.
 
 . Set the time.
 .. In the time filter, click *Show dates*.
@@ -138,14 +160,19 @@ You haven't defined any buckets yet, so the visualization is a map of the world.
 .. Set the *Start date* to May 18, 2015.
 .. In the time filter, click *now*, then *Absolute*.
 .. Set the *End date* to May 20, 2015.
+.. Click *Update*
 
 . Map the geo coordinates from the log files.
 
-.. In the *Buckets* pane, click *Add > Geo coordinates*.
-.. Set *Aggregation* to *Geohash*.
-.. Set *Field* to *geo.coordinates*.
+.. Click *Add layer*.
+.. Click the *Grid aggregation* data source.
+.. Set *Index pattern* to *logstash*.
+.. Click the *Add layer* button.
 
-. Click *Apply changes* image:images/apply-changes-button.png[].
+. Set the layer style.
+.. For *Fill color*, select the yellow to red color ramp.
+.. For *Border color*, select white.
+.. Click *Save & close*.
 +
 The map now looks like this:
 +
@@ -155,26 +182,3 @@ image::images/tutorial-visualize-map-2.png[]
 . Navigate the map by clicking and dragging.  Use the controls
 on the left to zoom the map and set filters.
 . *Save* this map with the name `Map Example`.
-
-[float]
-[[tutorial-visualize-markdown]]
-=== Markdown
-
-The final visualization is a Markdown widget that renders formatted text.
-
-. Create a *Markdown* visualization.
-. Copy the following text into the text box.
-+
-[source,markdown]
-# This is a tutorial dashboard!
-The Markdown widget uses **markdown** syntax.
-> Blockquotes in Markdown use the > character.
-
-. Click *Apply changes* image:images/apply-changes-button.png[].
-+
-The Markdown renders in the preview pane.
-+
-[role="screenshot"]
-image::images/tutorial-visualize-md-2.png[]
-
-. *Save* this visualization with the name `Markdown Example`.
diff --git a/docs/images/tutorial-visualize-map-2.png b/docs/images/tutorial-visualize-map-2.png
index db9f0d56bc963..f4d1d0e47fe6a 100644
Binary files a/docs/images/tutorial-visualize-map-2.png and b/docs/images/tutorial-visualize-map-2.png differ
diff --git a/docs/maps/maps-getting-started.asciidoc b/docs/maps/maps-getting-started.asciidoc
index 88ad6a26d3697..3ff44b97de635 100644
--- a/docs/maps/maps-getting-started.asciidoc
+++ b/docs/maps/maps-getting-started.asciidoc
@@ -84,7 +84,7 @@ the {es} index `kibana_sample_data_logs` on the shared key iso2 = geo.src.
 . Set *Right source* to *kibana_sample_data_logs*.
 . Set *Right field* to *geo.src*.
 
-===== Set the vector style
+===== Set the layer style
 
 All of the world countries are still a single color because the layer is using <<maps-vector-style-static, static styling>>.
 To shade the world countries based on which country is sending the most requests, you'll need to use <<maps-vector-style-data-driven, data driven styling>>.
@@ -161,9 +161,9 @@ image::maps/images/grid_metrics_both.png[]
 . Select *Sum* in the aggregation select.
 . Select *bytes* in the field select.
 
-===== Set the vector style
+===== Set the layer style
 
-. In *Vector style*, change *Symbol size*:
+. In *Layer style*, change *Symbol size*:
   .. Set *Min size* to 1.
   .. Set *Max size* to 25.
   .. In the field select, select *sum of bytes*.
diff --git a/docs/user/ml/index.asciidoc b/docs/user/ml/index.asciidoc
index b7bf459c39d98..a2c23aad98d5b 100644
--- a/docs/user/ml/index.asciidoc
+++ b/docs/user/ml/index.asciidoc
@@ -24,7 +24,7 @@ can then optionally import that data into an {es} index.
 
 You need the following permissions to use the Data Visualizer with file upload:
 
-* cluster privileges: `monitor`, `manage_index_pipelines`
+* cluster privileges: `monitor`, `manage_ingest_pipelines`
 * index privileges: `read`, `manage`, `index`
 
 For more information, see {ref}/security-privileges.html[Security privileges] 
diff --git a/packages/kbn-es/src/custom_snapshots.js b/packages/kbn-es/src/custom_snapshots.js
index 0af89b8e9b68c..be6bbeca538ff 100644
--- a/packages/kbn-es/src/custom_snapshots.js
+++ b/packages/kbn-es/src/custom_snapshots.js
@@ -26,7 +26,8 @@ function isVersionFlag(a) {
 function getCustomSnapshotUrl() {
   // force use of manually created snapshots until live ones are available
   if (!process.env.KBN_ES_SNAPSHOT_URL && !process.argv.some(isVersionFlag)) {
-    return 'https://storage.googleapis.com/kibana-ci-tmp-artifacts/{name}-{version}-{os}-x86_64.{ext}';
+    // return 'https://storage.googleapis.com/kibana-ci-tmp-artifacts/{name}-{version}-{os}-x86_64.{ext}';
+    return;
   }
 
   if (process.env.KBN_ES_SNAPSHOT_URL && process.env.KBN_ES_SNAPSHOT_URL !== 'false') {
diff --git a/packages/kbn-spec-to-console/README.md b/packages/kbn-spec-to-console/README.md
index fc068b7ba65d6..6729f03b3d4db 100644
--- a/packages/kbn-spec-to-console/README.md
+++ b/packages/kbn-spec-to-console/README.md
@@ -23,14 +23,10 @@ At the root of the Kibana repository, run the following commands:
 
 ```sh
 # OSS
-yarn spec_to_console \
-  -g "<ELASTICSEARCH-REPO-FOLDER>/rest-api-spec/src/main/resources/rest-api-spec/api/*" \
-  -d "src/legacy/core_plugins/console/api_server/spec/generated"
+yarn spec_to_console -g "<ELASTICSEARCH-REPO-FOLDER>/rest-api-spec/src/main/resources/rest-api-spec/api/*" -d "src/legacy/core_plugins/console/server/api_server/spec/generated"
 
 # X-pack
-yarn spec_to_console \
-  -g "<ELASTICSEARCH-REPO-FOLDER>/x-pack/plugin/src/test/resources/rest-api-spec/api/*" \
-  -d "x-pack/plugins/console_extensions/spec/generated"
+yarn spec_to_console -g "<ELASTICSEARCH-REPO-FOLDER>/x-pack/plugin/src/test/resources/rest-api-spec/api/*" -d "x-pack/legacy/plugins/console_extensions/spec/generated"
 ```
 
 ### Information used in Console that is not available in the REST spec
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index 87389d2c10f03..a5532faec19ed 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -129,6 +129,7 @@ export class ChromeService {
           <LoadingIndicator loadingCount$={http.getLoadingCount$()} />
 
           <Header
+            isCloudEnabled={injectedMetadata.getInjectedVar('isCloudEnabled') as boolean}
             application={application}
             appTitle$={appTitle$.pipe(takeUntil(this.stop$))}
             badge$={badge$.pipe(takeUntil(this.stop$))}
diff --git a/src/core/public/chrome/constants.ts b/src/core/public/chrome/constants.ts
new file mode 100644
index 0000000000000..3411f6f629a13
--- /dev/null
+++ b/src/core/public/chrome/constants.ts
@@ -0,0 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const ELASTIC_SUPPORT_LINK = 'https://support.elastic.co/';
+export const KIBANA_FEEDBACK_LINK = 'https://www.elastic.co/kibana/feedback';
+export const KIBANA_ASK_ELASTIC_LINK = 'https://www.elastic.co/kibana/ask-elastic';
+export const GITHUB_CREATE_ISSUE_LINK = 'https://github.com/elastic/kibana/issues/new/choose';
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index 3ddbe420ba284..1e97899be5854 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -179,6 +179,7 @@ interface Props {
   basePath: HttpStart['basePath'];
   isLocked?: boolean;
   onIsLockedUpdate?: (isLocked: boolean) => void;
+  isCloudEnabled: boolean;
 }
 
 interface State {
@@ -296,6 +297,7 @@ class HeaderUI extends Component<Props, State> {
       kibanaVersion,
       onIsLockedUpdate,
       legacyMode,
+      isCloudEnabled,
     } = this.props;
     const {
       appTitle,
@@ -394,7 +396,9 @@ class HeaderUI extends Component<Props, State> {
 
           <EuiHeaderSection side="right">
             <EuiHeaderSectionItem>
-              <HeaderHelpMenu {...{ helpExtension$, kibanaDocLink, kibanaVersion }} />
+              <HeaderHelpMenu
+                {...{ isCloudEnabled, helpExtension$, kibanaDocLink, kibanaVersion }}
+              />
             </EuiHeaderSectionItem>
 
             <HeaderNavControls side="right" navControls={navControlsRight} />
diff --git a/src/core/public/chrome/ui/header/header_help_menu.tsx b/src/core/public/chrome/ui/header/header_help_menu.tsx
index 688d76c9d75d9..c04fbaa07ba71 100644
--- a/src/core/public/chrome/ui/header/header_help_menu.tsx
+++ b/src/core/public/chrome/ui/header/header_help_menu.tsx
@@ -17,30 +17,29 @@
  * under the License.
  */
 
+import * as Rx from 'rxjs';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
-import * as Rx from 'rxjs';
-
+import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import {
-  // TODO: add type annotations
-  // @ts-ignore
-  EuiButton,
-  // @ts-ignore
+  EuiButtonEmpty,
   EuiFlexGroup,
-  // @ts-ignore
   EuiFlexItem,
-  // @ts-ignore
   EuiHeaderSectionItemButton,
   EuiIcon,
   EuiPopover,
   EuiPopoverTitle,
   EuiSpacer,
-  EuiText,
 } from '@elastic/eui';
-import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
 
 import { HeaderExtension } from './header_extension';
 import { ChromeHelpExtension } from '../../chrome_service';
+import {
+  ELASTIC_SUPPORT_LINK,
+  GITHUB_CREATE_ISSUE_LINK,
+  KIBANA_ASK_ELASTIC_LINK,
+  KIBANA_FEEDBACK_LINK,
+} from '../../constants';
 
 interface Props {
   helpExtension$: Rx.Observable<ChromeHelpExtension | undefined>;
@@ -48,6 +47,7 @@ interface Props {
   kibanaVersion: string;
   useDefaultContent?: boolean;
   kibanaDocLink: string;
+  isCloudEnabled: boolean;
 }
 
 interface State {
@@ -90,23 +90,50 @@ class HeaderHelpMenuUI extends Component<Props, State> {
 
     const defaultContent = useDefaultContent ? (
       <Fragment>
-        <EuiText size="s">
-          <p>
-            <FormattedMessage
-              id="core.ui.chrome.headerGlobalNav.helpMenuHelpDescription"
-              defaultMessage="Get updates, information, and answers in our documentation."
-            />
-          </p>
-        </EuiText>
-
-        <EuiSpacer />
-
-        <EuiButton iconType="popout" href={kibanaDocLink} target="_blank">
+        <EuiButtonEmpty href={kibanaDocLink} target="_blank" size="xs" flush="left">
+          <FormattedMessage
+            id="core.ui.chrome.headerGlobalNav.helpMenuKibanaDocumentationTitle"
+            defaultMessage="Kibana documentation"
+          />
+        </EuiButtonEmpty>
+
+        <EuiSpacer size="xs" />
+
+        <EuiButtonEmpty
+          href={this.props.isCloudEnabled ? ELASTIC_SUPPORT_LINK : KIBANA_ASK_ELASTIC_LINK}
+          target="_blank"
+          size="xs"
+          flush="left"
+        >
+          <FormattedMessage
+            id="core.ui.chrome.headerGlobalNav.helpMenuAskElasticTitle"
+            defaultMessage="Ask Elastic"
+          />
+        </EuiButtonEmpty>
+
+        <EuiSpacer size="xs" />
+
+        <EuiButtonEmpty href={KIBANA_FEEDBACK_LINK} target="_blank" size="xs" flush="left">
+          <FormattedMessage
+            id="core.ui.chrome.headerGlobalNav.helpMenuGiveFeedbackTitle"
+            defaultMessage="Give feedback"
+          />
+        </EuiButtonEmpty>
+
+        <EuiSpacer size="xs" />
+
+        <EuiButtonEmpty
+          href={GITHUB_CREATE_ISSUE_LINK}
+          target="_blank"
+          size="xs"
+          iconType="logoGithub"
+          flush="left"
+        >
           <FormattedMessage
-            id="core.ui.chrome.headerGlobalNav.helpMenuGoToDocumentation"
-            defaultMessage="Go to documentation"
+            id="core.ui.chrome.headerGlobalNav.helpMenuOpenGitHubIssueTitle"
+            defaultMessage="Open an issue in GitHub"
           />
-        </EuiButton>
+        </EuiButtonEmpty>
       </Fragment>
     ) : null;
 
diff --git a/src/core/server/saved_objects/service/lib/repository.test.js b/src/core/server/saved_objects/service/lib/repository.test.js
index 6525590ee96c5..79a3e573ab98c 100644
--- a/src/core/server/saved_objects/service/lib/repository.test.js
+++ b/src/core/server/saved_objects/service/lib/repository.test.js
@@ -49,7 +49,6 @@ describe('SavedObjectsRepository', () => {
       hits: [
         {
           _index: '.kibana',
-          _type: '_doc',
           _id: 'index-pattern:logstash-*',
           _score: 1,
           ...mockVersionProps,
@@ -65,7 +64,6 @@ describe('SavedObjectsRepository', () => {
         },
         {
           _index: '.kibana',
-          _type: '_doc',
           _id: 'config:6.0.0-alpha1',
           _score: 1,
           ...mockVersionProps,
@@ -80,7 +78,6 @@ describe('SavedObjectsRepository', () => {
         },
         {
           _index: '.kibana',
-          _type: '_doc',
           _id: 'index-pattern:stocks-*',
           _score: 1,
           ...mockVersionProps,
@@ -96,7 +93,6 @@ describe('SavedObjectsRepository', () => {
         },
         {
           _index: '.kibana',
-          _type: '_doc',
           _id: 'globaltype:something',
           _score: 1,
           ...mockVersionProps,
@@ -118,7 +114,6 @@ describe('SavedObjectsRepository', () => {
       hits: [
         {
           _index: '.kibana',
-          _type: '_doc',
           _id: 'foo-namespace:index-pattern:logstash-*',
           _score: 1,
           ...mockVersionProps,
@@ -135,7 +130,6 @@ describe('SavedObjectsRepository', () => {
         },
         {
           _index: '.kibana',
-          _type: '_doc',
           _id: 'foo-namespace:config:6.0.0-alpha1',
           _score: 1,
           ...mockVersionProps,
@@ -151,7 +145,6 @@ describe('SavedObjectsRepository', () => {
         },
         {
           _index: '.kibana',
-          _type: '_doc',
           _id: 'foo-namespace:index-pattern:stocks-*',
           _score: 1,
           ...mockVersionProps,
@@ -168,7 +161,6 @@ describe('SavedObjectsRepository', () => {
         },
         {
           _index: '.kibana',
-          _type: '_doc',
           _id: 'globaltype:something',
           _score: 1,
           ...mockVersionProps,
@@ -290,7 +282,6 @@ describe('SavedObjectsRepository', () => {
   describe('#create', () => {
     beforeEach(() => {
       callAdminCluster.mockImplementation((method, params) => ({
-        _type: '_doc',
         _id: params.id,
         ...mockVersionProps,
       }));
@@ -863,7 +854,6 @@ describe('SavedObjectsRepository', () => {
         items: [
           {
             create: {
-              _type: '_doc',
               _id: 'config:one',
               error: {
                 reason: 'type[config] missing',
@@ -872,7 +862,6 @@ describe('SavedObjectsRepository', () => {
           },
           {
             create: {
-              _type: '_doc',
               _id: 'index-pattern:two',
               ...mockVersionProps,
             },
@@ -910,14 +899,12 @@ describe('SavedObjectsRepository', () => {
         items: [
           {
             create: {
-              _type: '_doc',
               _id: 'config:one',
               ...mockVersionProps,
             },
           },
           {
             create: {
-              _type: '_doc',
               _id: 'index-pattern:two',
               ...mockVersionProps,
             },
@@ -962,7 +949,6 @@ describe('SavedObjectsRepository', () => {
         items: [
           {
             create: {
-              _type: '_doc',
               _id: 'foo-namespace:config:one',
               _index: '.kibana-test',
               _primary_term: 1,
@@ -971,7 +957,6 @@ describe('SavedObjectsRepository', () => {
           },
           {
             create: {
-              _type: '_doc',
               _id: 'foo-namespace:index-pattern:two',
               _primary_term: 1,
               _seq_no: 2,
@@ -1021,14 +1006,12 @@ describe('SavedObjectsRepository', () => {
         items: [
           {
             create: {
-              _type: '_doc',
               _id: 'config:one',
               ...mockVersionProps,
             },
           },
           {
             create: {
-              _type: '_doc',
               _id: 'index-pattern:two',
               ...mockVersionProps,
             },
@@ -1092,7 +1075,7 @@ describe('SavedObjectsRepository', () => {
       expect(onBeforeWrite).toHaveBeenCalledTimes(1);
     });
 
-    it('should return objects in the same order regardless of type', () => {});
+    it('should return objects in the same order regardless of type', () => { });
   });
 
   describe('#delete', () => {
@@ -1496,7 +1479,6 @@ describe('SavedObjectsRepository', () => {
   describe('#get', () => {
     const noNamespaceResult = {
       _id: 'index-pattern:logstash-*',
-      _type: '_doc',
       ...mockVersionProps,
       _source: {
         type: 'index-pattern',
@@ -1509,7 +1491,6 @@ describe('SavedObjectsRepository', () => {
     };
     const namespacedResult = {
       _id: 'foo-namespace:index-pattern:logstash-*',
-      _type: '_doc',
       ...mockVersionProps,
       _source: {
         namespace: 'foo-namespace',
@@ -1699,14 +1680,12 @@ describe('SavedObjectsRepository', () => {
       callAdminCluster.mockResolvedValue({
         docs: [
           {
-            _type: '_doc',
             _id: 'config:good',
             found: true,
             ...mockVersionProps,
             _source: { ...mockTimestampFields, config: { title: 'Test' } },
           },
           {
-            _type: '_doc',
             _id: 'config:bad',
             found: false,
           },
@@ -1728,14 +1707,12 @@ describe('SavedObjectsRepository', () => {
       callAdminCluster.mockResolvedValue({
         docs: [
           {
-            _type: '_doc',
             _id: 'config:good',
             found: true,
             ...mockVersionProps,
             _source: { ...mockTimestampFields, config: { title: 'Test' } },
           },
           {
-            _type: '_doc',
             _id: 'config:bad',
             found: false,
           },
@@ -1770,21 +1747,18 @@ describe('SavedObjectsRepository', () => {
       callAdminCluster.mockResolvedValue({
         docs: [
           {
-            _type: '_doc',
             _id: 'one',
             found: true,
             ...mockVersionProps,
             _source: { ...mockTimestampFields, config: { title: 'Test1' } },
           },
           {
-            _type: '_doc',
             _id: 'three',
             found: true,
             ...mockVersionProps,
             _source: { ...mockTimestampFields, config: { title: 'Test3' } },
           },
           {
-            _type: '_doc',
             _id: 'five',
             found: true,
             ...mockVersionProps,
@@ -1859,7 +1833,6 @@ describe('SavedObjectsRepository', () => {
     beforeEach(() => {
       callAdminCluster.mockResolvedValue({
         _id: `${type}:${id}`,
-        _type: '_doc',
         ...mockVersionProps,
         result: 'updated',
       });
@@ -2177,7 +2150,6 @@ describe('SavedObjectsRepository', () => {
         items: objects.map(items => ({
           update: {
             _id: `${items.type}:${items.id}`,
-            _type: '_doc',
             ...mockVersionProps,
             result: 'updated',
           }
@@ -2244,15 +2216,14 @@ describe('SavedObjectsRepository', () => {
 
       callAdminCluster.mockReturnValue({
         items: objects
-        // remove invalid from mocks
+          // remove invalid from mocks
           .filter(item => item.id !== 'invalid')
           .map(items => {
-            switch(items.id) {
+            switch (items.id) {
               case 'version_clash':
                 return ({
                   update: {
                     _id: `${items.type}:${items.id}`,
-                    _type: '_doc',
                     error: {
                       type: 'version_conflict_engine_exception'
                     }
@@ -2262,7 +2233,6 @@ describe('SavedObjectsRepository', () => {
                 return ({
                   update: {
                     _id: `${items.type}:${items.id}`,
-                    _type: '_doc',
                     ...mockVersionProps,
                     result: 'updated',
                   }
@@ -2353,7 +2323,7 @@ describe('SavedObjectsRepository', () => {
 
       expect(callAdminCluster).toHaveBeenCalledTimes(1);
 
-      const [, { body: [{ update: firstUpdate },, { update: secondUpdate }] }] = callAdminCluster.mock.calls[0];
+      const [, { body: [{ update: firstUpdate }, , { update: secondUpdate }] }] = callAdminCluster.mock.calls[0];
 
       expect(firstUpdate).toMatchObject({
         if_seq_no: 100,
@@ -2407,7 +2377,7 @@ describe('SavedObjectsRepository', () => {
 
       expect(callAdminCluster).toHaveBeenCalledTimes(1);
 
-      const [, { body: [, { doc }] } ] = callAdminCluster.mock.calls[0];
+      const [, { body: [, { doc }] }] = callAdminCluster.mock.calls[0];
 
       expect(doc).toMatchObject({
         references: [{
@@ -2434,7 +2404,7 @@ describe('SavedObjectsRepository', () => {
 
       expect(callAdminCluster).toHaveBeenCalledTimes(1);
 
-      const [, { body: [, { doc }] } ] = callAdminCluster.mock.calls[0];
+      const [, { body: [, { doc }] }] = callAdminCluster.mock.calls[0];
 
       expect(doc).toMatchObject({
         references: [],
@@ -2637,7 +2607,6 @@ describe('SavedObjectsRepository', () => {
   describe('#incrementCounter', () => {
     beforeEach(() => {
       callAdminCluster.mockImplementation((method, params) => ({
-        _type: '_doc',
         _id: params.id,
         ...mockVersionProps,
         _index: '.kibana',
@@ -2657,7 +2626,6 @@ describe('SavedObjectsRepository', () => {
 
     it('formats Elasticsearch response', async () => {
       callAdminCluster.mockImplementation((method, params) => ({
-        _type: '_doc',
         _id: params.id,
         ...mockVersionProps,
         _index: '.kibana',
@@ -2776,7 +2744,6 @@ describe('SavedObjectsRepository', () => {
 
     it(`doesn't prepend namespace to the id or add namespace property when providing namespace for namespace agnostic type`, async () => {
       callAdminCluster.mockImplementation((method, params) => ({
-        _type: '_doc',
         _id: params.id,
         ...mockVersionProps,
         _index: '.kibana',
diff --git a/src/es_archiver/lib/docs/__tests__/index_doc_records_stream.js b/src/es_archiver/lib/docs/__tests__/index_doc_records_stream.js
index e48af1f60509b..4a5d048637fcc 100644
--- a/src/es_archiver/lib/docs/__tests__/index_doc_records_stream.js
+++ b/src/es_archiver/lib/docs/__tests__/index_doc_records_stream.js
@@ -35,11 +35,11 @@ import {
 
 const recordsToBulkBody = records => {
   return records.reduce((acc, record) => {
-    const { index, type, id, source } = record.value;
+    const { index, id, source } = record.value;
 
     return [
       ...acc,
-      { index: { _index: index, _type: type, _id: id } },
+      { index: { _index: index, _id: id } },
       source
     ];
   }, []);
diff --git a/src/es_archiver/lib/docs/index_doc_records_stream.js b/src/es_archiver/lib/docs/index_doc_records_stream.js
index 943b1e6e2f329..3e88f10387f9e 100644
--- a/src/es_archiver/lib/docs/index_doc_records_stream.js
+++ b/src/es_archiver/lib/docs/index_doc_records_stream.js
@@ -30,7 +30,6 @@ export function createIndexDocRecordsStream(client, stats, progress) {
         {
           index: {
             _index: doc.index,
-            _type: doc.type,
             _id: doc.id,
           }
         },
diff --git a/src/es_archiver/lib/indices/kibana_index.js b/src/es_archiver/lib/indices/kibana_index.js
index dc916e11d698c..6f491783829a8 100644
--- a/src/es_archiver/lib/indices/kibana_index.js
+++ b/src/es_archiver/lib/indices/kibana_index.js
@@ -176,7 +176,6 @@ export async function cleanKibanaIndices({ client, stats, log, kibanaPluginIds }
 export async function createDefaultSpace({ index, client }) {
   await client.create({
     index,
-    type: '_doc',
     id: 'space:default',
     ignore: 409,
     body: {
diff --git a/src/fixtures/fake_row.js b/src/fixtures/fake_row.js
index 5bc752de299b2..747c6e06be427 100644
--- a/src/fixtures/fake_row.js
+++ b/src/fixtures/fake_row.js
@@ -31,7 +31,6 @@ export function getFakeRow(id, mapping) {
     _id: id,
     _index: 'test',
     _source: getFakeRowVals('original', id, mapping),
-    _type: 'doc',
     sort: [id],
   };
 }
diff --git a/src/fixtures/hits.js b/src/fixtures/hits.js
index 413501a3599ed..e8da3e8ee285b 100644
--- a/src/fixtures/hits.js
+++ b/src/fixtures/hits.js
@@ -37,7 +37,6 @@ export default function fitsFixture() {
     return {
       _score: 1,
       _id: 1000 + i,
-      _type: 'test',
       _index: 'test-index',
       _source: {
         '@timestamp': row[0],
diff --git a/src/legacy/core_plugins/console/np_ready/public/application/constants/help_example.txt b/src/legacy/core_plugins/console/np_ready/public/application/constants/help_example.txt
index 9bc22ecd2d630..fd37c41367033 100644
--- a/src/legacy/core_plugins/console/np_ready/public/application/constants/help_example.txt
+++ b/src/legacy/core_plugins/console/np_ready/public/application/constants/help_example.txt
@@ -1,8 +1,8 @@
 # index a doc
-PUT index/type/1
+PUT index/1
 {
   "body": "here"
 }
 
 # and get it ...
-GET index/type/1
+GET index/1
diff --git a/src/legacy/core_plugins/console/public/quarantined/tests/src/input_tokenization.test.js b/src/legacy/core_plugins/console/public/quarantined/tests/src/input_tokenization.test.js
index cfb0f1b8c24db..01f30f826ab26 100644
--- a/src/legacy/core_plugins/console/public/quarantined/tests/src/input_tokenization.test.js
+++ b/src/legacy/core_plugins/console/public/quarantined/tests/src/input_tokenization.test.js
@@ -251,10 +251,10 @@ describe('Input Tokenization', () => {
       'paren.lparen', '{', 'paren.rparen', '}', 'paren.rparen', '}'
     ],
     'POST _search\n' +
-  '{\n' +
-  '  "q": {}\n' +
-  '  \n' +
-  '}'
+    '{\n' +
+    '  "q": {}\n' +
+    '  \n' +
+    '}'
   );
 
   tokenTest(
@@ -263,10 +263,10 @@ describe('Input Tokenization', () => {
       'paren.rparen', '}', 'paren.rparen', '}'
     ],
     'POST _search\n' +
-  '{\n' +
-  '  "q": { "s": {}}\n' +
-  '  \n' +
-  '}'
+    '{\n' +
+    '  "q": { "s": {}}\n' +
+    '  \n' +
+    '}'
   );
 
   function statesAsList() {
@@ -305,44 +305,44 @@ describe('Input Tokenization', () => {
   statesTest(
     ['start', 'json', 'json', 'start'],
     'POST _search\n' +
-  '{\n' +
-  '  "query": { "match_all": {} }\n' +
-  '}'
+    '{\n' +
+    '  "query": { "match_all": {} }\n' +
+    '}'
   );
 
   statesTest(
     ['start', 'json', ['json', 'json'], ['json', 'json'], 'json', 'start'],
     'POST _search\n' +
-  '{\n' +
-  '  "query": { \n' +
-  '  "match_all": {} \n' +
-  '  }\n' +
-  '}'
+    '{\n' +
+    '  "query": { \n' +
+    '  "match_all": {} \n' +
+    '  }\n' +
+    '}'
   );
 
   statesTest(
     ['start', 'json', 'json', 'start'],
     'POST _search\n' +
-  '{\n' +
-  '  "script": { "source": "" }\n' +
-  '}'
+    '{\n' +
+    '  "script": { "source": "" }\n' +
+    '}'
   );
 
   statesTest(
     ['start', 'json', 'json', 'start'],
     'POST _search\n' +
-  '{\n' +
-  '  "script": ""\n' +
-  '}'
+    '{\n' +
+    '  "script": ""\n' +
+    '}'
   );
 
   statesTest(
     ['start', 'json', ['json', 'json'], 'json', 'start'],
     'POST _search\n' +
-  '{\n' +
-  '  "script": {\n' +
-  '   }\n' +
-  '}'
+    '{\n' +
+    '  "script": {\n' +
+    '   }\n' +
+    '}'
   );
 
 
@@ -350,41 +350,41 @@ describe('Input Tokenization', () => {
     ['start', 'json', ['script-start', 'json', 'json', 'json'], ['script-start', 'json', 'json', 'json'],
       ['json', 'json'], 'json', 'start'],
     'POST _search\n' +
-  '{\n' +
-  '  "test": { "script": """\n' +
-  '  test script\n' +
-  ' """\n' +
-  ' }\n' +
-  '}'
+    '{\n' +
+    '  "test": { "script": """\n' +
+    '  test script\n' +
+    ' """\n' +
+    ' }\n' +
+    '}'
   );
 
   statesTest(
     ['start', 'json', ['script-start', 'json'], ['script-start', 'json'], 'json', 'start'],
     'POST _search\n' +
-  '{\n' +
-  '  "script": """\n' +
-  '  test script\n' +
-  ' """,\n' +
-  '}'
+    '{\n' +
+    '  "script": """\n' +
+    '  test script\n' +
+    ' """,\n' +
+    '}'
   );
 
   statesTest(
     ['start', 'json', 'json', 'start'],
     'POST _search\n' +
-  '{\n' +
-  '  "script": """test script""",\n' +
-  '}'
+    '{\n' +
+    '  "script": """test script""",\n' +
+    '}'
   );
 
 
   statesTest(
     ['start', 'json', ['string_literal', 'json'], ['string_literal', 'json'], 'json', 'start'],
     'POST _search\n' +
-  '{\n' +
-  '  "something": """\n' +
-  '  test script\n' +
-  ' """,\n' +
-  '}'
+    '{\n' +
+    '  "something": """\n' +
+    '  test script\n' +
+    ' """,\n' +
+    '}'
   );
 
   statesTest(
@@ -392,21 +392,21 @@ describe('Input Tokenization', () => {
       ['json', 'json'], ['json', 'json'],
       'json', 'start'],
     'POST _search\n' +
-  '{\n' +
-  '  "something": { "f" : """\n' +
-  '  test script\n' +
-  ' """,\n' +
-  ' "g": 1\n' +
-  ' }\n' +
-  '}'
+    '{\n' +
+    '  "something": { "f" : """\n' +
+    '  test script\n' +
+    ' """,\n' +
+    ' "g": 1\n' +
+    ' }\n' +
+    '}'
   );
 
   statesTest(
     ['start', 'json', 'json', 'start'],
     'POST _search\n' +
-  '{\n' +
-  '  "something": """test script""",\n' +
-  '}'
+    '{\n' +
+    '  "something": """test script""",\n' +
+    '}'
   );
 });
 
diff --git a/src/legacy/core_plugins/console/server/__tests__/proxy_route/params.js b/src/legacy/core_plugins/console/server/__tests__/proxy_route/params.js
index 7c6e221d9ce81..aa7b764f84fc7 100644
--- a/src/legacy/core_plugins/console/server/__tests__/proxy_route/params.js
+++ b/src/legacy/core_plugins/console/server/__tests__/proxy_route/params.js
@@ -61,7 +61,7 @@ describe('Console Proxy Route', () => {
 
           const { statusCode } = await server.inject({
             method: 'POST',
-            url: '/api/console/proxy?method=GET&path=/baz/type/id',
+            url: '/api/console/proxy?method=GET&path=/baz/id',
           });
 
           expect(statusCode).to.be(403);
@@ -79,7 +79,7 @@ describe('Console Proxy Route', () => {
 
           const { statusCode } = await server.inject({
             method: 'POST',
-            url: '/api/console/proxy?method=GET&path=/foo/type/id',
+            url: '/api/console/proxy?method=GET&path=/foo/id',
           });
 
           expect(statusCode).to.be(200);
@@ -98,7 +98,7 @@ describe('Console Proxy Route', () => {
 
           const { statusCode } = await server.inject({
             method: 'POST',
-            url: '/api/console/proxy?method=GET&path=/foo/type/id',
+            url: '/api/console/proxy?method=GET&path=/foo/id',
           });
 
           expect(statusCode).to.be(200);
@@ -116,7 +116,7 @@ describe('Console Proxy Route', () => {
         server.route(createProxyRoute({ baseUrl: 'http://localhost:9200', getConfigForReq }));
         await server.inject({
           method: 'POST',
-          url: '/api/console/proxy?method=HEAD&path=/index/type/id',
+          url: '/api/console/proxy?method=HEAD&path=/index/id',
         });
 
         sinon.assert.calledOnce(getConfigForReq);
@@ -125,8 +125,8 @@ describe('Console Proxy Route', () => {
         expect(args[0]).to.have.property('method', 'post');
         expect(args[0])
           .to.have.property('query')
-          .eql({ method: 'HEAD', path: '/index/type/id' });
-        expect(args[1]).to.be('http://localhost:9200/index/type/id?pretty=true');
+          .eql({ method: 'HEAD', path: '/index/id' });
+        expect(args[1]).to.be('http://localhost:9200/index/id?pretty=true');
       });
 
       it('sends the returned timeout, agent, and base headers to request', async () => {
@@ -154,7 +154,7 @@ describe('Console Proxy Route', () => {
 
         await server.inject({
           method: 'POST',
-          url: '/api/console/proxy?method=HEAD&path=/index/type/id',
+          url: '/api/console/proxy?method=HEAD&path=/index/id',
         });
 
         sinon.assert.calledOnce(requestModule.sendRequest);
diff --git a/src/legacy/core_plugins/console/server/__tests__/proxy_route/query_string.js b/src/legacy/core_plugins/console/server/__tests__/proxy_route/query_string.js
index 7cabe89177164..f20adb897be65 100644
--- a/src/legacy/core_plugins/console/server/__tests__/proxy_route/query_string.js
+++ b/src/legacy/core_plugins/console/server/__tests__/proxy_route/query_string.js
@@ -85,19 +85,19 @@ describe('Console Proxy Route', () => {
       });
       describe('starts with a slash', () => {
         it('combines well with the base url', async () => {
-          await request('GET', '/index/type/id');
+          await request('GET', '/index/id');
           sinon.assert.calledOnce(requestModule.sendRequest);
           expect(requestModule.sendRequest.getCall(0).args[0].uri.href).to.be(
-            'http://localhost:9200/index/type/id?pretty=true'
+            'http://localhost:9200/index/id?pretty=true'
           );
         });
       });
       describe(`doesn't start with a slash`, () => {
         it('combines well with the base url', async () => {
-          await request('GET', 'index/type/id');
+          await request('GET', 'index/id');
           sinon.assert.calledOnce(requestModule.sendRequest);
           expect(requestModule.sendRequest.getCall(0).args[0].uri.href).to.be(
-            'http://localhost:9200/index/type/id?pretty=true'
+            'http://localhost:9200/index/id?pretty=true'
           );
         });
       });
diff --git a/src/legacy/core_plugins/console/server/__tests__/wildcard_matcher.js b/src/legacy/core_plugins/console/server/__tests__/wildcard_matcher.js
index 4eb0de4e5ebec..9999c98701ffc 100644
--- a/src/legacy/core_plugins/console/server/__tests__/wildcard_matcher.js
+++ b/src/legacy/core_plugins/console/server/__tests__/wildcard_matcher.js
@@ -40,7 +40,7 @@ describe('WildcardMatcher', function () {
     it('matches nothing', () => should('', '*'));
     it('does not match /', () => shouldNot('/', '*'));
     it('matches localhost', () => should('localhost', '*'));
-    it('matches a path', () => should('/index/type/_search', '*'));
+    it('matches a path', () => should('/index/_search', '*'));
 
     describe('defaultValue = /', function () {
       it('matches /', () => should('/', '*', '/'));
@@ -52,7 +52,7 @@ describe('WildcardMatcher', function () {
     it('does not match https', () => shouldNot('https', 'http'));
     it('does not match nothing', () => shouldNot('', 'http'));
     it('does not match localhost', () => shouldNot('localhost', 'http'));
-    it('does not match a path', () => shouldNot('/index/type/_search', 'http'));
+    it('does not match a path', () => shouldNot('/index/_search', 'http'));
   });
 
   describe('pattern = 560{1..9}', function () {
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/count.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/count.json
index a657440f1fe4a..bd69fd0c77ec8 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/count.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/count.json
@@ -30,8 +30,7 @@
     ],
     "patterns": [
       "_count",
-      "{indices}/_count",
-      "{indices}/{type}/_count"
+      "{indices}/_count"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-count.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query.json
index 12735f2d4b693..3867efd814238 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query.json
@@ -1,6 +1,7 @@
 {
   "delete_by_query": {
     "url_params": {
+      "analyzer": "",
       "analyze_wildcard": "__flag__",
       "default_operator": [
         "AND",
@@ -30,7 +31,6 @@
         "dfs_query_then_fetch"
       ],
       "search_timeout": "",
-      "size": "",
       "max_docs": "all documents",
       "sort": [],
       "_source": [],
@@ -52,8 +52,7 @@
       "POST"
     ],
     "patterns": [
-      "{indices}/_delete_by_query",
-      "{indices}/{type}/_delete_by_query"
+      "{indices}/_delete_by_query"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/exists.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/exists.json
index 4b7b18b9fe1b3..a6799b9e361cd 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/exists.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/exists.json
@@ -21,8 +21,7 @@
       "HEAD"
     ],
     "patterns": [
-      "{indices}/_doc/{id}",
-      "{indices}/{type}/{id}"
+      "{indices}/_doc/{id}"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/explain.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/explain.json
index be01e462878db..e4654a99a76ea 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/explain.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/explain.json
@@ -22,8 +22,7 @@
       "POST"
     ],
     "patterns": [
-      "{indices}/_explain/{id}",
-      "{indices}/{type}/{id}/_explain"
+      "{indices}/_explain/{id}"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-explain.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/get.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/get.json
index a0b70545baff9..5a72761c7c32e 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/get.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/get.json
@@ -21,8 +21,7 @@
       "GET"
     ],
     "patterns": [
-      "{indices}/_doc/{id}",
-      "{indices}/{type}/{id}"
+      "{indices}/_doc/{id}"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/get_script_context.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/get_script_context.json
new file mode 100644
index 0000000000000..528c261df7707
--- /dev/null
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/get_script_context.json
@@ -0,0 +1,10 @@
+{
+  "get_script_context": {
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_script_context"
+    ]
+  }
+}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/get_source.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/get_source.json
index 420e03a1bdcf1..8201960363a78 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/get_source.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/get_source.json
@@ -20,8 +20,7 @@
       "GET"
     ],
     "patterns": [
-      "{indices}/_source/{id}",
-      "{indices}/{type}/{id}/_source"
+      "{indices}/_source/{id}"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/index.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/index.json
index 7b5551727d645..25977806776a7 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/index.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/index.json
@@ -29,9 +29,7 @@
     ],
     "patterns": [
       "{indices}/_doc/{id}",
-      "{indices}/_doc",
-      "{indices}/{type}",
-      "{indices}/{type}/{id}"
+      "{indices}/_doc"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_field_mapping.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_field_mapping.json
index ae82696434ced..362b266ecb183 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_field_mapping.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_field_mapping.json
@@ -18,9 +18,7 @@
     ],
     "patterns": [
       "_mapping/field/{fields}",
-      "{indices}/_mapping/field/{fields}",
-      "_mapping/{type}/field/{fields}",
-      "{indices}/_mapping/{type}/field/{fields}"
+      "{indices}/_mapping/field/{fields}"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-field-mapping.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_mapping.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_mapping.json
index 03f5de56ea351..73f4e42262bf2 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_mapping.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_mapping.json
@@ -1,7 +1,6 @@
 {
   "indices.get_mapping": {
     "url_params": {
-      "include_type_name": "__flag__",
       "ignore_unavailable": "__flag__",
       "allow_no_indices": "__flag__",
       "expand_wildcards": [
@@ -18,9 +17,7 @@
     ],
     "patterns": [
       "_mapping",
-      "{indices}/_mapping",
-      "_mapping/{type}",
-      "{indices}/_mapping/{type}"
+      "{indices}/_mapping"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-mapping.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_mapping.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_mapping.json
index 3b833117be499..07a62a64b64e1 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_mapping.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_mapping.json
@@ -1,7 +1,6 @@
 {
   "indices.put_mapping": {
     "url_params": {
-      "include_type_name": "__flag__",
       "timeout": "",
       "master_timeout": "",
       "ignore_unavailable": "__flag__",
@@ -18,14 +17,7 @@
       "POST"
     ],
     "patterns": [
-      "{indices}/_mapping",
-      "{indices}/{type}/_mapping",
-      "{indices}/_mapping/{type}",
-      "{indices}/{type}/_mappings",
-      "{indices}/_mappings/{type}",
-      "_mappings/{type}",
-      "{indices}/_mappings",
-      "_mapping/{type}"
+      "{indices}/_mapping"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-put-mapping.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shrink.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shrink.json
index 6fbdea0f1244b..31acc86a2fa56 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shrink.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shrink.json
@@ -1,7 +1,6 @@
 {
   "indices.shrink": {
     "url_params": {
-      "copy_settings": "__flag__",
       "timeout": "",
       "master_timeout": "",
       "wait_for_active_shards": ""
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.split.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.split.json
index 68f2e338cd201..1bfbaa078b796 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.split.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.split.json
@@ -1,7 +1,6 @@
 {
   "indices.split": {
     "url_params": {
-      "copy_settings": "__flag__",
       "timeout": "",
       "master_timeout": "",
       "wait_for_active_shards": ""
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/mget.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/mget.json
index f84b46a379cf4..612bef571fe3f 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/mget.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/mget.json
@@ -16,8 +16,7 @@
     ],
     "patterns": [
       "_mget",
-      "{indices}/_mget",
-      "{indices}/{type}/_mget"
+      "{indices}/_mget"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-multi-get.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch.json
index 502d3e25686df..ecb71e9ba23c0 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch.json
@@ -20,8 +20,7 @@
     ],
     "patterns": [
       "_msearch",
-      "{indices}/_msearch",
-      "{indices}/{type}/_msearch"
+      "{indices}/_msearch"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-multi-search.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch_template.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch_template.json
index 02077dd91439b..0b0ca087b1819 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch_template.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch_template.json
@@ -9,7 +9,8 @@
       ],
       "typed_keys": "__flag__",
       "max_concurrent_searches": "",
-      "rest_total_hits_as_int": "__flag__"
+      "rest_total_hits_as_int": "__flag__",
+      "ccs_minimize_roundtrips": "__flag__"
     },
     "methods": [
       "GET",
@@ -17,8 +18,7 @@
     ],
     "patterns": [
       "_msearch/template",
-      "{indices}/_msearch/template",
-      "{indices}/{type}/_msearch/template"
+      "{indices}/_msearch/template"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/mtermvectors.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/mtermvectors.json
index f5c8cbe76bbc4..72a134eca4d2e 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/mtermvectors.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/mtermvectors.json
@@ -25,8 +25,7 @@
     ],
     "patterns": [
       "_mtermvectors",
-      "{indices}/_mtermvectors",
-      "{indices}/{type}/_mtermvectors"
+      "{indices}/_mtermvectors"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-multi-termvectors.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/search.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/search.json
index 24bda08dd5dbf..eb21b43644d77 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/search.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/search.json
@@ -65,8 +65,7 @@
     ],
     "patterns": [
       "_search",
-      "{indices}/_search",
-      "{indices}/{type}/_search"
+      "{indices}/_search"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-search.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/search_template.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/search_template.json
index 6b73e939843a4..582ecab1dd614 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/search_template.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/search_template.json
@@ -22,7 +22,8 @@
       "explain": "__flag__",
       "profile": "__flag__",
       "typed_keys": "__flag__",
-      "rest_total_hits_as_int": "__flag__"
+      "rest_total_hits_as_int": "__flag__",
+      "ccs_minimize_roundtrips": "__flag__"
     },
     "methods": [
       "GET",
@@ -30,8 +31,7 @@
     ],
     "patterns": [
       "_search/template",
-      "{indices}/_search/template",
-      "{indices}/{type}/_search/template"
+      "{indices}/_search/template"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/termvectors.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/termvectors.json
index 80373d903aad8..d94cffc38b7af 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/termvectors.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/termvectors.json
@@ -24,9 +24,7 @@
     ],
     "patterns": [
       "{indices}/_termvectors/{id}",
-      "{indices}/_termvectors",
-      "{indices}/{type}/{id}/_termvectors",
-      "{indices}/{type}/_termvectors"
+      "{indices}/_termvectors"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-termvectors.html"
   }
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query.json
index e5857f219af46..739ea16888146 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query.json
@@ -32,7 +32,6 @@
         "dfs_query_then_fetch"
       ],
       "search_timeout": "",
-      "size": "",
       "max_docs": "all documents",
       "sort": [],
       "_source": [],
@@ -55,8 +54,7 @@
       "POST"
     ],
     "patterns": [
-      "{indices}/_update_by_query",
-      "{indices}/{type}/_update_by_query"
+      "{indices}/_update_by_query"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update-by-query.html"
   }
diff --git a/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts b/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts
index 8d2337264d02f..abe9ec6d6e873 100644
--- a/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts
+++ b/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts
@@ -24,8 +24,13 @@ import {
   createAction,
   IncompatibleActionError,
 } from '../../../../../../plugins/ui_actions/public';
-import { FilterManager, esFilters } from '../../../../../../plugins/data/public';
-import { TimefilterContract, changeTimeFilter, extractTimeFilter } from '../../timefilter';
+import {
+  esFilters,
+  FilterManager,
+  TimefilterContract,
+  changeTimeFilter,
+  extractTimeFilter,
+} from '../../../../../../plugins/data/public';
 import { applyFiltersPopover } from '../apply_filters/apply_filters_popover';
 import { IndexPatternsStart } from '../../index_patterns';
 export const GLOBAL_APPLY_FILTER_ACTION = 'GLOBAL_APPLY_FILTER_ACTION';
diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts
index 502ca206e8e12..60828b4a2a202 100644
--- a/src/legacy/core_plugins/data/public/index.ts
+++ b/src/legacy/core_plugins/data/public/index.ts
@@ -61,12 +61,3 @@ export {
   mockFields,
   mockIndexPattern,
 } from './index_patterns';
-
-export {
-  TimeHistoryContract,
-  TimefilterContract,
-  getTime,
-  InputTimeRange,
-  extractTimeFilter,
-  changeTimeFilter,
-} from './timefilter';
diff --git a/src/legacy/core_plugins/data/public/mocks.ts b/src/legacy/core_plugins/data/public/mocks.ts
index 4a7fe8efa4068..d3b5944127965 100644
--- a/src/legacy/core_plugins/data/public/mocks.ts
+++ b/src/legacy/core_plugins/data/public/mocks.ts
@@ -19,13 +19,11 @@
 
 import { indexPatternsServiceMock } from './index_patterns/index_patterns_service.mock';
 import { queryServiceMock } from './query/query_service.mock';
-import { timefilterServiceMock } from './timefilter/timefilter_service.mock';
 
 function createDataSetupMock() {
   return {
     indexPatterns: indexPatternsServiceMock.createSetupContract(),
     query: queryServiceMock.createSetupContract(),
-    timefilter: timefilterServiceMock.createSetupContract(),
   };
 }
 
diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts
index 03c9b0e93309d..76beb4ee56053 100644
--- a/src/legacy/core_plugins/data/public/plugin.ts
+++ b/src/legacy/core_plugins/data/public/plugin.ts
@@ -20,7 +20,6 @@
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
 import { SearchService, SearchStart, createSearchBar, StatetfulSearchBarProps } from './search';
 import { QueryService, QuerySetup } from './query';
-import { TimefilterService, TimefilterSetup } from './timefilter';
 import { IndexPatternsService, IndexPatternsSetup, IndexPatternsStart } from './index_patterns';
 import { Storage, IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
 import { DataPublicPluginStart } from '../../../../plugins/data/public';
@@ -44,7 +43,6 @@ export interface DataPluginStartDependencies {
  */
 export interface DataSetup {
   query: QuerySetup;
-  timefilter: TimefilterSetup;
   indexPatterns: IndexPatternsSetup;
 }
 
@@ -55,7 +53,6 @@ export interface DataSetup {
  */
 export interface DataStart {
   query: QuerySetup;
-  timefilter: TimefilterSetup;
   indexPatterns: IndexPatternsStart;
   search: SearchStart;
   ui: {
@@ -79,24 +76,16 @@ export class DataPlugin implements Plugin<DataSetup, DataStart, {}, DataPluginSt
   private readonly indexPatterns: IndexPatternsService = new IndexPatternsService();
   private readonly query: QueryService = new QueryService();
   private readonly search: SearchService = new SearchService();
-  private readonly timefilter: TimefilterService = new TimefilterService();
 
   private setupApi!: DataSetup;
   private storage!: IStorageWrapper;
 
   public setup(core: CoreSetup): DataSetup {
-    const { uiSettings } = core;
-
     this.storage = new Storage(window.localStorage);
 
-    const timefilterService = this.timefilter.setup({
-      uiSettings,
-      storage: this.storage,
-    });
     this.setupApi = {
       indexPatterns: this.indexPatterns.setup(),
       query: this.query.setup(),
-      timefilter: timefilterService,
     };
 
     return this.setupApi;
@@ -118,14 +107,13 @@ export class DataPlugin implements Plugin<DataSetup, DataStart, {}, DataPluginSt
       core,
       data,
       storage: this.storage,
-      timefilter: this.setupApi.timefilter,
     });
 
     uiActions.registerAction(
       createFilterAction(
         core.overlays,
         data.query.filterManager,
-        this.setupApi.timefilter.timefilter,
+        data.query.timefilter.timefilter,
         indexPatternsService
       )
     );
@@ -146,6 +134,5 @@ export class DataPlugin implements Plugin<DataSetup, DataStart, {}, DataPluginSt
     this.indexPatterns.stop();
     this.query.stop();
     this.search.stop();
-    this.timefilter.stop();
   }
 }
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts
index 80ee38ea1b076..d0abed8e86264 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts
@@ -45,7 +45,7 @@ export const mockFetchIndexPatterns = jest
   .fn()
   .mockReturnValue(Promise.resolve([mockIndexPattern]));
 
-jest.mock('../../persisted_log', () => ({
+jest.mock('../../../../../../../plugins/data/public/query/persisted_log', () => ({
   PersistedLog: mockPersistedLogFactory,
 }));
 
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
index 9f03f7fd30778..5576427b1592a 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
@@ -37,6 +37,7 @@ import { Toast } from 'src/core/public';
 import {
   AutocompleteSuggestion,
   AutocompleteSuggestionType,
+  PersistedLog,
 } from '../../../../../../../plugins/data/public';
 import {
   withKibana,
@@ -47,7 +48,6 @@ import { Query, getQueryLog } from '../index';
 import { fromUser, matchPairs, toUser } from '../lib';
 import { QueryLanguageSwitcher } from './language_switcher';
 import { SuggestionsComponent } from './typeahead/suggestions_component';
-import { PersistedLog } from '../../persisted_log';
 import { fetchIndexPatterns } from '../lib/fetch_index_patterns';
 import { IDataPluginServices } from '../../../types';
 
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx
index 7281eea956fbf..ae08083f82af3 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx
@@ -29,12 +29,11 @@ import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
 import { I18nProvider } from '@kbn/i18n/react';
 const startMock = coreMock.createStart();
 
-import { timefilterServiceMock } from '../../../timefilter/timefilter_service.mock';
-const timefilterSetupMock = timefilterServiceMock.createSetupContract();
-
-timefilterSetupMock.history.get.mockImplementation(() => {
-  return [];
-});
+const mockTimeHistory = {
+  get: () => {
+    return [];
+  },
+};
 
 startMock.uiSettings.get.mockImplementation((key: string) => {
   switch (key) {
@@ -140,7 +139,7 @@ describe('QueryBarTopRowTopRow', () => {
         screenTitle: 'Another Screen',
         isDirty: false,
         indexPatterns: [mockIndexPattern],
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -154,7 +153,7 @@ describe('QueryBarTopRowTopRow', () => {
         query: kqlQuery,
         screenTitle: 'Another Screen',
         indexPatterns: [mockIndexPattern],
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
         disableAutoFocus: true,
         isDirty: false,
       })
@@ -167,7 +166,7 @@ describe('QueryBarTopRowTopRow', () => {
     const component = mount(
       wrapQueryBarTopRowInContext({
         isDirty: false,
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -179,7 +178,7 @@ describe('QueryBarTopRowTopRow', () => {
     const component = mount(
       wrapQueryBarTopRowInContext({
         showDatePicker: false,
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
         isDirty: false,
       })
     );
@@ -196,7 +195,7 @@ describe('QueryBarTopRowTopRow', () => {
         showDatePicker: true,
         dateRangeFrom: 'now-7d',
         dateRangeTo: 'now',
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -212,7 +211,7 @@ describe('QueryBarTopRowTopRow', () => {
         showDatePicker: true,
         dateRangeFrom: 'now-7d',
         dateRangeTo: 'now',
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -232,7 +231,7 @@ describe('QueryBarTopRowTopRow', () => {
         showDatePicker: false,
         dateRangeFrom: 'now-7d',
         dateRangeTo: 'now',
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -249,7 +248,7 @@ describe('QueryBarTopRowTopRow', () => {
         indexPatterns: [mockIndexPattern],
         showQueryInput: false,
         showDatePicker: false,
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -263,7 +262,7 @@ describe('QueryBarTopRowTopRow', () => {
         isDirty: false,
         screenTitle: 'Another Screen',
         showDatePicker: false,
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx
index d2953621d86d1..d31ac2d76d0d9 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx
@@ -35,15 +35,14 @@ import {
 import { EuiSuperUpdateButton, OnRefreshProps } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { Toast } from 'src/core/public';
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange, TimeHistoryContract } from 'src/plugins/data/public';
 import { useKibana } from '../../../../../../../plugins/kibana_react/public';
+import { PersistedLog } from '../../../../../../../plugins/data/public';
 
 import { IndexPattern } from '../../../index_patterns';
 import { QueryBarInput } from './query_bar_input';
 import { Query, getQueryLog } from '../index';
-import { TimeHistoryContract } from '../../../timefilter';
 import { IDataPluginServices } from '../../../types';
-import { PersistedLog } from '../../persisted_log';
 
 interface Props {
   query?: Query;
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts b/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts
index f78eb5e07f189..66424d9a1d6a3 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts
+++ b/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts
@@ -19,7 +19,7 @@
 
 import { UiSettingsClientContract } from 'src/core/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { PersistedLog } from '../../persisted_log';
+import { PersistedLog } from '../../../../../../../plugins/data/public';
 
 export function getQueryLog(
   uiSettings: UiSettingsClientContract,
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx
index 12cea46f158c1..4485b74ca0901 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx
@@ -23,7 +23,6 @@ import { CoreStart } from 'src/core/public';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
-import { TimefilterSetup } from '../../../timefilter';
 import { SearchBar } from '../../../';
 import { SearchBarOwnProps } from '.';
 import { esFilters } from '../../../../../../../plugins/data/public';
@@ -32,7 +31,6 @@ interface StatefulSearchBarDeps {
   core: CoreStart;
   data: DataPublicPluginStart;
   storage: IStorageWrapper;
-  timefilter: TimefilterSetup;
 }
 
 export type StatetfulSearchBarProps = SearchBarOwnProps & {
@@ -45,20 +43,21 @@ const defaultFiltersUpdated = (data: DataPublicPluginStart) => {
   };
 };
 
-const defaultOnRefreshChange = (timefilter: TimefilterSetup) => {
+const defaultOnRefreshChange = (data: DataPublicPluginStart) => {
+  const { timefilter } = data.query.timefilter;
   return (options: { isPaused: boolean; refreshInterval: number }) => {
-    timefilter.timefilter.setRefreshInterval({
+    timefilter.setRefreshInterval({
       value: options.refreshInterval,
       pause: options.isPaused,
     });
   };
 };
 
-export function createSearchBar({ core, storage, timefilter, data }: StatefulSearchBarDeps) {
+export function createSearchBar({ core, storage, data }: StatefulSearchBarDeps) {
   // App name should come from the core application service.
   // Until it's available, we'll ask the user to provide it for the pre-wired component.
   return (props: StatetfulSearchBarProps) => {
-    const { filterManager } = data.query;
+    const { filterManager, timefilter } = data.query;
     const tfRefreshInterval = timefilter.timefilter.getRefreshInterval();
     const fmFilters = filterManager.getFilters();
     const [refreshInterval, setRefreshInterval] = useState(tfRefreshInterval.value);
@@ -119,7 +118,7 @@ export function createSearchBar({ core, storage, timefilter, data }: StatefulSea
           isRefreshPaused={refreshPaused}
           filters={filters}
           onFiltersUpdated={defaultFiltersUpdated(data)}
-          onRefreshChange={defaultOnRefreshChange(timefilter)}
+          onRefreshChange={defaultOnRefreshChange(data)}
           {...props}
         />
       </KibanaContextProvider>
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
index 9b77ec369c55b..44637365247fb 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
@@ -27,9 +27,13 @@ import { I18nProvider } from '@kbn/i18n/react';
 import { coreMock } from '../../../../../../../../src/core/public/mocks';
 const startMock = coreMock.createStart();
 
-import { timefilterServiceMock } from '../../../timefilter/timefilter_service.mock';
 import { mount } from 'enzyme';
-const timefilterSetupMock = timefilterServiceMock.createSetupContract();
+
+const mockTimeHistory = {
+  get: () => {
+    return [];
+  },
+};
 
 jest.mock('../../../../../data/public', () => {
   return {
@@ -86,7 +90,7 @@ const kqlQuery = {
 function wrapSearchBarInContext(testProps: any) {
   const defaultOptions = {
     appName: 'test',
-    timeHistory: timefilterSetupMock.history,
+    timeHistory: mockTimeHistory,
     intl: null as any,
   };
 
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
index d3a26239e1006..a57b7b17a0da6 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
@@ -25,6 +25,7 @@ import ResizeObserver from 'resize-observer-polyfill';
 import { get, isEqual } from 'lodash';
 
 import { TimeRange } from 'src/plugins/data/common/types';
+import { TimeHistoryContract } from 'src/plugins/data/public';
 import { IndexPattern, Query, FilterBar } from '../../../../../data/public';
 import { QueryBarTopRow } from '../../../query';
 import { SavedQuery, SavedQueryAttributes } from '../index';
@@ -32,7 +33,6 @@ import { SavedQueryMeta, SaveQueryForm } from './saved_query_management/save_que
 import { SavedQueryManagementComponent } from './saved_query_management/saved_query_management_component';
 import { SavedQueryService } from '../lib/saved_query_service';
 import { createSavedQueryService } from '../lib/saved_query_service';
-import { TimeHistoryContract } from '../../../timefilter';
 import {
   withKibana,
   KibanaReactContextValue,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx
index 64c7560947681..adf0e1e084a64 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx
@@ -56,7 +56,7 @@ import { capabilities } from 'ui/capabilities';
 import { Subscription } from 'rxjs';
 import { npStart } from 'ui/new_platform';
 import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
-import { extractTimeFilter, changeTimeFilter } from '../../../data/public';
+import { extractTimeFilter, changeTimeFilter } from '../../../../../plugins/data/public';
 import { start as data } from '../../../data/public/legacy';
 import { esFilters } from '../../../../../plugins/data/public';
 
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts
index a25ce1e607f9a..5e81373001bf5 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts
@@ -23,7 +23,7 @@ import { DashboardStateManager } from './dashboard_state_manager';
 import { getAppStateMock, getSavedDashboardMock } from './__tests__';
 import { AppStateClass } from 'ui/state_management/app_state';
 import { DashboardAppState } from './types';
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange, TimefilterContract } from 'src/plugins/data/public';
 import { ViewMode } from 'src/plugins/embeddable/public';
 import { InputTimeRange } from 'ui/timefilter';
 
@@ -33,22 +33,19 @@ jest.mock('ui/registry/field_formats', () => ({
   },
 }));
 
-import { dataPluginMock } from '../../../../core_plugins/data/public/mocks';
-const dataSetupMock = dataPluginMock.createSetup();
-
 describe('DashboardState', function() {
   let dashboardState: DashboardStateManager;
   const savedDashboard = getSavedDashboardMock();
 
   let mockTime: TimeRange = { to: 'now', from: 'now-15m' };
-  const mockTimefilter = dataSetupMock.timefilter!.timefilter;
-
-  mockTimefilter.setTime.mockImplementation((time: InputTimeRange) => {
-    mockTime = time as TimeRange;
-  });
-  mockTimefilter.getTime.mockImplementation(() => {
-    return mockTime;
-  });
+  const mockTimefilter = {
+    getTime: () => {
+      return mockTime;
+    },
+    setTime: (time: InputTimeRange) => {
+      mockTime = time as TimeRange;
+    },
+  } as TimefilterContract;
 
   function initDashboardState() {
     dashboardState = new DashboardStateManager({
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx
index c207585499483..badfbb4b14a4c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { EventHandler, MouseEvent as ReactMouseEvent } from 'react';
 import { act } from 'react-dom/test-utils';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { DiscoverFieldSearch, Props } from './discover_field_search';
-import { EuiButtonGroupProps } from '@elastic/eui';
+import { EuiButtonGroupProps, EuiPopover } from '@elastic/eui';
 import { ReactWrapper } from 'enzyme';
 
 describe('DiscoverFieldSearch', () => {
@@ -136,4 +136,44 @@ describe('DiscoverFieldSearch', () => {
     typeSelector.simulate('change', { target: { value: 'any' } });
     expect(onChange).toBeCalledWith('type', 'any');
   });
+
+  test('click on filter button should open and close popover', () => {
+    const component = mountComponent();
+    const btn = findTestSubject(component, 'toggleFieldFilterButton');
+    btn.simulate('click');
+    let popover = component.find(EuiPopover);
+    expect(popover.prop('isOpen')).toBe(true);
+    btn.simulate('click');
+    popover = component.find(EuiPopover);
+    expect(popover.prop('isOpen')).toBe(false);
+  });
+
+  test('click outside popover should close popover', () => {
+    const triggerDocumentMouseDown: EventHandler<any> = (e: ReactMouseEvent<any>) => {
+      const event = new Event('mousedown');
+      // @ts-ignore
+      event.euiGeneratedBy = e.nativeEvent.euiGeneratedBy;
+      document.dispatchEvent(event);
+    };
+    const triggerDocumentMouseUp: EventHandler<any> = (e: ReactMouseEvent<any>) => {
+      const event = new Event('mouseup');
+      // @ts-ignore
+      event.euiGeneratedBy = e.nativeEvent.euiGeneratedBy;
+      document.dispatchEvent(event);
+    };
+    const component = mountWithIntl(
+      <div onMouseDown={triggerDocumentMouseDown} onMouseUp={triggerDocumentMouseUp} id="wrapperId">
+        <DiscoverFieldSearch {...defaultProps} />
+      </div>
+    );
+    const btn = findTestSubject(component, 'toggleFieldFilterButton');
+    btn.simulate('click');
+    let popover = component.find(EuiPopover);
+    expect(popover.length).toBe(1);
+    expect(popover.prop('isOpen')).toBe(true);
+    component.find('#wrapperId').simulate('mousedown');
+    component.find('#wrapperId').simulate('mouseup');
+    popover = component.find(EuiPopover);
+    expect(popover.prop('isOpen')).toBe(false);
+  });
 });
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx
index f0685c4357c5a..3d93487d9e6cc 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx
@@ -32,6 +32,7 @@ import {
   EuiForm,
   EuiFormRow,
   EuiButtonGroup,
+  EuiOutsideClickDetector,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
@@ -244,6 +245,7 @@ export function DiscoverFieldSearch({ onChange, value, types }: Props) {
       </EuiForm>
     </div>
   );
+
   return (
     <React.Fragment>
       <EuiFlexGroup responsive={false} gutterSize={'s'}>
@@ -260,33 +262,37 @@ export function DiscoverFieldSearch({ onChange, value, types }: Props) {
         </EuiFlexItem>
       </EuiFlexGroup>
       <div className="dscFieldSearch__filterWrapper">
-        <EuiPopover
-          id="dataPanelTypeFilter"
-          panelClassName="euiFilterGroup__popoverPanel"
-          panelPaddingSize="none"
-          anchorPosition="downLeft"
-          display="block"
-          isOpen={isPopoverOpen}
-          closePopover={() => {}}
-          button={buttonContent}
-        >
-          <EuiPopoverTitle>
-            {i18n.translate('kbn.discover.fieldChooser.filter.filterByTypeLabel', {
-              defaultMessage: 'Filter by type',
-            })}
-          </EuiPopoverTitle>
-          {selectionPanel}
-          <EuiPopoverFooter>
-            <EuiSwitch
-              label={i18n.translate('kbn.discover.fieldChooser.filter.hideMissingFieldsLabel', {
-                defaultMessage: 'Hide missing fields',
+        <EuiOutsideClickDetector onOutsideClick={() => {}} isDisabled={!isPopoverOpen}>
+          <EuiPopover
+            id="dataPanelTypeFilter"
+            panelClassName="euiFilterGroup__popoverPanel"
+            panelPaddingSize="none"
+            anchorPosition="downLeft"
+            display="block"
+            isOpen={isPopoverOpen}
+            closePopover={() => {
+              setPopoverOpen(false);
+            }}
+            button={buttonContent}
+          >
+            <EuiPopoverTitle>
+              {i18n.translate('kbn.discover.fieldChooser.filter.filterByTypeLabel', {
+                defaultMessage: 'Filter by type',
               })}
-              checked={values.missing}
-              onChange={handleMissingChange}
-              data-test-subj="missingSwitch"
-            />
-          </EuiPopoverFooter>
-        </EuiPopover>
+            </EuiPopoverTitle>
+            {selectionPanel}
+            <EuiPopoverFooter>
+              <EuiSwitch
+                label={i18n.translate('kbn.discover.fieldChooser.filter.hideMissingFieldsLabel', {
+                  defaultMessage: 'Hide missing fields',
+                })}
+                checked={values.missing}
+                onChange={handleMissingChange}
+                data-test-subj="missingSwitch"
+              />
+            </EuiPopoverFooter>
+          </EuiPopover>
+        </EuiOutsideClickDetector>
       </div>
     </React.Fragment>
   );
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
index 31b28d21fe8d8..732fb6d2e4e70 100644
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
@@ -21,10 +21,14 @@ import * as Rx from 'rxjs';
 import { Subscription } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { TExecuteTriggerActions } from 'src/plugins/ui_actions/public';
-import { TimeRange, onlyDisabledFiltersChanged } from '../../../../../../plugins/data/public';
-import { setup as data } from '../../../../data/public/legacy';
-import { Query, getTime } from '../../../../data/public';
-import { esFilters } from '../../../../../../plugins/data/public';
+import { npStart } from 'ui/new_platform';
+import {
+  esFilters,
+  TimeRange,
+  onlyDisabledFiltersChanged,
+  getTime,
+} from '../../../../../../plugins/data/public';
+import { Query } from '../../../../data/public';
 import {
   APPLY_FILTER_TRIGGER,
   Container,
@@ -49,6 +53,8 @@ import {
 } from '../kibana_services';
 import { SEARCH_EMBEDDABLE_TYPE } from './constants';
 
+const { data } = npStart.plugins;
+
 interface SearchScope extends ng.IScope {
   columns?: string[];
   description?: string;
@@ -136,9 +142,9 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
       requests: new RequestAdapter(),
     };
     this.initializeSearchScope();
-    this.autoRefreshFetchSubscription = data.timefilter.timefilter
-      .getAutoRefreshFetch$()
-      .subscribe(this.fetch);
+    const { timefilter } = data.query.timefilter;
+
+    this.autoRefreshFetchSubscription = timefilter.getAutoRefreshFetch$().subscribe(this.fetch);
 
     this.subscription = Rx.merge(this.getOutput$(), this.getInput$()).subscribe(() => {
       this.panelTitle = this.output.title || '';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/objects_table.test.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/objects_table.test.js
index 39a9f7cd98a57..5956b6c306b0e 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/objects_table.test.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/objects_table.test.js
@@ -106,10 +106,10 @@ const allSavedObjects = [
   },
 ];
 
-const $http = () => {};
+const $http = () => { };
 $http.post = jest.fn().mockImplementation(() => []);
 const defaultProps = {
-  goInspectObject: () => {},
+  goInspectObject: () => { },
   confirmModalPromise: jest.fn(),
   savedObjectsClient: {
     find: jest.fn(),
@@ -256,7 +256,6 @@ describe('ObjectsTable', () => {
 
       const mockSavedObjects = mockSelectedSavedObjects.map(obj => ({
         _id: obj.id,
-        _type: obj._type,
         _source: {},
       }));
 
@@ -297,7 +296,6 @@ describe('ObjectsTable', () => {
 
       const mockSavedObjects = mockSelectedSavedObjects.map(obj => ({
         _id: obj.id,
-        _type: obj._type,
         _source: {},
       }));
 
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js
index c0a7615f207ed..f501161136801 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js
@@ -31,8 +31,7 @@ import editorTemplate from './editor.html';
 import { DashboardConstants } from '../../dashboard/dashboard_constants';
 import { VisualizeConstants } from '../visualize_constants';
 import { getEditBreadcrumbs, getCreateBreadcrumbs } from '../breadcrumbs';
-import { extractTimeFilter, changeTimeFilter } from '../../../../data/public';
-
+import { extractTimeFilter, changeTimeFilter } from '../../../../../../plugins/data/public';
 import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util';
 
 import {
diff --git a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.test.js b/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.test.js
index e8e95fd92dd11..a5db4602872ee 100644
--- a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.test.js
+++ b/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.test.js
@@ -32,7 +32,6 @@ function setupMockCallCluster(optCount, language) {
       if (optCount === null) {
         return Promise.resolve({
           _index: '.kibana_1',
-          _type: 'doc',
           _id: 'kql-telemetry:kql-telemetry',
           found: false,
         });
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.js b/src/legacy/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.js
index a2cc63b4b8679..6926fa72b0ae2 100644
--- a/src/legacy/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.js
+++ b/src/legacy/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.js
@@ -53,10 +53,8 @@ export function registerScrollForExportRoute(server) {
       });
 
       return objects.map(hit => {
-        const type = hit.type;
         return {
           _id: hit.id,
-          _type: type,
           _source: hit.attributes,
           _meta: {
             savedObjectVersion: 2
diff --git a/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
index 4f8c5d11f1916..9077de8910327 100644
--- a/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
+++ b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
@@ -22,11 +22,15 @@ import { TopNavMenu } from './top_nav_menu';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 
-import { timefilterServiceMock } from '../../../../core_plugins/data/public/timefilter/timefilter_service.mock';
-const timefilterSetupMock = timefilterServiceMock.createSetupContract();
-
 jest.mock('ui/new_platform');
 
+const mockTimeHistory = {
+  add: () => {},
+  get: () => {
+    return [];
+  },
+};
+
 const dataShim = {
   ui: {
     SearchBar: () => <div className="searchBar" />,
@@ -77,7 +81,7 @@ describe('TopNavMenu', () => {
       <TopNavMenu
         appName={'test'}
         showSearchBar={true}
-        timeHistory={timefilterSetupMock.history}
+        timeHistory={mockTimeHistory}
         data={dataShim as any}
       />
     );
diff --git a/src/legacy/core_plugins/telemetry/index.ts b/src/legacy/core_plugins/telemetry/index.ts
index 4b6566415f3e1..50a25423b5eb8 100644
--- a/src/legacy/core_plugins/telemetry/index.ts
+++ b/src/legacy/core_plugins/telemetry/index.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import * as Rx from 'rxjs';
 import { resolve } from 'path';
 import JoiNamespace from 'joi';
 import { Server } from 'hapi';
@@ -45,6 +46,14 @@ const telemetry = (kibana: any) => {
     config(Joi: typeof JoiNamespace) {
       return Joi.object({
         enabled: Joi.boolean().default(true),
+        optIn: Joi.when('allowChangingOptInStatus', {
+          is: false,
+          then: Joi.valid(true),
+          otherwise: Joi.boolean()
+            .allow(null)
+            .default(null),
+        }),
+        allowChangingOptInStatus: Joi.boolean().default(true),
         // `config` is used internally and not intended to be set
         config: Joi.string().default(Joi.ref('$defaultConfigPath')),
         banner: Joi.boolean().default(true),
@@ -80,8 +89,25 @@ const telemetry = (kibana: any) => {
         },
       },
       async replaceInjectedVars(originalInjectedVars: any, request: any) {
+        const config = request.server.config();
+        const optIn = config.get('telemetry.optIn');
+        const allowChangingOptInStatus = config.get('telemetry.allowChangingOptInStatus');
         const currentKibanaVersion = getCurrentKibanaVersion(request.server);
-        const telemetryOptedIn = await getTelemetryOptIn({ request, currentKibanaVersion });
+        let telemetryOptedIn: boolean | null;
+
+        if (typeof optIn === 'boolean' && !allowChangingOptInStatus) {
+          // When not allowed to change optIn status and an optIn value is set, we'll overwrite with that
+          telemetryOptedIn = optIn;
+        } else {
+          telemetryOptedIn = await getTelemetryOptIn({
+            request,
+            currentKibanaVersion,
+          });
+          if (telemetryOptedIn === null) {
+            // In the senario there's no value set in telemetryOptedIn, we'll return optIn value
+            telemetryOptedIn = optIn;
+          }
+        }
 
         return {
           ...originalInjectedVars,
@@ -93,20 +119,36 @@ const telemetry = (kibana: any) => {
         return {
           telemetryEnabled: getXpackConfigWithDeprecated(config, 'telemetry.enabled'),
           telemetryUrl: getXpackConfigWithDeprecated(config, 'telemetry.url'),
-          telemetryBanner: getXpackConfigWithDeprecated(config, 'telemetry.banner'),
-          telemetryOptedIn: null,
+          telemetryBanner:
+            config.get('telemetry.allowChangingOptInStatus') !== false &&
+            getXpackConfigWithDeprecated(config, 'telemetry.banner'),
+          telemetryOptedIn: config.get('telemetry.optIn'),
+          allowChangingOptInStatus: config.get('telemetry.allowChangingOptInStatus'),
         };
       },
       hacks: ['plugins/telemetry/hacks/telemetry_init', 'plugins/telemetry/hacks/telemetry_opt_in'],
       mappings,
     },
-    init(server: Server) {
+    async init(server: Server) {
       const initializerContext = {
         env: {
           packageInfo: {
             version: getCurrentKibanaVersion(server),
           },
         },
+        config: {
+          create() {
+            const config = server.config();
+            return Rx.of({
+              enabled: config.get('telemetry.enabled'),
+              optIn: config.get('telemetry.optIn'),
+              config: config.get('telemetry.config'),
+              banner: config.get('telemetry.banner'),
+              url: config.get('telemetry.url'),
+              allowChangingOptInStatus: config.get('telemetry.allowChangingOptInStatus'),
+            });
+          },
+        },
       } as PluginInitializerContext;
 
       const coreSetup = ({
@@ -114,7 +156,7 @@ const telemetry = (kibana: any) => {
         log: server.log,
       } as any) as CoreSetup;
 
-      telemetryPlugin(initializerContext).setup(coreSetup);
+      await telemetryPlugin(initializerContext).setup(coreSetup);
 
       // register collectors
       server.usage.collectorSet.register(createLocalizationUsageCollector(server));
diff --git a/src/legacy/core_plugins/telemetry/public/components/__snapshots__/telemetry_form.test.js.snap b/src/legacy/core_plugins/telemetry/public/components/__snapshots__/telemetry_form.test.js.snap
index c1ad6276aee25..e1aead3798de7 100644
--- a/src/legacy/core_plugins/telemetry/public/components/__snapshots__/telemetry_form.test.js.snap
+++ b/src/legacy/core_plugins/telemetry/public/components/__snapshots__/telemetry_form.test.js.snap
@@ -1,6 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TelemetryForm renders as expected 1`] = `
+exports[`TelemetryForm doesn't render form when not allowed to change optIn status 1`] = `""`;
+
+exports[`TelemetryForm renders as expected when allows to change optIn status 1`] = `
 <Fragment>
   <EuiPanel
     paddingSize="l"
diff --git a/src/legacy/core_plugins/telemetry/public/components/telemetry_form.js b/src/legacy/core_plugins/telemetry/public/components/telemetry_form.js
index c2dcd48ee57da..80eb2da59c47e 100644
--- a/src/legacy/core_plugins/telemetry/public/components/telemetry_form.js
+++ b/src/legacy/core_plugins/telemetry/public/components/telemetry_form.js
@@ -78,6 +78,10 @@ export class TelemetryForm extends Component {
       queryMatches,
     } = this.state;
 
+    if (!telemetryOptInProvider.canChangeOptInStatus()) {
+      return null;
+    }
+
     if (queryMatches !== null && !queryMatches) {
       return null;
     }
diff --git a/src/legacy/core_plugins/telemetry/public/components/telemetry_form.test.js b/src/legacy/core_plugins/telemetry/public/components/telemetry_form.test.js
index 4d2c1dec27176..836fbc5d914de 100644
--- a/src/legacy/core_plugins/telemetry/public/components/telemetry_form.test.js
+++ b/src/legacy/core_plugins/telemetry/public/components/telemetry_form.test.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import '../services/telemetry_opt_in.test.mocks';
+import { mockInjectedMetadata } from '../services/telemetry_opt_in.test.mocks';
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { TelemetryForm } from './telemetry_form';
@@ -33,6 +33,8 @@ const buildTelemetryOptInProvider = () => {
       switch (key) {
         case '$http':
           return mockHttp;
+        case 'allowChangingOptInStatus':
+          return true;
         default:
           return null;
       }
@@ -47,7 +49,23 @@ const buildTelemetryOptInProvider = () => {
 };
 
 describe('TelemetryForm', () => {
-  it('renders as expected', () => {
+  it('renders as expected when allows to change optIn status', () => {
+    mockInjectedMetadata({ telemetryOptedIn: null, allowChangingOptInStatus: true });
+
+    expect(shallowWithIntl(
+      <TelemetryForm
+        spacesEnabled={false}
+        query={{ text: '' }}
+        onQueryMatchChange={jest.fn()}
+        telemetryOptInProvider={buildTelemetryOptInProvider()}
+        enableSaving={true}
+      />)
+    ).toMatchSnapshot();
+  });
+
+  it(`doesn't render form when not allowed to change optIn status`, () => {
+    mockInjectedMetadata({ telemetryOptedIn: null, allowChangingOptInStatus: false });
+
     expect(shallowWithIntl(
       <TelemetryForm
         spacesEnabled={false}
diff --git a/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/click_banner.test.js b/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/click_banner.test.js
index 9b17d51d6ea61..6e9a9fc8443ba 100644
--- a/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/click_banner.test.js
+++ b/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/click_banner.test.js
@@ -72,7 +72,7 @@ describe('click_banner', () => {
 
     const optIn = true;
     const bannerId = 'bruce-banner';
-    mockInjectedMetadata({ telemetryOptedIn: optIn });
+    mockInjectedMetadata({ telemetryOptedIn: optIn, allowChangingOptInStatus: true });
     const telemetryOptInProvider = getTelemetryOptInProvider();
 
     telemetryOptInProvider.setBannerId(bannerId);
@@ -92,7 +92,7 @@ describe('click_banner', () => {
       remove: sinon.spy()
     };
     const optIn = true;
-    mockInjectedMetadata({ telemetryOptedIn: null });
+    mockInjectedMetadata({ telemetryOptedIn: null, allowChangingOptInStatus: true });
     const telemetryOptInProvider = getTelemetryOptInProvider({ simulateFailure: true });
 
     await clickBanner(telemetryOptInProvider, optIn, { _banners: banners, _toastNotifications: toastNotifications });
@@ -110,7 +110,7 @@ describe('click_banner', () => {
       remove: sinon.spy()
     };
     const optIn = false;
-    mockInjectedMetadata({ telemetryOptedIn: null });
+    mockInjectedMetadata({ telemetryOptedIn: null, allowChangingOptInStatus: true });
     const telemetryOptInProvider = getTelemetryOptInProvider({ simulateError: true });
 
     await clickBanner(telemetryOptInProvider, optIn, { _banners: banners, _toastNotifications: toastNotifications });
diff --git a/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/handle_old_settings.test.js b/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/handle_old_settings.test.js
index fd21a5122b594..f26ca0ca0e3c5 100644
--- a/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/handle_old_settings.test.js
+++ b/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/handle_old_settings.test.js
@@ -38,7 +38,7 @@ const getTelemetryOptInProvider = (enabled, { simulateFailure = false } = {}) =>
   const chrome = {
     addBasePath: url => url
   };
-  mockInjectedMetadata({ telemetryOptedIn: enabled });
+  mockInjectedMetadata({ telemetryOptedIn: enabled, allowChangingOptInStatus: true });
 
   const $injector = {
     get: (key) => {
diff --git a/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/should_show_banner.test.js b/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/should_show_banner.test.js
index 19e7ccbe61866..240c991a75b64 100644
--- a/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/should_show_banner.test.js
+++ b/src/legacy/core_plugins/telemetry/public/hacks/welcome_banner/should_show_banner.test.js
@@ -38,7 +38,7 @@ const getMockInjector = () => {
 };
 
 const getTelemetryOptInProvider = ({ telemetryOptedIn = null } = {}) => {
-  mockInjectedMetadata({ telemetryOptedIn });
+  mockInjectedMetadata({ telemetryOptedIn, allowChangingOptInStatus: true });
   const injector = getMockInjector();
   const chrome = {
     addBasePath: (url) => url
diff --git a/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.test.js b/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.test.js
index 0034fa4438238..26f14fc87d937 100644
--- a/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.test.js
+++ b/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.test.js
@@ -34,7 +34,7 @@ describe('TelemetryOptInProvider', () => {
       addBasePath: (url) => url
     };
 
-    mockInjectedMetadata({ telemetryOptedIn: optedIn });
+    mockInjectedMetadata({ telemetryOptedIn: optedIn, allowChangingOptInStatus: true });
 
     const mockInjector = {
       get: (key) => {
diff --git a/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.test.mocks.js b/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.test.mocks.js
index f98f5e16e00c3..012f8de640042 100644
--- a/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.test.mocks.js
+++ b/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.test.mocks.js
@@ -24,10 +24,11 @@ import {
 } from '../../../../../core/public/mocks';
 const injectedMetadataMock = injectedMetadataServiceMock.createStartContract();
 
-export function mockInjectedMetadata({ telemetryOptedIn }) {
+export function mockInjectedMetadata({ telemetryOptedIn, allowChangingOptInStatus }) {
   const mockGetInjectedVar = jest.fn().mockImplementation((key) => {
     switch (key) {
       case 'telemetryOptedIn': return telemetryOptedIn;
+      case 'allowChangingOptInStatus': return allowChangingOptInStatus;
       default: throw new Error(`unexpected injectedVar ${key}`);
     }
   });
diff --git a/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.ts b/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.ts
index f4462ffea7a33..4d27bad352cd4 100644
--- a/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.ts
+++ b/src/legacy/core_plugins/telemetry/public/services/telemetry_opt_in.ts
@@ -28,11 +28,15 @@ let currentOptInStatus = false;
 
 export function TelemetryOptInProvider($injector: any, chrome: any) {
   currentOptInStatus = npStart.core.injectedMetadata.getInjectedVar('telemetryOptedIn') as boolean;
+  const allowChangingOptInStatus = npStart.core.injectedMetadata.getInjectedVar(
+    'allowChangingOptInStatus'
+  ) as boolean;
 
   setCanTrackUiMetrics(currentOptInStatus);
   const provider = {
     getBannerId: () => bannerId,
     getOptIn: () => currentOptInStatus,
+    canChangeOptInStatus: () => allowChangingOptInStatus,
     setBannerId(id: string) {
       bannerId = id;
     },
diff --git a/src/legacy/core_plugins/telemetry/server/plugin.ts b/src/legacy/core_plugins/telemetry/server/plugin.ts
index a5f0f1234799a..813aa0df09e8c 100644
--- a/src/legacy/core_plugins/telemetry/server/plugin.ts
+++ b/src/legacy/core_plugins/telemetry/server/plugin.ts
@@ -29,7 +29,7 @@ export class TelemetryPlugin {
     this.currentKibanaVersion = initializerContext.env.packageInfo.version;
   }
 
-  public setup(core: CoreSetup) {
+  public async setup(core: CoreSetup) {
     const currentKibanaVersion = this.currentKibanaVersion;
     telemetryCollectionManager.setStatsGetter(getStats, 'local');
     registerRoutes({ core, currentKibanaVersion });
diff --git a/src/legacy/core_plugins/telemetry/server/routes/index.ts b/src/legacy/core_plugins/telemetry/server/routes/index.ts
index 2eb6bf95b4f45..549b3ef6068ec 100644
--- a/src/legacy/core_plugins/telemetry/server/routes/index.ts
+++ b/src/legacy/core_plugins/telemetry/server/routes/index.ts
@@ -27,6 +27,6 @@ interface RegisterRoutesParams {
 }
 
 export function registerRoutes({ core, currentKibanaVersion }: RegisterRoutesParams) {
-  registerOptInRoutes({ core, currentKibanaVersion });
   registerTelemetryDataRoutes(core);
+  registerOptInRoutes({ core, currentKibanaVersion });
 }
diff --git a/src/legacy/core_plugins/timelion/public/legacy.ts b/src/legacy/core_plugins/timelion/public/legacy.ts
index 77cd94279c879..d989a68d40eeb 100644
--- a/src/legacy/core_plugins/timelion/public/legacy.ts
+++ b/src/legacy/core_plugins/timelion/public/legacy.ts
@@ -21,13 +21,12 @@ import { PluginInitializerContext } from 'kibana/public';
 import { npSetup, npStart } from 'ui/new_platform';
 import { plugin } from '.';
 import { setup as visualizations } from '../../visualizations/public/np_ready/public/legacy';
-import { setup as data } from '../../data/public/legacy';
 import { TimelionPluginSetupDependencies } from './plugin';
 import { LegacyDependenciesPlugin } from './shim';
 
 const setupPlugins: Readonly<TimelionPluginSetupDependencies> = {
   visualizations,
-  data,
+  data: npSetup.plugins.data,
   expressions: npSetup.plugins.expressions,
 
   // Temporary solution
diff --git a/src/legacy/core_plugins/timelion/public/plugin.ts b/src/legacy/core_plugins/timelion/public/plugin.ts
index 6447e3bbc5f51..6291948f75077 100644
--- a/src/legacy/core_plugins/timelion/public/plugin.ts
+++ b/src/legacy/core_plugins/timelion/public/plugin.ts
@@ -25,12 +25,11 @@ import {
   HttpSetup,
 } from 'kibana/public';
 import { Plugin as ExpressionsPlugin } from 'src/plugins/expressions/public';
+import { DataPublicPluginSetup, TimefilterContract } from 'src/plugins/data/public';
 import { VisualizationsSetup } from '../../visualizations/public/np_ready/public';
 import { getTimelionVisualizationConfig } from './timelion_vis_fn';
 import { getTimelionVisualization } from './vis';
 import { getTimeChart } from './panels/timechart/timechart';
-import { DataSetup } from '../../data/public';
-import { TimefilterSetup } from '../../data/public/timefilter';
 import { Panel } from './panels/panel';
 import { LegacyDependenciesPlugin, LegacyDependenciesPluginSetup } from './shim';
 
@@ -39,14 +38,14 @@ export interface TimelionVisualizationDependencies extends LegacyDependenciesPlu
   uiSettings: UiSettingsClientContract;
   http: HttpSetup;
   timelionPanels: Map<string, Panel>;
-  timefilter: TimefilterSetup;
+  timefilter: TimefilterContract;
 }
 
 /** @internal */
 export interface TimelionPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPlugin['setup']>;
   visualizations: VisualizationsSetup;
-  data: DataSetup;
+  data: DataPublicPluginSetup;
 
   // Temporary solution
   __LEGACY: LegacyDependenciesPlugin;
@@ -69,8 +68,8 @@ export class TimelionPlugin implements Plugin<Promise<void>, void> {
     const dependencies: TimelionVisualizationDependencies = {
       uiSettings: core.uiSettings,
       http: core.http,
-      timefilter: data.timefilter,
       timelionPanels,
+      timefilter: data.query.timefilter.timefilter,
       ...(await __LEGACY.setup(core, timelionPanels)),
     };
 
diff --git a/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts b/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts
index 156c06a605528..6239e4027c392 100644
--- a/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts
+++ b/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts
@@ -78,7 +78,7 @@ export function getTimelionRequestHandler(dependencies: TimelionVisualizationDep
     const esQueryConfigs = getEsQueryConfig(uiSettings);
 
     // parse the time range client side to make sure it behaves like other charts
-    const timeRangeBounds = timefilter.timefilter.calculateBounds(timeRange);
+    const timeRangeBounds = timefilter.calculateBounds(timeRange);
 
     try {
       return await http.post('../api/timelion/run', {
diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
index 76dba8fd4d87a..e62ceeb2f3102 100644
--- a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
+++ b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -19,6 +19,12 @@
 
 import sinon from 'sinon';
 
+const mockObservable = () => {
+  return {
+    subscribe: () => {}
+  };
+};
+
 export const npSetup = {
   core: {
     chrome: {}
@@ -44,8 +50,16 @@ export const npSetup = {
       },
     },
     data: {
+      autocomplete: {
+        addProvider: sinon.fake(),
+        getProvider: sinon.fake(),
+      },
       query: {
         filterManager: sinon.fake(),
+        timefilter: {
+          timefilter: sinon.fake(),
+          history: sinon.fake(),
+        }
       },
     },
     devTools: {
@@ -67,6 +81,10 @@ export const npSetup = {
   },
 };
 
+let refreshInterval = undefined;
+let isTimeRangeSelectorEnabled = true;
+let isAutoRefreshSelectorEnabled = true;
+
 export const npStart = {
   core: {
     chrome: {}
@@ -86,6 +104,9 @@ export const npStart = {
       getSortedDevTools: () => [],
     },
     data: {
+      autocomplete: {
+        getProvider: sinon.fake(),
+      },
       getSuggestions: sinon.fake(),
       query: {
         filterManager: {
@@ -97,13 +118,48 @@ export const npStart = {
           addFilters: sinon.fake(),
           setFilters: sinon.fake(),
           removeAll: sinon.fake(),
-          getUpdates$: () => {
-            return {
-              subscribe: () => {}
-            };
-          },
+          getUpdates$: mockObservable,
 
         },
+        timefilter: {
+          timefilter: {
+            getFetch$: mockObservable,
+            getAutoRefreshFetch$: mockObservable,
+            getEnabledUpdated$: mockObservable,
+            getTimeUpdate$: mockObservable,
+            getRefreshIntervalUpdate$: mockObservable,
+            isTimeRangeSelectorEnabled: () => {
+              return isTimeRangeSelectorEnabled;
+            },
+            isAutoRefreshSelectorEnabled: () => {
+              return isAutoRefreshSelectorEnabled;
+            },
+            disableAutoRefreshSelector: () => {
+              isAutoRefreshSelectorEnabled = false;
+            },
+            enableAutoRefreshSelector: () => {
+              isAutoRefreshSelectorEnabled = true;
+            },
+            getRefreshInterval: () => {
+              return refreshInterval;
+            },
+            setRefreshInterval: (interval) => {
+              refreshInterval = interval;
+            },
+            enableTimeRangeSelector: () => {
+              isTimeRangeSelectorEnabled = true;
+            },
+            disableTimeRangeSelector: () => {
+              isTimeRangeSelectorEnabled = false;
+            },
+            getTime: sinon.fake(),
+            setTime: sinon.fake(),
+            getBounds: sinon.fake(),
+            calculateBounds: sinon.fake(),
+            createFilter: sinon.fake(),
+          },
+          history: sinon.fake(),
+        },
       },
     },
     inspector: {
diff --git a/src/legacy/ui/public/timefilter/index.ts b/src/legacy/ui/public/timefilter/index.ts
index c102d979c951a..82e2531ec62a6 100644
--- a/src/legacy/ui/public/timefilter/index.ts
+++ b/src/legacy/ui/public/timefilter/index.ts
@@ -18,20 +18,20 @@
  */
 
 import uiRoutes from 'ui/routes';
-import { TimefilterContract, TimeHistoryContract } from '../../../core_plugins/data/public';
+import { npStart } from 'ui/new_platform';
+import { TimefilterContract, TimeHistoryContract } from '../../../../plugins/data/public';
 import { registerTimefilterWithGlobalState } from './setup_router';
-import { start as data } from '../../../core_plugins/data/public/legacy';
 
 export {
   getTime,
   InputTimeRange,
   TimeHistoryContract,
   TimefilterContract,
-} from '../../../core_plugins/data/public';
+} from '../../../../plugins/data/public';
 export type Timefilter = TimefilterContract;
 export type TimeHistory = TimeHistoryContract;
-export const timeHistory = data.timefilter.history;
-export const timefilter = data.timefilter.timefilter;
+export const timeHistory = npStart.plugins.data.query.timefilter.history;
+export const timefilter = npStart.plugins.data.query.timefilter.timefilter;
 
 uiRoutes.addSetupWork((globalState, $rootScope) => {
   return registerTimefilterWithGlobalState(timefilter, globalState, $rootScope);
diff --git a/src/legacy/ui/public/timefilter/setup_router.ts b/src/legacy/ui/public/timefilter/setup_router.ts
index ffc8a1fca6c64..0a73378f99cd7 100644
--- a/src/legacy/ui/public/timefilter/setup_router.ts
+++ b/src/legacy/ui/public/timefilter/setup_router.ts
@@ -22,8 +22,7 @@ import { IScope } from 'angular';
 import moment from 'moment';
 import { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 import chrome from 'ui/chrome';
-import { RefreshInterval, TimeRange } from 'src/plugins/data/public';
-import { TimefilterContract } from '../../../core_plugins/data/public/timefilter';
+import { RefreshInterval, TimeRange, TimefilterContract } from 'src/plugins/data/public';
 
 // TODO
 // remove everything underneath once globalState is no longer an angular service
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index 2269ba3c55bce..4aae63c24d7fc 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -31,8 +31,8 @@ const autocompleteMock: any = {
 
 const createSetupContract = (): Setup => {
   const querySetupMock = queryServiceMock.createSetupContract();
-  const setupContract: Setup = {
-    autocomplete: autocompleteMock as Setup['autocomplete'],
+  const setupContract = {
+    autocomplete: autocompleteMock,
     search: searchSetupMock,
     query: querySetupMock,
   };
@@ -42,8 +42,8 @@ const createSetupContract = (): Setup => {
 
 const createStartContract = (): Start => {
   const queryStartMock = queryServiceMock.createStartContract();
-  const startContract: Start = {
-    autocomplete: autocompleteMock as Start['autocomplete'],
+  const startContract = {
+    autocomplete: autocompleteMock,
     getSuggestions: jest.fn(),
     search: { search: jest.fn() },
     query: queryStartMock,
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index a13e912e77846..79db34c022b39 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -18,6 +18,7 @@
  */
 
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { Storage } from '../../kibana_utils/public';
 import { DataPublicPluginSetup, DataPublicPluginStart } from './types';
 import { AutocompleteProviderRegister } from './autocomplete_provider';
 import { getSuggestionsProvider } from './suggestions_provider';
@@ -35,11 +36,13 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
   }
 
   public setup(core: CoreSetup): DataPublicPluginSetup {
+    const storage = new Storage(window.localStorage);
     return {
       autocomplete: this.autocomplete,
       search: this.searchService.setup(core),
       query: this.queryService.setup({
         uiSettings: core.uiSettings,
+        storage,
       }),
     };
   }
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
index 5bee3f7d10428..33f9c4ccd795d 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
@@ -184,14 +184,15 @@ describe('filter_manager', () => {
       expect(updateListener.callCount).toBe(1);
     });
 
-    test('app state should accept array', async () => {
+    test('app state should accept array and preserve order', async () => {
       const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
       const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'female');
+
       filterManager.addFilters([f1]);
       filterManager.addFilters([f2]);
       const appFilters = filterManager.getAppFilters();
       expect(appFilters).toHaveLength(2);
-      expect(appFilters).toEqual([f2, f1]);
+      expect(appFilters).toEqual([f1, f2]);
       expect(filterManager.getGlobalFilters()).toHaveLength(0);
     });
 
@@ -206,7 +207,7 @@ describe('filter_manager', () => {
       expect(updateListener.callCount).toBe(1);
     });
 
-    test('global state should be accept array', async () => {
+    test('global state should be accept array and preserve order', async () => {
       const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
       const f2 = getFilter(
         esFilters.FilterStateStore.GLOBAL_STATE,
@@ -215,11 +216,36 @@ describe('filter_manager', () => {
         'gender',
         'female'
       );
+
       filterManager.addFilters([f1, f2]);
       expect(filterManager.getAppFilters()).toHaveLength(0);
       const globalFilters = filterManager.getGlobalFilters();
       expect(globalFilters).toHaveLength(2);
-      expect(globalFilters).toEqual([f2, f1]);
+      expect(globalFilters).toEqual([f1, f2]);
+    });
+
+    test('mixed filters: global filters should stay in the beginning', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'female');
+      filterManager.addFilters([f1, f2]);
+      const filters = filterManager.getFilters();
+      expect(filters).toHaveLength(2);
+      expect(filters).toEqual([f1, f2]);
+    });
+
+    test('mixed filters: global filters should move to the beginning', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      const f2 = getFilter(
+        esFilters.FilterStateStore.GLOBAL_STATE,
+        false,
+        false,
+        'gender',
+        'female'
+      );
+      filterManager.addFilters([f1, f2]);
+      const filters = filterManager.getFilters();
+      expect(filters).toHaveLength(2);
+      expect(filters).toEqual([f2, f1]);
     });
 
     test('add multiple filters at once', async () => {
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.ts b/src/plugins/data/public/query/filter_manager/filter_manager.ts
index f691398fb91d3..06e2b77dca238 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.ts
@@ -77,11 +77,16 @@ export class FilterManager {
 
   private handleStateUpdate(newFilters: esFilters.Filter[]) {
     // global filters should always be first
+
     newFilters.sort(({ $state: a }: esFilters.Filter, { $state: b }: esFilters.Filter): number => {
-      return a!.store === esFilters.FilterStateStore.GLOBAL_STATE &&
-        b!.store !== esFilters.FilterStateStore.GLOBAL_STATE
-        ? -1
-        : 1;
+      if (a!.store === b!.store) {
+        return 0;
+      } else {
+        return a!.store === esFilters.FilterStateStore.GLOBAL_STATE &&
+          b!.store !== esFilters.FilterStateStore.GLOBAL_STATE
+          ? -1
+          : 1;
+      }
     });
 
     const filtersUpdated = !_.isEqual(this.filters, newFilters);
diff --git a/src/plugins/data/public/query/index.tsx b/src/plugins/data/public/query/index.tsx
index 42647b9d98201..9d7c2ffc56f70 100644
--- a/src/plugins/data/public/query/index.tsx
+++ b/src/plugins/data/public/query/index.tsx
@@ -19,3 +19,7 @@
 
 export * from './query_service';
 export * from './filter_manager';
+
+export * from './timefilter';
+
+export * from './persisted_log';
diff --git a/src/plugins/data/public/query/mocks.ts b/src/plugins/data/public/query/mocks.ts
index e5030c5765316..f2832b6b67fa2 100644
--- a/src/plugins/data/public/query/mocks.ts
+++ b/src/plugins/data/public/query/mocks.ts
@@ -17,21 +17,24 @@
  * under the License.
  */
 
-import { QueryService, QueryStart, QuerySetup } from '.';
+import { QueryService, QuerySetup } from '.';
+import { timefilterServiceMock } from './timefilter/timefilter_service.mock';
 
 type QueryServiceClientContract = PublicMethodsOf<QueryService>;
 
 const createSetupContractMock = () => {
   const setupContract: jest.Mocked<QuerySetup> = {
     filterManager: jest.fn() as any,
+    timefilter: timefilterServiceMock.createSetupContract(),
   };
 
   return setupContract;
 };
 
 const createStartContractMock = () => {
-  const startContract: jest.Mocked<QueryStart> = {
+  const startContract = {
     filterManager: jest.fn() as any,
+    timefilter: timefilterServiceMock.createStartContract(),
   };
 
   return startContract;
diff --git a/src/legacy/core_plugins/data/public/query/persisted_log/index.ts b/src/plugins/data/public/query/persisted_log/index.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/query/persisted_log/index.ts
rename to src/plugins/data/public/query/persisted_log/index.ts
diff --git a/src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.test.ts b/src/plugins/data/public/query/persisted_log/persisted_log.test.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.test.ts
rename to src/plugins/data/public/query/persisted_log/persisted_log.test.ts
diff --git a/src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.ts b/src/plugins/data/public/query/persisted_log/persisted_log.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.ts
rename to src/plugins/data/public/query/persisted_log/persisted_log.ts
diff --git a/src/plugins/data/public/query/query_service.ts b/src/plugins/data/public/query/query_service.ts
index d34909a5e03b7..206f8ac284ec3 100644
--- a/src/plugins/data/public/query/query_service.ts
+++ b/src/plugins/data/public/query/query_service.ts
@@ -18,7 +18,9 @@
  */
 
 import { UiSettingsClientContract } from 'src/core/public';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { FilterManager } from './filter_manager';
+import { TimefilterService, TimefilterSetup } from './timefilter';
 
 /**
  * Query Service
@@ -26,23 +28,33 @@ import { FilterManager } from './filter_manager';
  */
 
 export interface QueryServiceDependencies {
+  storage: IStorageWrapper;
   uiSettings: UiSettingsClientContract;
 }
 
 export class QueryService {
   filterManager!: FilterManager;
+  timefilter!: TimefilterSetup;
 
-  public setup({ uiSettings }: QueryServiceDependencies) {
+  public setup({ uiSettings, storage }: QueryServiceDependencies) {
     this.filterManager = new FilterManager(uiSettings);
 
+    const timefilterService = new TimefilterService();
+    this.timefilter = timefilterService.setup({
+      uiSettings,
+      storage,
+    });
+
     return {
       filterManager: this.filterManager,
+      timefilter: this.timefilter,
     };
   }
 
   public start() {
     return {
       filterManager: this.filterManager,
+      timefilter: this.timefilter,
     };
   }
 
diff --git a/src/legacy/core_plugins/data/public/timefilter/get_time.test.ts b/src/plugins/data/public/query/timefilter/get_time.test.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/get_time.test.ts
rename to src/plugins/data/public/query/timefilter/get_time.test.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/get_time.ts b/src/plugins/data/public/query/timefilter/get_time.ts
similarity index 94%
rename from src/legacy/core_plugins/data/public/timefilter/get_time.ts
rename to src/plugins/data/public/query/timefilter/get_time.ts
index 18a43d789714d..55ee6527fbb1a 100644
--- a/src/legacy/core_plugins/data/public/timefilter/get_time.ts
+++ b/src/plugins/data/public/query/timefilter/get_time.ts
@@ -19,7 +19,9 @@
 
 import dateMath from '@elastic/datemath';
 import { TimeRange } from 'src/plugins/data/public';
-import { IndexPattern, Field } from '../index_patterns';
+
+// TODO: remove this
+import { IndexPattern, Field } from '../../../../../legacy/core_plugins/data/public/index_patterns';
 
 interface CalculateBoundsOptions {
   forceNow?: Date;
diff --git a/src/legacy/core_plugins/data/public/timefilter/index.ts b/src/plugins/data/public/query/timefilter/index.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/index.ts
rename to src/plugins/data/public/query/timefilter/index.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.test.ts b/src/plugins/data/public/query/timefilter/lib/change_time_filter.test.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.test.ts
rename to src/plugins/data/public/query/timefilter/lib/change_time_filter.test.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.ts b/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.ts
rename to src/plugins/data/public/query/timefilter/lib/change_time_filter.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/lib/diff_time_picker_vals.test.ts b/src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.test.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/lib/diff_time_picker_vals.test.ts
rename to src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.test.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/lib/diff_time_picker_vals.ts b/src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/lib/diff_time_picker_vals.ts
rename to src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/lib/extract_time_filter.test.ts b/src/plugins/data/public/query/timefilter/lib/extract_time_filter.test.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/lib/extract_time_filter.test.ts
rename to src/plugins/data/public/query/timefilter/lib/extract_time_filter.test.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/lib/extract_time_filter.ts b/src/plugins/data/public/query/timefilter/lib/extract_time_filter.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/lib/extract_time_filter.ts
rename to src/plugins/data/public/query/timefilter/lib/extract_time_filter.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/lib/parse_querystring.ts b/src/plugins/data/public/query/timefilter/lib/parse_querystring.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/lib/parse_querystring.ts
rename to src/plugins/data/public/query/timefilter/lib/parse_querystring.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/time_history.ts b/src/plugins/data/public/query/timefilter/time_history.ts
similarity index 97%
rename from src/legacy/core_plugins/data/public/timefilter/time_history.ts
rename to src/plugins/data/public/query/timefilter/time_history.ts
index 36ad1a4427a47..e14c9ac0bc7ca 100644
--- a/src/legacy/core_plugins/data/public/timefilter/time_history.ts
+++ b/src/plugins/data/public/query/timefilter/time_history.ts
@@ -20,7 +20,7 @@
 import moment from 'moment';
 import { TimeRange } from 'src/plugins/data/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { PersistedLog } from '../query/persisted_log';
+import { PersistedLog } from '../persisted_log';
 
 export class TimeHistory {
   private history: PersistedLog<TimeRange>;
diff --git a/src/legacy/core_plugins/data/public/timefilter/timefilter.test.ts b/src/plugins/data/public/query/timefilter/timefilter.test.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/timefilter.test.ts
rename to src/plugins/data/public/query/timefilter/timefilter.test.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/timefilter.ts b/src/plugins/data/public/query/timefilter/timefilter.ts
similarity index 97%
rename from src/legacy/core_plugins/data/public/timefilter/timefilter.ts
rename to src/plugins/data/public/query/timefilter/timefilter.ts
index 14e167b0fd56e..137e5100aa20e 100644
--- a/src/legacy/core_plugins/data/public/timefilter/timefilter.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter.ts
@@ -20,13 +20,15 @@
 import _ from 'lodash';
 import { Subject, BehaviorSubject } from 'rxjs';
 import moment from 'moment';
-import { RefreshInterval, TimeRange } from 'src/plugins/data/public';
-import { IndexPattern, TimeHistoryContract } from '../index';
+import { RefreshInterval, TimeRange, TimeHistoryContract } from 'src/plugins/data/public';
+import { IndexPattern } from 'src/legacy/core_plugins/data/public';
 import { areRefreshIntervalsDifferent, areTimeRangesDifferent } from './lib/diff_time_picker_vals';
 import { parseQueryString } from './lib/parse_querystring';
 import { calculateBounds, getTime } from './get_time';
 import { TimefilterConfig, InputTimeRange, TimeRangeBounds } from './types';
 
+// TODO: remove!
+
 export class Timefilter {
   // Fired when isTimeRangeSelectorEnabled \ isAutoRefreshSelectorEnabled are toggled
   private enabledUpdated$ = new BehaviorSubject(false);
diff --git a/src/legacy/core_plugins/data/public/timefilter/timefilter_service.mock.ts b/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/timefilter_service.mock.ts
rename to src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/timefilter_service.ts b/src/plugins/data/public/query/timefilter/timefilter_service.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/timefilter_service.ts
rename to src/plugins/data/public/query/timefilter/timefilter_service.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/types.ts b/src/plugins/data/public/query/timefilter/types.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/types.ts
rename to src/plugins/data/public/query/timefilter/types.ts
diff --git a/test/api_integration/apis/index_patterns/es_errors/lib/get_es_errors.js b/test/api_integration/apis/index_patterns/es_errors/lib/get_es_errors.js
index f303bca0da574..df221a09a661c 100644
--- a/test/api_integration/apis/index_patterns/es_errors/lib/get_es_errors.js
+++ b/test/api_integration/apis/index_patterns/es_errors/lib/get_es_errors.js
@@ -36,7 +36,6 @@ export async function getDocNotFoundError(es) {
   try {
     await es.get({
       index: 'basic_index',
-      type: 'type',
       id: '1234'
     });
   } catch (err) {
diff --git a/test/functional/apps/management/_handle_version_conflict.js b/test/functional/apps/management/_handle_version_conflict.js
index ce5f968a37115..217e6d4c1a8d3 100644
--- a/test/functional/apps/management/_handle_version_conflict.js
+++ b/test/functional/apps/management/_handle_version_conflict.js
@@ -56,7 +56,6 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.settings.setScriptedFieldScript(`doc['bytes'].value`);
       const response = await es.update({
         index: '.kibana',
-        type: '_doc',
         id: 'index-pattern:logstash-*',
         body: {
           'doc': { 'index-pattern': { 'fieldFormatMap': '{"geo.src":{"id":"number"}}' } }
@@ -83,7 +82,6 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.settings.setFieldFormat('url');
       const response = await es.update({
         index: '.kibana',
-        type: '_doc',
         id: 'index-pattern:logstash-*',
         body: {
           'doc': { 'index-pattern': { 'fieldFormatMap': '{"geo.dest":{"id":"number"}}' } }
diff --git a/x-pack/legacy/plugins/apm/dev_docs/github_commands.md b/x-pack/legacy/plugins/apm/dev_docs/github_commands.md
new file mode 100644
index 0000000000000..f2c32bafa7539
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/dev_docs/github_commands.md
@@ -0,0 +1,6 @@
+### Useful Github Pull Request commands
+
+The following commands can be executed by writing them as comments on a pull request:
+
+- `@elasticmachine merge upstream`: Will merge the upstream (eg. master or 7.x) into the branch. This is useful if a bug has been fixed upstream and the fix is necessary to pass CI checks
+- `retest` Re-run the tests. This is useful if a flaky test caused the build to fail
diff --git a/x-pack/legacy/plugins/apm/dev_docs/typescript.md b/x-pack/legacy/plugins/apm/dev_docs/typescript.md
new file mode 100644
index 0000000000000..105c6edabf48f
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/dev_docs/typescript.md
@@ -0,0 +1,11 @@
+#### Optimizing TypeScript 
+
+Kibana and X-Pack are very large TypeScript projects, and it comes at a cost. Editor responsiveness is not great, and the CLI type check for X-Pack takes about a minute. To get faster feedback, we create a smaller APM TypeScript project that only type checks the APM project and the files it uses. This optimization consists of creating a `tsconfig.json` in APM that includes the Kibana/X-Pack typings, and editing the Kibana/X-Pack configurations to not include any files, or removing the configurations altogether. The script configures git to ignore any changes in these files, and has an undo script as well.
+
+To run the optimization:
+
+`$ node x-pack/legacy/plugins/apm/scripts/optimize-tsconfig`
+
+To undo the optimization:
+
+`$ node x-pack/legacy/plugins/apm/scripts/unoptimize-tsconfig`
diff --git a/x-pack/legacy/plugins/apm/dev_docs/vscode_setup.md b/x-pack/legacy/plugins/apm/dev_docs/vscode_setup.md
new file mode 100644
index 0000000000000..e1901b3855f73
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/dev_docs/vscode_setup.md
@@ -0,0 +1,53 @@
+### Visual Studio Code
+
+When using [Visual Studio Code](https://code.visualstudio.com/) with APM it's best to set up a [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) and add the `x-pack/legacy/plugins/apm` directory, the `x-pack` directory, and the root of the Kibana repository to the workspace. This makes it so you can navigate and search within APM and use the wider workspace roots when you need to widen your search.
+
+#### Using the Jest extension
+
+The [vscode-jest extension](https://marketplace.visualstudio.com/items?itemName=Orta.vscode-jest) is a good way to run your Jest tests inside the editor.
+
+Some of the benefits of using the extension over just running it in a terminal are:
+
+• It shows the pass/fail of a test inline in the test file
+• It shows the error message in the test file if it fails
+• You don’t have to have the terminal process running
+• It can automatically update your snapshots when they change
+• Coverage mapping
+
+The extension doesn't really work well if you're trying to use it on all of Kibana or all of X-Pack, but it works well if you configure it to run only on the files in APM.
+
+If you have a workspace configured as described above you should have:
+
+```json
+"jest.disabledWorkspaceFolders": ["kibana", "x-pack"]
+```
+
+in your Workspace settings, and:
+
+```json
+"jest.pathToJest": "node scripts/jest.js --testPathPattern=legacy/plugins/apm",
+"jest.rootPath": "../../.."
+```
+
+in the settings for the APM folder.
+
+#### Jest debugging
+
+To make the [VSCode debugger](https://vscode.readthedocs.io/en/latest/editor/debugging/) work with Jest (you can set breakpoints in the code and tests and use the VSCode debugger) you'll need the [Node Debug extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.node-debug2) installed and can set up a launch configuration like:
+
+```json
+{
+  "type": "node",
+  "name": "APM Jest",
+  "request": "launch",
+  "args": ["--runInBand", "--testPathPattern=legacy/plugins/apm"],
+  "cwd": "${workspaceFolder}/../../..",
+  "console": "internalConsole",
+  "internalConsoleOptions": "openOnSessionStart",
+  "disableOptimisticBPs": true,
+  "program": "${workspaceFolder}/../../../scripts/jest.js",
+  "runtimeVersion": "10.15.2"
+}
+```
+
+(you'll want `runtimeVersion` to match what's in the Kibana root .nvmrc. Depending on your setup, you might be able to remove this line.)
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/esResponse.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/esResponse.ts
index f9c160f4031df..1a15be1f65dec 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/esResponse.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/esResponse.ts
@@ -33,7 +33,6 @@ export const esResponse = {
               hits: [
                 {
                   _index: 'apm-7.0.0-alpha1-error-2018.04.25',
-                  _type: 'doc',
                   _id: 'qH7C_WIBcmGuKeCHJvvT',
                   _score: null,
                   _source: {
@@ -61,7 +60,6 @@ export const esResponse = {
               hits: [
                 {
                   _index: 'apm-7.0.0-alpha1-error-2018.04.25',
-                  _type: 'doc',
                   _id: '_3_D_WIBcmGuKeCHFwOW',
                   _score: null,
                   _source: {
@@ -93,7 +91,6 @@ export const esResponse = {
               hits: [
                 {
                   _index: 'apm-7.0.0-alpha1-error-2018.04.25',
-                  _type: 'doc',
                   _id: 'dn_D_WIBcmGuKeCHQgXJ',
                   _score: null,
                   _source: {
@@ -125,7 +122,6 @@ export const esResponse = {
               hits: [
                 {
                   _index: 'apm-7.0.0-alpha1-error-2018.04.25',
-                  _type: 'doc',
                   _id: 'dX_D_WIBcmGuKeCHQgXJ',
                   _score: null,
                   _source: {
diff --git a/x-pack/legacy/plugins/apm/readme.md b/x-pack/legacy/plugins/apm/readme.md
index 17a72f07470f2..a46b0c2895fca 100644
--- a/x-pack/legacy/plugins/apm/readme.md
+++ b/x-pack/legacy/plugins/apm/readme.md
@@ -29,6 +29,13 @@ cd apm-integration-testing/
 
 _Docker Compose is required_
 
+### Debugging Elasticsearch queries
+
+All APM api endpoints accept `_debug=true` as a query param that will result in the underlying ES query being outputted in the Kibana backend process.
+
+Example:
+`/api/apm/services/my_service?_debug=true`
+
 ### Unit testing
 
 Note: Run the following commands from `kibana/x-pack`.
@@ -45,10 +52,6 @@ node scripts/jest.js plugins/apm --watch
 node scripts/jest.js plugins/apm --updateSnapshot
 ```
 
-### Cypress E2E tests
-
-See the Cypress-specific [readme.md](cypress/README.md)
-
 ### Linting
 
 _Note: Run the following commands from `kibana/`._
@@ -65,63 +68,8 @@ yarn prettier  "./x-pack/legacy/plugins/apm/**/*.{tsx,ts,js}" --write
 yarn eslint ./x-pack/legacy/plugins/apm --fix
 ```
 
-### Useful Github Pull Request commands
-
-The following commands can be executed by writing them as comments on a pull request:
-
- - `@elasticmachine merge upstream`: Will merge the upstream (eg. master or 7.x) into the branch. This is useful if a bug has been fixed upstream and the fix is necessary to pass CI checks
- - `retest` Re-run the tests. This is useful if a flaky test caused the build to fail
-
-### Visual Studio Code
-
-When using [Visual Studio Code](https://code.visualstudio.com/) with APM it's best to set up a [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) and add the `x-pack/legacy/plugins/apm` directory, the `x-pack` directory, and the root of the Kibana repository to the workspace. This makes it so you can navigate and search within APM and use the wider workspace roots when you need to widen your search.
-
-#### Using the Jest extension
-
-The [vscode-jest extension](https://marketplace.visualstudio.com/items?itemName=Orta.vscode-jest) is a good way to run your Jest tests inside the editor.
-
-Some of the benefits of using the extension over just running it in a terminal are:
-
-• It shows the pass/fail of a test inline in the test file
-• It shows the error message in the test file if it fails
-• You don’t have to have the terminal process running
-• It can automatically update your snapshots when they change
-• Coverage mapping
-
-The extension doesn't really work well if you're trying to use it on all of Kibana or all of X-Pack, but it works well if you configure it to run only on the files in APM.
-
-If you have a workspace configured as described above you should have:
-
-```json
-"jest.disabledWorkspaceFolders": ["kibana", "x-pack"]
-```
-
-in your Workspace settings, and:
-
-```json
-"jest.pathToJest": "node scripts/jest.js --testPathPattern=legacy/plugins/apm",
-"jest.rootPath": "../../.."
-```
-
-in the settings for the APM folder.
-
-#### Jest debugging
-
-To make the [VSCode debugger](https://vscode.readthedocs.io/en/latest/editor/debugging/) work with Jest (you can set breakpoints in the code and tests and use the VSCode debugger) you'll need the [Node Debug extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.node-debug2) installed and can set up a launch configuration like:
-
-```json
-{
-  "type": "node",
-  "name": "APM Jest",
-  "request": "launch",
-  "args": ["--runInBand", "--testPathPattern=legacy/plugins/apm"],
-  "cwd": "${workspaceFolder}/../../..",
-  "console": "internalConsole",
-  "internalConsoleOptions": "openOnSessionStart",
-  "disableOptimisticBPs": true,
-  "program": "${workspaceFolder}/../../../scripts/jest.js",
-  "runtimeVersion": "10.15.2"
-}
-```
+#### Further resources
 
-(you'll want `runtimeVersion` to match what's in the Kibana root .nvmrc. Depending on your setup, you might be able to remove this line.)
+- [Cypress integration tests](cypress/README.md)
+- [VSCode setup instructions](./dev_docs/vscode_setup.md)
+- [Github PR commands](./dev_docs/github_commands.md)
diff --git a/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig.js b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig.js
new file mode 100644
index 0000000000000..c1f1472dc9024
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig.js
@@ -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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+const { optimizeTsConfig } = require('./optimize-tsconfig/optimize');
+
+optimizeTsConfig();
diff --git a/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/optimize.js b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/optimize.js
new file mode 100644
index 0000000000000..ef9e393db3eca
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/optimize.js
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable import/no-extraneous-dependencies */
+
+const fs = require('fs');
+const promisify = require('util').promisify;
+const path = require('path');
+const json5 = require('json5');
+const execa = require('execa');
+
+const copyFile = promisify(fs.copyFile);
+const rename = promisify(fs.rename);
+const readFile = promisify(fs.readFile);
+const writeFile = promisify(fs.writeFile);
+
+const {
+  xpackRoot,
+  kibanaRoot,
+  apmRoot,
+  tsconfigTpl,
+  filesToIgnore
+} = require('./paths');
+const { unoptimizeTsConfig } = require('./unoptimize');
+
+function updateParentTsConfigs() {
+  return Promise.all(
+    [
+      path.resolve(xpackRoot, 'apm.tsconfig.json'),
+      path.resolve(kibanaRoot, 'tsconfig.json')
+    ].map(async filename => {
+      const config = json5.parse(await readFile(filename, 'utf-8'));
+
+      await writeFile(
+        filename,
+        JSON.stringify(
+          {
+            ...config,
+            include: []
+          },
+          null,
+          2
+        ),
+        { encoding: 'utf-8' }
+      );
+    })
+  );
+}
+
+async function setIgnoreChanges() {
+  for (const filename of filesToIgnore) {
+    await execa('git', ['update-index', '--skip-worktree', filename]);
+  }
+}
+
+const optimizeTsConfig = () => {
+  return unoptimizeTsConfig()
+    .then(() =>
+      Promise.all([
+        copyFile(tsconfigTpl, path.resolve(apmRoot, './tsconfig.json')),
+        rename(
+          path.resolve(xpackRoot, 'tsconfig.json'),
+          path.resolve(xpackRoot, 'apm.tsconfig.json')
+        )
+      ])
+    )
+    .then(() => updateParentTsConfigs())
+    .then(() => setIgnoreChanges())
+    .then(() => {
+      // eslint-disable-next-line no-console
+      console.log(
+        'Created an optimized tsconfig.json for APM. To undo these changes, run `./scripts/unoptimize-tsconfig.js`'
+      );
+    });
+};
+
+module.exports = {
+  optimizeTsConfig
+};
diff --git a/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/paths.js b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/paths.js
new file mode 100644
index 0000000000000..cdb8e4d878ea3
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/paths.js
@@ -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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+const path = require('path');
+
+const apmRoot = path.resolve(__dirname, '../..');
+const xpackRoot = path.resolve(apmRoot, '../../..');
+const kibanaRoot = path.resolve(xpackRoot, '..');
+
+const tsconfigTpl = path.resolve(__dirname, './tsconfig.json');
+
+const filesToIgnore = [
+  path.resolve(xpackRoot, 'tsconfig.json'),
+  path.resolve(kibanaRoot, 'tsconfig.json')
+];
+
+module.exports = {
+  apmRoot,
+  xpackRoot,
+  kibanaRoot,
+  tsconfigTpl,
+  filesToIgnore
+};
diff --git a/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/tsconfig.json b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/tsconfig.json
new file mode 100644
index 0000000000000..e7d9abea65a3a
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../../../apm.tsconfig.json",
+  "include": [
+    "./**/*",
+    "../../../typings/**/*"
+  ],
+  "exclude": [
+    "**/__fixtures__/**/*",
+    "./cypress/**/*"
+  ]
+}
diff --git a/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/unoptimize.js b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/unoptimize.js
new file mode 100644
index 0000000000000..3fdf2a97363a8
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/unoptimize.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+/* eslint-disable import/no-extraneous-dependencies */
+
+const path = require('path');
+const execa = require('execa');
+const fs = require('fs');
+const promisify = require('util').promisify;
+const removeFile = promisify(fs.unlink);
+const exists = promisify(fs.exists);
+
+const { apmRoot, filesToIgnore } = require('./paths');
+
+async function unoptimizeTsConfig() {
+  for (const filename of filesToIgnore) {
+    await execa('git', ['update-index', '--no-skip-worktree', filename]);
+    await execa('git', ['checkout', filename]);
+  }
+
+  const apmTsConfig = path.join(apmRoot, 'tsconfig.json');
+  if (await exists(apmTsConfig)) {
+    await removeFile(apmTsConfig);
+  }
+}
+
+module.exports = {
+  unoptimizeTsConfig: () => {
+    return unoptimizeTsConfig().then(() => {
+      // eslint-disable-next-line no-console
+      console.log('Removed APM TypeScript optimizations');
+    });
+  }
+};
diff --git a/x-pack/legacy/plugins/apm/scripts/unoptimize-tsconfig.js b/x-pack/legacy/plugins/apm/scripts/unoptimize-tsconfig.js
new file mode 100644
index 0000000000000..5362b6a6d52e2
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/unoptimize-tsconfig.js
@@ -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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+const { unoptimizeTsConfig } = require('./optimize-tsconfig/unoptimize');
+
+unoptimizeTsConfig();
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.mocks.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.mocks.ts
index 982077e2e6665..1ed7f56e0b10d 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.mocks.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.mocks.ts
@@ -22,7 +22,6 @@ export const searchMocks = {
     hits: [
       {
         _index: '.apm-agent-configuration',
-        _type: '_doc',
         _id: '-aQHsm0BxZLczArvNQYW',
         _score: 0.9808292,
         _source: {
@@ -39,7 +38,6 @@ export const searchMocks = {
       },
       {
         _index: '.apm-agent-configuration',
-        _type: '_doc',
         _id: '-KQHsm0BxZLczArvNAb0',
         _score: 0.18232156,
         _source: {
@@ -56,7 +54,6 @@ export const searchMocks = {
       },
       {
         _index: '.apm-agent-configuration',
-        _type: '_doc',
         _id: '96QHsm0BxZLczArvNAbD',
         _score: 0.0,
         _source: {
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/mock-responses/mlBucketSpanResponse.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/mock-responses/mlBucketSpanResponse.ts
index a4e54d240f204..4c329fa9d1035 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/mock-responses/mlBucketSpanResponse.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/mock-responses/mlBucketSpanResponse.ts
@@ -19,7 +19,6 @@ export const mlBucketSpanResponse = {
     hits: [
       {
         _index: '.ml-anomalies-shared',
-        _type: 'doc',
         _id:
           'opbeans-go-request-high_mean_response_time_model_plot_1542636000000_900_0_29791_0',
         _score: 1.0,
diff --git a/x-pack/legacy/plugins/apm/typings/common.ts b/x-pack/legacy/plugins/apm/typings/common.d.ts
similarity index 77%
rename from x-pack/legacy/plugins/apm/typings/common.ts
rename to x-pack/legacy/plugins/apm/typings/common.d.ts
index 2fafceb32209c..d79b05ed99b49 100644
--- a/x-pack/legacy/plugins/apm/typings/common.ts
+++ b/x-pack/legacy/plugins/apm/typings/common.d.ts
@@ -4,6 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import '../../infra/types/rison_node';
+import '../../infra/types/eui';
+// EUIBasicTable
+import {} from '../../reporting/public/components/report_listing';
+// .svg
+import '../../canvas/types/webpack';
+
 // Allow unknown properties in an object
 export type AllowUnknownProperties<T> = T extends Array<infer X>
   ? Array<AllowUnknownObjectProperties<X>>
diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/control_settings/custom_interval.tsx b/x-pack/legacy/plugins/canvas/public/components/workpad_header/control_settings/custom_interval.tsx
index 0bcb0c89ba1cc..ab34f332dc126 100644
--- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/control_settings/custom_interval.tsx
+++ b/x-pack/legacy/plugins/canvas/public/components/workpad_header/control_settings/custom_interval.tsx
@@ -54,7 +54,7 @@ export const CustomInterval = ({ gutterSize, buttonSize, onSubmit, defaultValue
         </EuiFlexItem>
 
         <EuiFlexItem grow={false}>
-          <EuiFormRow label="&nbsp;">
+          <EuiFormRow hasEmptyLabelSpace={true} compressed>
             <EuiButton
               disabled={isInvalid}
               size={buttonSize}
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap b/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap
index 01a8337d2d313..782d5364de821 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with default propertie
 "<div class=\\"kbnCanvas\\"><style>html body .kbnCanvas { height: 720px; width: 1080px; }</style><div class=\\"root\\" style=\\"height: 768px; width: 1080px;\\"><div class=\\"container\\" style=\\"height: 720px; width: 1080px;\\"><div class=\\"page\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 100px; width: 150px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\"><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 0 0-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 0 0-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 0 0 6.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 0 0-2.413-.815 3.978 3.978 0 0 0-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 0 0 2.4.822 3.977 3.977 0 0 0 3.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 0 0-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 0 1 0-.768l4.61-4.685a.552.552 0 0 0 0-.771.53.53 0 0 0-.759 0l-4.61 4.684a1.65 1.65 0 0 0 0 2.312l4.61 4.684a.53.53 0 0 0 .76 0 .552.552 0 0 0 0-.771z\\"></path></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 0 1 1.142-1.535l2.872.313L6.099.05a8.166 8.166 0 0 1 3.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 0 1 1.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 0 1-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 0 1-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 0 1-1.899-3.293zm4.663 1.986a1 1 0 0 1 1.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 0 1 1.023-.59l2.358.256a7.23 7.23 0 0 0 1.194-2.068l-1.401-1.913a1 1 0 0 1 0-1.182l1.4-1.912a7.165 7.165 0 0 0-1.192-2.069l-2.359.257a1 1 0 0 1-1.023-.591L9.193.924a7.165 7.165 0 0 0-2.387.001L5.85 3.094a1 1 0 0 1-1.023.59l-2.358-.256a7.23 7.23 0 0 0-1.194 2.068l1.401 1.913a1 1 0 0 1 0 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-1a2 2 0 1 0 0-4 2 2 0 0 0 0 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
@@ -18,7 +18,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with height specified
 "<div class=\\"kbnCanvas\\"><style>html body .kbnCanvas { height: 350px; width: 525px; }</style><div class=\\"root\\" style=\\"height: 398px; width: 525px;\\"><div class=\\"container\\" style=\\"height: 350px; width: 525px;\\"><div class=\\"page\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 100px; width: 150px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\"><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 0 0-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 0 0-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 0 0 6.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 0 0-2.413-.815 3.978 3.978 0 0 0-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 0 0 2.4.822 3.977 3.977 0 0 0 3.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 0 0-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 0 1 0-.768l4.61-4.685a.552.552 0 0 0 0-.771.53.53 0 0 0-.759 0l-4.61 4.684a1.65 1.65 0 0 0 0 2.312l4.61 4.684a.53.53 0 0 0 .76 0 .552.552 0 0 0 0-.771z\\"></path></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 0 1 1.142-1.535l2.872.313L6.099.05a8.166 8.166 0 0 1 3.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 0 1 1.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 0 1-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 0 1-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 0 1-1.899-3.293zm4.663 1.986a1 1 0 0 1 1.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 0 1 1.023-.59l2.358.256a7.23 7.23 0 0 0 1.194-2.068l-1.401-1.913a1 1 0 0 1 0-1.182l1.4-1.912a7.165 7.165 0 0 0-1.192-2.069l-2.359.257a1 1 0 0 1-1.023-.591L9.193.924a7.165 7.165 0 0 0-2.387.001L5.85 3.094a1 1 0 0 1-1.023.59l-2.358-.256a7.23 7.23 0 0 0-1.194 2.068l1.401 1.913a1 1 0 0 1 0 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-1a2 2 0 1 0 0-4 2 2 0 0 0 0 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
@@ -30,7 +30,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with page specified 2`
 "<div class=\\"kbnCanvas\\"><style>html body .kbnCanvas { height: 720px; width: 1080px; }</style><div class=\\"root\\" style=\\"height: 768px; width: 1080px;\\"><div class=\\"container\\" style=\\"height: 720px; width: 1080px;\\"><div class=\\"page\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 100px; width: 150px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\"><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 0 0-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 0 0-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 0 0 6.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 0 0-2.413-.815 3.978 3.978 0 0 0-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 0 0 2.4.822 3.977 3.977 0 0 0 3.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 0 0-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 0 1 0-.768l4.61-4.685a.552.552 0 0 0 0-.771.53.53 0 0 0-.759 0l-4.61 4.684a1.65 1.65 0 0 0 0 2.312l4.61 4.684a.53.53 0 0 0 .76 0 .552.552 0 0 0 0-.771z\\"></path></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 0 1 1.142-1.535l2.872.313L6.099.05a8.166 8.166 0 0 1 3.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 0 1 1.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 0 1-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 0 1-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 0 1-1.899-3.293zm4.663 1.986a1 1 0 0 1 1.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 0 1 1.023-.59l2.358.256a7.23 7.23 0 0 0 1.194-2.068l-1.401-1.913a1 1 0 0 1 0-1.182l1.4-1.912a7.165 7.165 0 0 0-1.192-2.069l-2.359.257a1 1 0 0 1-1.023-.591L9.193.924a7.165 7.165 0 0 0-2.387.001L5.85 3.094a1 1 0 0 1-1.023.59l-2.358-.256a7.23 7.23 0 0 0-1.194 2.068l1.401 1.913a1 1 0 0 1 0 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-1a2 2 0 1 0 0-4 2 2 0 0 0 0 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
@@ -42,7 +42,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with width and height
 "<div class=\\"kbnCanvas\\"><style>html body .kbnCanvas { height: 350px; width: 350px; }</style><div class=\\"root\\" style=\\"height: 398px; width: 350px;\\"><div class=\\"container\\" style=\\"height: 350px; width: 350px;\\"><div class=\\"page\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 100px; width: 150px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\"><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 0 0-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 0 0-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 0 0 6.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 0 0-2.413-.815 3.978 3.978 0 0 0-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 0 0 2.4.822 3.977 3.977 0 0 0 3.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 0 0-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 0 1 0-.768l4.61-4.685a.552.552 0 0 0 0-.771.53.53 0 0 0-.759 0l-4.61 4.684a1.65 1.65 0 0 0 0 2.312l4.61 4.684a.53.53 0 0 0 .76 0 .552.552 0 0 0 0-.771z\\"></path></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 0 1 1.142-1.535l2.872.313L6.099.05a8.166 8.166 0 0 1 3.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 0 1 1.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 0 1-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 0 1-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 0 1-1.899-3.293zm4.663 1.986a1 1 0 0 1 1.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 0 1 1.023-.59l2.358.256a7.23 7.23 0 0 0 1.194-2.068l-1.401-1.913a1 1 0 0 1 0-1.182l1.4-1.912a7.165 7.165 0 0 0-1.192-2.069l-2.359.257a1 1 0 0 1-1.023-.591L9.193.924a7.165 7.165 0 0 0-2.387.001L5.85 3.094a1 1 0 0 1-1.023.59l-2.358-.256a7.23 7.23 0 0 0-1.194 2.068l1.401 1.913a1 1 0 0 1 0 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-1a2 2 0 1 0 0-4 2 2 0 0 0 0 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
@@ -54,7 +54,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with width specified 2
 "<div class=\\"kbnCanvas\\"><style>html body .kbnCanvas { height: 267px; width: 400px; }</style><div class=\\"root\\" style=\\"height: 315px; width: 400px;\\"><div class=\\"container\\" style=\\"height: 267px; width: 400px;\\"><div class=\\"page\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 100px; width: 150px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\"><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 0 0-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 0 0-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 0 0 6.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 0 0-2.413-.815 3.978 3.978 0 0 0-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 0 0 2.4.822 3.977 3.977 0 0 0 3.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 0 0-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 0 1 0-.768l4.61-4.685a.552.552 0 0 0 0-.771.53.53 0 0 0-.759 0l-4.61 4.684a1.65 1.65 0 0 0 0 2.312l4.61 4.684a.53.53 0 0 0 .76 0 .552.552 0 0 0 0-.771z\\"></path></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 0 1 1.142-1.535l2.872.313L6.099.05a8.166 8.166 0 0 1 3.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 0 1 1.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 0 1-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 0 1-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 0 1-1.899-3.293zm4.663 1.986a1 1 0 0 1 1.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 0 1 1.023-.59l2.358.256a7.23 7.23 0 0 0 1.194-2.068l-1.401-1.913a1 1 0 0 1 0-1.182l1.4-1.912a7.165 7.165 0 0 0-1.192-2.069l-2.359.257a1 1 0 0 1-1.023-.591L9.193.924a7.165 7.165 0 0 0-2.387.001L5.85 3.094a1 1 0 0 1-1.023.59l-2.358-.256a7.23 7.23 0 0 0-1.194 2.068l1.401 1.913a1 1 0 0 1 0 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-1a2 2 0 1 0 0-4 2 2 0 0 0 0 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot
index 1b351e9ac0f6a..c3352b52c591d 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot
@@ -88,9 +88,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -126,9 +126,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -165,9 +165,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -205,9 +205,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -249,9 +249,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -290,9 +290,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -332,9 +332,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -368,9 +368,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -418,9 +418,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -471,9 +471,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -509,9 +509,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -545,9 +545,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -582,9 +582,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -620,9 +620,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -658,9 +658,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -698,9 +698,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -735,9 +735,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -772,9 +772,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -811,9 +811,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -862,9 +862,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -905,9 +905,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -996,9 +996,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1065,9 +1065,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1105,9 +1105,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1146,9 +1146,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1188,9 +1188,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1228,9 +1228,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1268,9 +1268,9 @@ exports[`Storyshots shareables/Canvas component 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1312,6 +1312,11 @@ exports[`Storyshots shareables/Canvas component 1`] = `
             >
               <div
                 className="euiFlexItem euiFlexItem--flexGrowZero"
+                style={
+                  Object {
+                    "flexShrink": 0,
+                  }
+                }
               >
                 <a
                   className="euiLink euiLink--primary"
@@ -1582,9 +1587,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1620,9 +1625,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1659,9 +1664,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1699,9 +1704,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1743,9 +1748,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1784,9 +1789,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1826,9 +1831,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1862,9 +1867,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1912,9 +1917,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -1965,9 +1970,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2003,9 +2008,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2039,9 +2044,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2076,9 +2081,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2114,9 +2119,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2152,9 +2157,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2192,9 +2197,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2229,9 +2234,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2266,9 +2271,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2305,9 +2310,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2356,9 +2361,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2399,9 +2404,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2490,9 +2495,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2559,9 +2564,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2599,9 +2604,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2640,9 +2645,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2682,9 +2687,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2722,9 +2727,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2762,9 +2767,9 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 177.77777777777777,
+                  "width": 1280,
                 }
               }
             >
@@ -2806,6 +2811,11 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
             >
               <div
                 className="euiFlexItem euiFlexItem--flexGrowZero"
+                style={
+                  Object {
+                    "flexShrink": 0,
+                  }
+                }
               >
                 <a
                   className="euiLink euiLink--primary"
@@ -3074,9 +3084,9 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
               className="preview"
               style={
                 Object {
-                  "height": 100,
+                  "height": 720,
                   "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                  "width": 150,
+                  "width": 1080,
                 }
               }
             >
@@ -3116,6 +3126,11 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
             >
               <div
                 className="euiFlexItem euiFlexItem--flexGrowZero"
+                style={
+                  Object {
+                    "flexShrink": 0,
+                  }
+                }
               >
                 <a
                   className="euiLink euiLink--primary"
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap b/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap
index c287fe96c0584..746e1ca4f057b 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`<App /> App renders properly 1`] = `
 "<div class=\\"root\\" style=\\"height: 768px; width: 1080px;\\"><div class=\\"container\\" style=\\"height: 720px; width: 1080px;\\"><div class=\\"page\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 100px; width: 150px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoading\\" focusable=\\"false\\"></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"></svg></button></div></div></div></div></div></div></div></div></div></div>"
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/canvas.module.scss b/x-pack/legacy/plugins/canvas/shareable_runtime/components/canvas.module.scss
index 88619c150c1f5..f7e47d8ddeb2b 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/canvas.module.scss
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/canvas.module.scss
@@ -18,5 +18,7 @@
 
 :global .kbnCanvas :local .page {
   position: absolute;
-  transform-origin: center center;
+  transform-origin: left top;
+  top: 0;
+  left: 0;
 }
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot
index bad95ca4fb5b5..6570016336d9e 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot
@@ -41,9 +41,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -79,9 +79,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -118,9 +118,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -158,9 +158,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -202,9 +202,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -243,9 +243,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -285,9 +285,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -321,9 +321,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -371,9 +371,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -424,9 +424,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -462,9 +462,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -498,9 +498,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -535,9 +535,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -573,9 +573,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -611,9 +611,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -651,9 +651,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -688,9 +688,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -725,9 +725,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -764,9 +764,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -815,9 +815,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -858,9 +858,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -949,9 +949,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -1018,9 +1018,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -1058,9 +1058,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -1099,9 +1099,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -1141,9 +1141,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -1181,9 +1181,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -1221,9 +1221,9 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 177.77777777777777,
+                "width": 1280,
               }
             }
           >
@@ -1265,6 +1265,11 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
           >
             <div
               className="euiFlexItem euiFlexItem--flexGrowZero"
+              style={
+                Object {
+                  "flexShrink": 0,
+                }
+              }
             >
               <a
                 className="euiLink euiLink--primary"
@@ -1487,9 +1492,9 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
             className="preview"
             style={
               Object {
-                "height": 100,
+                "height": 720,
                 "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-                "width": 150,
+                "width": 1080,
               }
             }
           >
@@ -1529,6 +1534,11 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
           >
             <div
               className="euiFlexItem euiFlexItem--flexGrowZero"
+              style={
+                Object {
+                  "flexShrink": 0,
+                }
+              }
             >
               <a
                 className="euiLink euiLink--primary"
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/scrubber.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/scrubber.examples.storyshot
index cc27e42e3fe65..5fa3890f7fedd 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/scrubber.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/scrubber.examples.storyshot
@@ -33,9 +33,9 @@ exports[`Storyshots shareables/Footer/Scrubber component 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 150,
+              "width": 1080,
             }
           }
         >
@@ -92,9 +92,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -130,9 +130,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -169,9 +169,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -209,9 +209,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -253,9 +253,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -294,9 +294,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -336,9 +336,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -372,9 +372,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -422,9 +422,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -475,9 +475,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -513,9 +513,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -549,9 +549,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -586,9 +586,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -624,9 +624,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -662,9 +662,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -702,9 +702,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -739,9 +739,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -776,9 +776,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -815,9 +815,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -866,9 +866,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -909,9 +909,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -1000,9 +1000,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -1069,9 +1069,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -1109,9 +1109,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -1150,9 +1150,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -1192,9 +1192,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -1232,9 +1232,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -1272,9 +1272,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: austin 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 177.77777777777777,
+              "width": 1280,
             }
           }
         >
@@ -1333,9 +1333,9 @@ exports[`Storyshots shareables/Footer/Scrubber contextual: hello 1`] = `
           className="preview"
           style={
             Object {
-              "height": 100,
+              "height": 720,
               "transform": "scale3d(0.1388888888888889, 0.1388888888888889, 1)",
-              "width": 150,
+              "width": 1080,
             }
           }
         >
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot
index 6bb60b8e574a2..8d0ced56d1474 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot
@@ -19,6 +19,11 @@ exports[`Storyshots shareables/Footer/Title component 1`] = `
   >
     <div
       className="euiFlexItem euiFlexItem--flexGrowZero"
+      style={
+        Object {
+          "flexShrink": 0,
+        }
+      }
     >
       <a
         className="euiLink euiLink--primary"
@@ -83,6 +88,11 @@ exports[`Storyshots shareables/Footer/Title contextual: austin 1`] = `
   >
     <div
       className="euiFlexItem euiFlexItem--flexGrowZero"
+      style={
+        Object {
+          "flexShrink": 0,
+        }
+      }
     >
       <a
         className="euiLink euiLink--primary"
@@ -147,6 +157,11 @@ exports[`Storyshots shareables/Footer/Title contextual: hello 1`] = `
   >
     <div
       className="euiFlexItem euiFlexItem--flexGrowZero"
+      style={
+        Object {
+          "flexShrink": 0,
+        }
+      }
     >
       <a
         className="euiLink euiLink--primary"
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.module.scss b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.module.scss
index 0333f393e1f8b..326bbde3401e9 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.module.scss
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.module.scss
@@ -3,6 +3,7 @@
 :global .kbnCanvas :local .root {
   margin: 0 $euiSizeS;
   cursor: pointer;
+  flex-shrink: 0;
 }
 
 :global .kbnCanvas :local .root :global .canvasPage {
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.tsx b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.tsx
index 0369a6f69f04c..7908b3edb981f 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.tsx
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.tsx
@@ -58,13 +58,10 @@ export const PagePreviewComponent: FC<Props> = ({
   workpadWidth,
 }) => {
   const scale = height / workpadHeight;
-  const style = {
-    height: workpadHeight * scale,
-    width: workpadWidth * scale,
-  };
 
   const transform = {
-    ...style,
+    height: workpadHeight,
+    width: workpadWidth,
     transform: `scale3d(${scale}, ${scale}, 1)`,
   };
 
@@ -73,7 +70,10 @@ export const PagePreviewComponent: FC<Props> = ({
       className={css.root}
       onClick={() => onClick(index)}
       onKeyPress={() => onClick(index)}
-      style={style}
+      style={{
+        height: workpadHeight * scale,
+        width: workpadWidth * scale,
+      }}
     >
       <div className={css.preview} style={transform}>
         <PageComponent {...{ page }} height={workpadHeight} width={workpadWidth} />
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot
index 7c4395820776e..b159e6499ed9f 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot
@@ -128,18 +128,8 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: off,
           className="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <div
-            className="euiFormRow"
+            className="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--compressed"
           >
-            <div
-              className="euiFormRow__labelWrapper"
-            >
-              <label
-                className="euiFormLabel euiFormRow__label"
-                htmlFor="generated-id"
-              >
-                 
-              </label>
-            </div>
             <div
               className="euiFormRow__fieldWrapper"
             >
@@ -303,18 +293,8 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: on, 5
           className="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <div
-            className="euiFormRow"
+            className="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--compressed"
           >
-            <div
-              className="euiFormRow__labelWrapper"
-            >
-              <label
-                className="euiFormLabel euiFormRow__label"
-                htmlFor="generated-id"
-              >
-                 
-              </label>
-            </div>
             <div
               className="euiFormRow__fieldWrapper"
             >
@@ -478,18 +458,8 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings contextual 1`] =
           className="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <div
-            className="euiFormRow"
+            className="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--compressed"
           >
-            <div
-              className="euiFormRow__labelWrapper"
-            >
-              <label
-                className="euiFormLabel euiFormRow__label"
-                htmlFor="generated-id"
-              >
-                 
-              </label>
-            </div>
             <div
               className="euiFormRow__fieldWrapper"
             >
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
index 072cf01255a0d..8c14377374295 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
@@ -396,18 +396,8 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                           class="euiFlexItem euiFlexItem--flexGrowZero"
                         >
                           <div
-                            class="euiFormRow"
+                            class="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--compressed"
                           >
-                            <div
-                              class="euiFormRow__labelWrapper"
-                            >
-                              <label
-                                class="euiFormLabel euiFormRow__label"
-                                for="generated-id"
-                              >
-                                 
-                              </label>
-                            </div>
                             <div
                               class="euiFormRow__fieldWrapper"
                             >
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/title.tsx b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/title.tsx
index 955a8ee530db5..6e3eba7be08d6 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/title.tsx
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/title.tsx
@@ -20,7 +20,7 @@ interface Props {
  */
 export const TitleComponent: FC<Props> = ({ title }) => (
   <EuiFlexGroup gutterSize="s" justifyContent="flexStart" alignItems="center">
-    <EuiFlexItem grow={false}>
+    <EuiFlexItem grow={false} style={{ flexShrink: 0 }}>
       <EuiLink href="https://www.elastic.co" title="Powered by Elastic.co">
         <EuiIcon type="logoElastic" size="l" />
       </EuiLink>
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/template.html b/x-pack/legacy/plugins/canvas/shareable_runtime/template.html
index 94fe208582667..cb43ceb9af131 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/template.html
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/template.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 
 <head>
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/webpack.config.js b/x-pack/legacy/plugins/canvas/shareable_runtime/webpack.config.js
index f0f98f0f44848..c711f9510a10b 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/webpack.config.js
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/webpack.config.js
@@ -41,6 +41,7 @@ module.exports = {
         KIBANA_ROOT,
         'src/legacy/core_plugins/interpreter/public/types'
       ),
+      tinymath: path.resolve(KIBANA_ROOT, 'node_modules/tinymath/lib/tinymath.es5.js'),
     },
     extensions: ['.js', '.json', '.ts', '.tsx', '.scss'],
   },
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.forget_follower.json b/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.forget_follower.json
index f2aabe9ef4257..aa9a42c54dff4 100644
--- a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.forget_follower.json
+++ b/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.forget_follower.json
@@ -6,6 +6,6 @@
     "patterns": [
       "{indices}/_ccr/forget_follower"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-forget-follower.html"
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/current"
   }
 }
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/graph.explore.json b/x-pack/legacy/plugins/console_extensions/spec/generated/graph.explore.json
index d886f663fd42c..d4a81c03255f9 100644
--- a/x-pack/legacy/plugins/console_extensions/spec/generated/graph.explore.json
+++ b/x-pack/legacy/plugins/console_extensions/spec/generated/graph.explore.json
@@ -9,8 +9,7 @@
       "POST"
     ],
     "patterns": [
-      "{indices}/_graph/explore",
-      "{indices}/{type}/_graph/explore"
+      "{indices}/_graph/explore"
     ],
     "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/graph-explore-api.html"
   }
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_privileges.json b/x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_privileges.json
index a7b56aa904bb2..b44798013fe59 100644
--- a/x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_privileges.json
+++ b/x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_privileges.json
@@ -13,6 +13,6 @@
     "patterns": [
       "_security/privilege/{application}/{name}"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-privilege.html"
+    "documentation": "TODO"
   }
 }
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.put_privileges.json b/x-pack/legacy/plugins/console_extensions/spec/generated/security.put_privileges.json
index 4dbe88c526f0e..7ecffc780c066 100644
--- a/x-pack/legacy/plugins/console_extensions/spec/generated/security.put_privileges.json
+++ b/x-pack/legacy/plugins/console_extensions/spec/generated/security.put_privileges.json
@@ -14,6 +14,6 @@
     "patterns": [
       "_security/privilege/"
     ],
-    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-privileges.html"
+    "documentation": "TODO"
   }
 }
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.delete_privileges.json b/x-pack/legacy/plugins/console_extensions/spec/overrides/security.delete_privileges.json
new file mode 100644
index 0000000000000..35fb78c532c12
--- /dev/null
+++ b/x-pack/legacy/plugins/console_extensions/spec/overrides/security.delete_privileges.json
@@ -0,0 +1,3 @@
+{
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-privilege.html"
+}
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.put_privileges.json b/x-pack/legacy/plugins/console_extensions/spec/overrides/security.put_privileges.json
new file mode 100644
index 0000000000000..ae37d9a889543
--- /dev/null
+++ b/x-pack/legacy/plugins/console_extensions/spec/overrides/security.put_privileges.json
@@ -0,0 +1,3 @@
+{
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-privileges.html"
+}
diff --git a/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.js b/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.js
index 96be9eed2b467..b981f732d1bc6 100644
--- a/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.js
+++ b/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.js
@@ -894,10 +894,6 @@ module.exports = (function () {
           existingEdge.doc_count = Math.max(existingEdge.doc_count, edge.doc_count);
           continue;
         }
-        // Inferred edges were a feature that used Levenshtein edit distance on node labels
-        // to determine connections - removed that feature but may bring back.
-
-        const inferred = edge.inferred ? true : false;
         const newEdge = {
           'source': srcWrapperObj,
           'target': targetWrapperObj,
@@ -905,7 +901,6 @@ module.exports = (function () {
           'width': edge.width,
           'id': edge.id,
           'doc_count': edge.doc_count,
-          'inferred': inferred
         };
         if (edge.label) {
           newEdge.label = edge.label;
diff --git a/x-pack/legacy/plugins/graph/public/angular/templates/index.html b/x-pack/legacy/plugins/graph/public/angular/templates/index.html
index b3f5bce7ea6ec..20b1059ae45ec 100644
--- a/x-pack/legacy/plugins/graph/public/angular/templates/index.html
+++ b/x-pack/legacy/plugins/graph/public/angular/templates/index.html
@@ -377,61 +377,6 @@
             } }}"
           >{{mc.v2}}</small>
         </div>
-
-
-
-        <div class="gphSidebar__panel" ng-if="(detail.inferredEdge)">
-          <div class="gphSidebar__header">
-            <span class="kuiIcon fa-cog"></span>
-            {{ ::'xpack.graph.sidebar.similarLabelsTitle' | i18n: { defaultMessage: 'Similar labels' } }}
-          </div>
-
-          <div class="form-group form-group-sm gphFormGroup--small">
-            <div style="line-height: 24px;">
-              <button
-                tooltip="{{ ::'xpack.graph.sidebar.similarLabels.mergeTargetToSrcButtonTooltip' | i18n: {
-                  defaultMessage: 'Merge {targetLabel} into {srcLabel}',
-                  values: { targetLabel: detail.inferredEdge.topTarget.label, srcLabel: detail.inferredEdge.topSrc.label },
-                } }}"
-                type="button" style="vertical-align: top;" class="kuiButton kuiButton--basic kuiButton--small"
-                ng-click="performMerge(detail.inferredEdge.topTarget.id, detail.inferredEdge.topSrc.id)">
-                <span class="kui fa-chevron-circle-down"></span>
-              </button>
-              <svg width="24" height="24">
-                <circle class="gphNode__circle " r="10" cx="12" cy="12" ng-attr-style="fill:{{detail.inferredEdge.topSrc.color}}" />
-
-                <text ng-if="detail.inferredEdge.topSrc.icon" class="fa gphNode__text" text-anchor="middle" x="12" y="16">{{detail.inferredEdge.topSrc.icon.code}}</text>
-              </svg>
-              <span style="vertical-align: top;">{{detail.inferredEdge.topSrc.label}}</span>
-            </div>
-            <div style="line-height: 24px;">
-              <button
-                tooltip="{{ ::'xpack.graph.sidebar.similarLabels.mergeSrcToTargetButtonTooltip' | i18n: {
-                  defaultMessage: 'Merge {srcLabel} into {targetLabel}',
-                  values: { targetLabel: detail.inferredEdge.topTarget.label, srcLabel: detail.inferredEdge.topSrc.label },
-                } }}"
-                type="button" style="vertical-align: top;" class="kuiButton kuiButton--basic kuiButton--small"
-                ng-click="performMerge(detail.inferredEdge.topSrc.id, detail.inferredEdge.topTarget.id)">
-                <span class="kuiIcon fa-chevron-circle-up"></span>
-              </button>
-
-              <svg width="24" height="24">
-                <circle class="gphNode__circle " r="10" cx="12" cy="12" ng-attr-style="fill:{{detail.inferredEdge.topTarget.color}}" />
-
-                <text ng-if="detail.inferredEdge.topTarget.icon" class="fa gphNode__text" text-anchor="middle" x="12" y="16">{{detail.inferredEdge.topTarget.icon.code}}</text>
-              </svg>
-              <span style="vertical-align: top;">{{detail.inferredEdge.topTarget.label}}</span>
-
-            </div>
-
-            <div
-              class="col-sm-10"
-              i18n-id="xpack.graph.sidebar.similarLabels.keyTermsText"
-              i18n-default-message="Key terms: {inferredEdgeLabel}"
-              i18n-values="{ html_inferredEdgeLabel: '<small>' + detail.inferredEdge.label + '</small>' }"
-            ></div>
-          </div>
-        </div>
       </div>
       <!-- end edge-merge detail panel -->
 
diff --git a/x-pack/legacy/plugins/graph/public/app.js b/x-pack/legacy/plugins/graph/public/app.js
index fd7a292762d59..b60f6b267ad84 100644
--- a/x-pack/legacy/plugins/graph/public/app.js
+++ b/x-pack/legacy/plugins/graph/public/app.js
@@ -347,11 +347,7 @@ export function initGraphApp(angularModule, deps) {
     };
 
     $scope.clickEdge = function (edge) {
-      if (edge.inferred) {
-        $scope.setDetail ({ 'inferredEdge': edge });
-      }else {
-        $scope.workspace.getAllIntersections($scope.handleMergeCandidatesCallback, [edge.topSrc, edge.topTarget]);
-      }
+      $scope.workspace.getAllIntersections($scope.handleMergeCandidatesCallback, [edge.topSrc, edge.topTarget]);
     };
 
     $scope.submit = function (searchTerm) {
diff --git a/x-pack/legacy/plugins/graph/public/components/graph_visualization/_graph_visualization.scss b/x-pack/legacy/plugins/graph/public/components/graph_visualization/_graph_visualization.scss
index a2e34606cea17..975e4e84d6b0d 100644
--- a/x-pack/legacy/plugins/graph/public/components/graph_visualization/_graph_visualization.scss
+++ b/x-pack/legacy/plugins/graph/public/components/graph_visualization/_graph_visualization.scss
@@ -24,10 +24,6 @@
     stroke: $euiColorDarkShade;
     stroke-opacity: 0.95;
   }
-
-  &--inferred {
-    stroke-dasharray: 5, 5;
-  }
 }
 
 .gphNode {
diff --git a/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.test.tsx b/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.test.tsx
index deeea8175da8e..be3ebee9f0e23 100644
--- a/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.test.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.test.tsx
@@ -80,7 +80,6 @@ describe('graph_visualization', () => {
   ];
   const edges: GroupAwareWorkspaceEdge[] = [
     {
-      inferred: false,
       isSelected: true,
       label: '',
       topSrc: nodes[0],
@@ -91,7 +90,6 @@ describe('graph_visualization', () => {
       width: 2,
     },
     {
-      inferred: false,
       isSelected: true,
       label: '',
       topSrc: nodes[1],
diff --git a/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.tsx b/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.tsx
index 696e94da68a68..162e4d01db6a4 100644
--- a/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.tsx
@@ -94,7 +94,6 @@ export function GraphVisualization({
                 }}
                 className={classNames('gphEdge', {
                   'gphEdge--selected': edge.isSelected,
-                  'gphEdge--inferred': edge.inferred,
                 })}
                 style={{ strokeWidth: edge.width }}
                 strokeLinecap="round"
diff --git a/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.test.ts b/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.test.ts
index 6aa9fd671ffcb..c7f8b72cc1abf 100644
--- a/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.test.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.test.ts
@@ -91,8 +91,8 @@ describe('deserialize', () => {
           },
         ],
         links: [
-          { inferred: false, label: '', weight: 5, width: 5, source: 2, target: 0 },
-          { inferred: false, label: '', weight: 5, width: 5, source: 2, target: 4 },
+          { label: '', weight: 5, width: 5, source: 2, target: 0 },
+          { label: '', weight: 5, width: 5, source: 2, target: 4 },
         ],
         urlTemplates: [
           {
diff --git a/x-pack/legacy/plugins/graph/public/services/persistence/serialize.test.ts b/x-pack/legacy/plugins/graph/public/services/persistence/serialize.test.ts
index 95f55bcc87eb7..0e0c750383a71 100644
--- a/x-pack/legacy/plugins/graph/public/services/persistence/serialize.test.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/serialize.test.ts
@@ -138,7 +138,6 @@ describe('serialize', () => {
 
     // A <-> C
     appState.workspace.edges.push({
-      inferred: false,
       label: '',
       source: appState.workspace.nodes[2],
       target: appState.workspace.nodes[0],
@@ -148,7 +147,6 @@ describe('serialize', () => {
 
     // C <-> E
     appState.workspace.edges.push({
-      inferred: false,
       label: '',
       source: appState.workspace.nodes[2],
       target: appState.workspace.nodes[4],
@@ -187,7 +185,6 @@ describe('serialize', () => {
         "indexPattern": "Testindexpattern",
         "links": Array [
           Object {
-            "inferred": false,
             "label": "",
             "source": 2,
             "target": 0,
@@ -195,7 +192,6 @@ describe('serialize', () => {
             "width": 5,
           },
           Object {
-            "inferred": false,
             "label": "",
             "source": 2,
             "target": 4,
diff --git a/x-pack/legacy/plugins/graph/public/services/persistence/serialize.ts b/x-pack/legacy/plugins/graph/public/services/persistence/serialize.ts
index 3a94136d26e7c..cc6af1b9222f1 100644
--- a/x-pack/legacy/plugins/graph/public/services/persistence/serialize.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/serialize.ts
@@ -36,13 +36,12 @@ function serializeNode(
 }
 
 function serializeEdge(
-  { source, target, weight, width, inferred, label }: WorkspaceEdge,
+  { source, target, weight, width, label }: WorkspaceEdge,
   allNodes: WorkspaceNode[] = []
 ): SerializedEdge {
   return {
     weight,
     width,
-    inferred,
     label,
     source: allNodes.indexOf(source),
     target: allNodes.indexOf(target),
diff --git a/x-pack/legacy/plugins/graph/public/types/workspace_state.ts b/x-pack/legacy/plugins/graph/public/types/workspace_state.ts
index 6a95de134bd3d..6a3f3146219ef 100644
--- a/x-pack/legacy/plugins/graph/public/types/workspace_state.ts
+++ b/x-pack/legacy/plugins/graph/public/types/workspace_state.ts
@@ -34,7 +34,6 @@ export interface WorkspaceNode {
 export interface WorkspaceEdge {
   weight: number;
   width: number;
-  inferred: boolean;
   label: string;
   source: WorkspaceNode;
   target: WorkspaceNode;
@@ -60,7 +59,6 @@ export interface ServerResultEdge {
   weight: number;
   width: number;
   doc_count?: number;
-  inferred: boolean;
 }
 
 export interface GraphData {
diff --git a/x-pack/legacy/plugins/grokdebugger/server/models/grokdebugger_request/grokdebugger_request.js b/x-pack/legacy/plugins/grokdebugger/server/models/grokdebugger_request/grokdebugger_request.js
index 5a86ae56da37b..35c7825dddfc2 100644
--- a/x-pack/legacy/plugins/grokdebugger/server/models/grokdebugger_request/grokdebugger_request.js
+++ b/x-pack/legacy/plugins/grokdebugger/server/models/grokdebugger_request/grokdebugger_request.js
@@ -35,7 +35,6 @@ export class GrokdebuggerRequest {
       docs: [
         {
           _index: 'grokdebugger',
-          _type: 'grokdebugger',
           _id: 'grokdebugger',
           _source: {
             rawEvent: this.rawEvent.toString()
diff --git a/x-pack/legacy/plugins/grokdebugger/server/models/grokdebugger_response/__tests__/grokdebugger_response.js b/x-pack/legacy/plugins/grokdebugger/server/models/grokdebugger_response/__tests__/grokdebugger_response.js
index b4e7eb0814bf1..c131ea7e1fd54 100644
--- a/x-pack/legacy/plugins/grokdebugger/server/models/grokdebugger_response/__tests__/grokdebugger_response.js
+++ b/x-pack/legacy/plugins/grokdebugger/server/models/grokdebugger_response/__tests__/grokdebugger_response.js
@@ -19,7 +19,6 @@ describe('grokdebugger_response', () => {
             {
               doc: {
                 _index: 'grokdebugger',
-                _type: 'grokdebugger',
                 _id: 'grokdebugger',
                 _source: {
                   'request': '/index.html',
diff --git a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap
index 642b8399ff6d1..f82e8b03527c0 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap
+++ b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap
@@ -104,7 +104,261 @@ exports[`TelemetryOptIn should display when telemetry not opted in 1`] = `
       "timeZone": null,
     }
   }
-/>
+>
+  <EuiSpacer
+    size="s"
+  >
+    <div
+      className="euiSpacer euiSpacer--s"
+    />
+  </EuiSpacer>
+  <EuiTitle
+    size="s"
+  >
+    <h4
+      className="euiTitle euiTitle--small"
+    >
+      <FormattedMessage
+        defaultMessage="Help Elastic support provide better service"
+        id="xpack.licenseMgmt.telemetryOptIn.customersHelpSupportDescription"
+        values={Object {}}
+      >
+        Help Elastic support provide better service
+      </FormattedMessage>
+    </h4>
+  </EuiTitle>
+  <EuiSpacer
+    size="s"
+  >
+    <div
+      className="euiSpacer euiSpacer--s"
+    />
+  </EuiSpacer>
+  <EuiCheckbox
+    checked={false}
+    compressed={false}
+    disabled={false}
+    id="isOptingInToTelemetry"
+    indeterminate={false}
+    label={
+      <span>
+        <FormattedMessage
+          defaultMessage="Send basic feature usage statistics to Elastic periodically. {popover}"
+          id="xpack.licenseMgmt.telemetryOptIn.sendBasicFeatureStatisticsLabel"
+          values={
+            Object {
+              "popover": <EuiPopover
+                anchorPosition="downCenter"
+                button={
+                  <ForwardRef
+                    onClick={[Function]}
+                  >
+                    <FormattedMessage
+                      defaultMessage="Read more"
+                      id="xpack.licenseMgmt.telemetryOptIn.readMoreLinkText"
+                      values={Object {}}
+                    />
+                  </ForwardRef>
+                }
+                className="eui-AlignBaseline"
+                closePopover={[Function]}
+                display="inlineBlock"
+                hasArrow={true}
+                id="readMorePopover"
+                isOpen={false}
+                ownFocus={true}
+                panelPaddingSize="m"
+              >
+                <EuiText
+                  className="licManagement__narrowText"
+                >
+                  <p>
+                    <FormattedMessage
+                      defaultMessage="This feature periodically sends basic feature usage statistics. This information will not be shared outside of Elastic. See an {exampleLink} or read our {telemetryPrivacyStatementLink}. You can disable this feature any time."
+                      id="xpack.licenseMgmt.telemetryOptIn.featureUsageWarningMessage"
+                      values={
+                        Object {
+                          "exampleLink": <ForwardRef
+                            onClick={[Function]}
+                          >
+                            <FormattedMessage
+                              defaultMessage="example"
+                              id="xpack.licenseMgmt.telemetryOptIn.exampleLinkText"
+                              values={Object {}}
+                            />
+                          </ForwardRef>,
+                          "telemetryPrivacyStatementLink": <ForwardRef
+                            href="https://www.elastic.co/legal/telemetry-privacy-statement"
+                            target="_blank"
+                          >
+                            <FormattedMessage
+                              defaultMessage="telemetry privacy statement"
+                              id="xpack.licenseMgmt.telemetryOptIn.telemetryPrivacyStatementLinkText"
+                              values={Object {}}
+                            />
+                          </ForwardRef>,
+                        }
+                      }
+                    />
+                  </p>
+                </EuiText>
+              </EuiPopover>,
+            }
+          }
+        />
+      </span>
+    }
+    onChange={[Function]}
+  >
+    <div
+      className="euiCheckbox"
+    >
+      <input
+        checked={false}
+        className="euiCheckbox__input"
+        disabled={false}
+        id="isOptingInToTelemetry"
+        onChange={[Function]}
+        type="checkbox"
+      />
+      <div
+        className="euiCheckbox__square"
+      />
+      <label
+        className="euiCheckbox__label"
+        htmlFor="isOptingInToTelemetry"
+      >
+        <span>
+          <FormattedMessage
+            defaultMessage="Send basic feature usage statistics to Elastic periodically. {popover}"
+            id="xpack.licenseMgmt.telemetryOptIn.sendBasicFeatureStatisticsLabel"
+            values={
+              Object {
+                "popover": <EuiPopover
+                  anchorPosition="downCenter"
+                  button={
+                    <ForwardRef
+                      onClick={[Function]}
+                    >
+                      <FormattedMessage
+                        defaultMessage="Read more"
+                        id="xpack.licenseMgmt.telemetryOptIn.readMoreLinkText"
+                        values={Object {}}
+                      />
+                    </ForwardRef>
+                  }
+                  className="eui-AlignBaseline"
+                  closePopover={[Function]}
+                  display="inlineBlock"
+                  hasArrow={true}
+                  id="readMorePopover"
+                  isOpen={false}
+                  ownFocus={true}
+                  panelPaddingSize="m"
+                >
+                  <EuiText
+                    className="licManagement__narrowText"
+                  >
+                    <p>
+                      <FormattedMessage
+                        defaultMessage="This feature periodically sends basic feature usage statistics. This information will not be shared outside of Elastic. See an {exampleLink} or read our {telemetryPrivacyStatementLink}. You can disable this feature any time."
+                        id="xpack.licenseMgmt.telemetryOptIn.featureUsageWarningMessage"
+                        values={
+                          Object {
+                            "exampleLink": <ForwardRef
+                              onClick={[Function]}
+                            >
+                              <FormattedMessage
+                                defaultMessage="example"
+                                id="xpack.licenseMgmt.telemetryOptIn.exampleLinkText"
+                                values={Object {}}
+                              />
+                            </ForwardRef>,
+                            "telemetryPrivacyStatementLink": <ForwardRef
+                              href="https://www.elastic.co/legal/telemetry-privacy-statement"
+                              target="_blank"
+                            >
+                              <FormattedMessage
+                                defaultMessage="telemetry privacy statement"
+                                id="xpack.licenseMgmt.telemetryOptIn.telemetryPrivacyStatementLinkText"
+                                values={Object {}}
+                              />
+                            </ForwardRef>,
+                          }
+                        }
+                      />
+                    </p>
+                  </EuiText>
+                </EuiPopover>,
+              }
+            }
+          >
+            Send basic feature usage statistics to Elastic periodically. 
+            <EuiPopover
+              anchorPosition="downCenter"
+              button={
+                <ForwardRef
+                  onClick={[Function]}
+                >
+                  <FormattedMessage
+                    defaultMessage="Read more"
+                    id="xpack.licenseMgmt.telemetryOptIn.readMoreLinkText"
+                    values={Object {}}
+                  />
+                </ForwardRef>
+              }
+              className="eui-AlignBaseline"
+              closePopover={[Function]}
+              display="inlineBlock"
+              hasArrow={true}
+              id="readMorePopover"
+              isOpen={false}
+              ownFocus={true}
+              panelPaddingSize="m"
+            >
+              <EuiOutsideClickDetector
+                isDisabled={true}
+                onOutsideClick={[Function]}
+              >
+                <div
+                  className="euiPopover euiPopover--anchorDownCenter eui-AlignBaseline"
+                  id="readMorePopover"
+                  onKeyDown={[Function]}
+                  onMouseDown={[Function]}
+                  onMouseUp={[Function]}
+                  onTouchEnd={[Function]}
+                  onTouchStart={[Function]}
+                >
+                  <div
+                    className="euiPopover__anchor"
+                  >
+                    <EuiLink
+                      onClick={[Function]}
+                    >
+                      <button
+                        className="euiLink euiLink--primary"
+                        onClick={[Function]}
+                        type="button"
+                      >
+                        <FormattedMessage
+                          defaultMessage="Read more"
+                          id="xpack.licenseMgmt.telemetryOptIn.readMoreLinkText"
+                          values={Object {}}
+                        >
+                          Read more
+                        </FormattedMessage>
+                      </button>
+                    </EuiLink>
+                  </div>
+                </div>
+              </EuiOutsideClickDetector>
+            </EuiPopover>
+          </FormattedMessage>
+        </span>
+      </label>
+    </div>
+  </EuiCheckbox>
+</TelemetryOptIn>
 `;
 
 exports[`TelemetryOptIn should not display when telemetry is opted in 1`] = `
@@ -213,3 +467,110 @@ exports[`TelemetryOptIn should not display when telemetry is opted in 1`] = `
   }
 />
 `;
+
+exports[`TelemetryOptIn shouldn't display when telemetry optIn status can't change 1`] = `
+<TelemetryOptIn
+  intl={
+    Object {
+      "defaultFormats": Object {},
+      "defaultLocale": "en",
+      "formatDate": [Function],
+      "formatHTMLMessage": [Function],
+      "formatMessage": [Function],
+      "formatNumber": [Function],
+      "formatPlural": [Function],
+      "formatRelative": [Function],
+      "formatTime": [Function],
+      "formats": Object {
+        "date": Object {
+          "full": Object {
+            "day": "numeric",
+            "month": "long",
+            "weekday": "long",
+            "year": "numeric",
+          },
+          "long": Object {
+            "day": "numeric",
+            "month": "long",
+            "year": "numeric",
+          },
+          "medium": Object {
+            "day": "numeric",
+            "month": "short",
+            "year": "numeric",
+          },
+          "short": Object {
+            "day": "numeric",
+            "month": "numeric",
+            "year": "2-digit",
+          },
+        },
+        "number": Object {
+          "currency": Object {
+            "style": "currency",
+          },
+          "percent": Object {
+            "style": "percent",
+          },
+        },
+        "relative": Object {
+          "days": Object {
+            "units": "day",
+          },
+          "hours": Object {
+            "units": "hour",
+          },
+          "minutes": Object {
+            "units": "minute",
+          },
+          "months": Object {
+            "units": "month",
+          },
+          "seconds": Object {
+            "units": "second",
+          },
+          "years": Object {
+            "units": "year",
+          },
+        },
+        "time": Object {
+          "full": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+            "timeZoneName": "short",
+          },
+          "long": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+            "timeZoneName": "short",
+          },
+          "medium": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+          },
+          "short": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+          },
+        },
+      },
+      "formatters": Object {
+        "getDateTimeFormat": [Function],
+        "getMessageFormat": [Function],
+        "getNumberFormat": [Function],
+        "getPluralFormat": [Function],
+        "getRelativeFormat": [Function],
+      },
+      "locale": "en",
+      "messages": Object {},
+      "now": [Function],
+      "onError": [Function],
+      "textComponent": Symbol(react.fragment),
+      "timeZone": null,
+    }
+  }
+/>
+`;
diff --git a/x-pack/legacy/plugins/license_management/__jest__/telemetry_opt_in.test.js b/x-pack/legacy/plugins/license_management/__jest__/telemetry_opt_in.test.js
index 4e94657e03dee..a92ca384e8a37 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/telemetry_opt_in.test.js
+++ b/x-pack/legacy/plugins/license_management/__jest__/telemetry_opt_in.test.js
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React from 'react';
+import { setTelemetryEnabled, setTelemetryOptInService } from '../public/lib/telemetry';
 import { TelemetryOptIn } from '../public/components/telemetry_opt_in';
 import { mountWithIntl } from '../../../../test_utils/enzyme_helpers';
 
@@ -11,16 +12,30 @@ jest.mock('ui/capabilities', () => ({
   get: jest.fn(),
 }));
 
+setTelemetryEnabled(true);
+
 describe('TelemetryOptIn', () => {
   test('should display when telemetry not opted in', () => {
-    const telemetry = require('../public/lib/telemetry');
-    telemetry.showTelemetryOptIn = () => { return true; };
+    setTelemetryOptInService({
+      getOptIn: () => false,
+      canChangeOptInStatus: () => true,
+    });
     const rendered = mountWithIntl(<TelemetryOptIn />);
     expect(rendered).toMatchSnapshot();
   });
   test('should not display when telemetry is opted in', () => {
-    const telemetry = require('../public/lib/telemetry');
-    telemetry.showTelemetryOptIn = () => { return false; };
+    setTelemetryOptInService({
+      getOptIn: () => true,
+      canChangeOptInStatus: () => true,
+    });
+    const rendered = mountWithIntl(<TelemetryOptIn />);
+    expect(rendered).toMatchSnapshot();
+  });
+  test(`shouldn't display when telemetry optIn status can't change`, () => {
+    setTelemetryOptInService({
+      getOptIn: () => false,
+      canChangeOptInStatus: () => false,
+    });
     const rendered = mountWithIntl(<TelemetryOptIn />);
     expect(rendered).toMatchSnapshot();
   });
diff --git a/x-pack/legacy/plugins/license_management/public/lib/telemetry.js b/x-pack/legacy/plugins/license_management/public/lib/telemetry.js
index bf8bed05aabed..61d0322227d8e 100644
--- a/x-pack/legacy/plugins/license_management/public/lib/telemetry.js
+++ b/x-pack/legacy/plugins/license_management/public/lib/telemetry.js
@@ -25,7 +25,7 @@ export const optInToTelemetry = async (enableTelemetry) => {
   await telemetryOptInService.setOptIn(enableTelemetry);
 };
 export const shouldShowTelemetryOptIn = () => {
-  return telemetryEnabled && !telemetryOptInService.getOptIn();
+  return telemetryEnabled && !telemetryOptInService.getOptIn() && telemetryOptInService.canChangeOptInStatus();
 };
 export const getTelemetryFetcher = () => {
   return fetchTelemetry(httpClient, { unencrypted: true });
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/bottom_bar.js b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/bottom_bar.js
deleted file mode 100644
index 75736d44219ca..0000000000000
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/bottom_bar.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import React from 'react';
-
-import {
-  EuiButton,
-  EuiButtonEmpty,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiBottomBar,
-} from '@elastic/eui';
-
-import { MODE as DATAVISUALIZER_MODE } from '../file_datavisualizer_view';
-
-export function BottomBar({ showBar, mode, changeMode, onCancel, disableImport }) {
-  if (showBar) {
-    if (mode === DATAVISUALIZER_MODE.READ) {
-      return (
-        <EuiBottomBar >
-          <EuiFlexGroup >
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                fill
-                isDisabled={(disableImport === true)}
-                onClick={() => changeMode(DATAVISUALIZER_MODE.IMPORT)}
-              >
-                <FormattedMessage
-                  id="xpack.ml.fileDatavisualizer.bottomBar.readMode.importButtonLabel"
-                  defaultMessage="Import"
-                />
-              </EuiButton>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty
-                color="ghost"
-                onClick={() => onCancel()}
-              >
-                <FormattedMessage
-                  id="xpack.ml.fileDatavisualizer.bottomBar.readMode.cancelButtonLabel"
-                  defaultMessage="Cancel"
-                />
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-
-        </EuiBottomBar>
-      );
-    } else {
-      return (
-        <EuiBottomBar >
-          <EuiFlexGroup >
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                color="ghost"
-                onClick={() => changeMode(DATAVISUALIZER_MODE.READ)}
-              >
-                <FormattedMessage
-                  id="xpack.ml.fileDatavisualizer.bottomBar.backButtonLabel"
-                  defaultMessage="Back"
-                />
-              </EuiButton>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty
-                color="ghost"
-                onClick={() => onCancel()}
-              >
-                <FormattedMessage
-                  id="xpack.ml.fileDatavisualizer.bottomBar.cancelButtonLabel"
-                  defaultMessage="Cancel"
-                />
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiBottomBar>
-      );
-    }
-  }
-  return null;
-}
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/bottom_bar.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/bottom_bar.tsx
new file mode 100644
index 0000000000000..72e4f88062789
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/bottom_bar.tsx
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiBottomBar,
+  EuiButton,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiToolTip,
+} from '@elastic/eui';
+
+import { MODE as DATAVISUALIZER_MODE } from '../file_datavisualizer_view/constants';
+
+interface BottomBarProps {
+  mode: DATAVISUALIZER_MODE;
+  onChangeMode: (mode: DATAVISUALIZER_MODE) => void;
+  onCancel: () => void;
+  disableImport?: boolean;
+}
+
+/**
+ * Bottom bar component for Data Visualizer page.
+ */
+export const BottomBar: FC<BottomBarProps> = ({ mode, onChangeMode, onCancel, disableImport }) => {
+  if (mode === DATAVISUALIZER_MODE.READ) {
+    return (
+      <EuiBottomBar>
+        <EuiFlexGroup>
+          <EuiFlexItem grow={false}>
+            <EuiToolTip
+              position="top"
+              content={
+                disableImport ? (
+                  <FormattedMessage
+                    id="xpack.ml.fileDatavisualizer.bottomBar.missingImportPrivilegesMessage"
+                    defaultMessage="You don't have the privileges required to import data"
+                  />
+                ) : null
+              }
+            >
+              <EuiButton
+                fill
+                isDisabled={disableImport}
+                onClick={() => onChangeMode(DATAVISUALIZER_MODE.IMPORT)}
+              >
+                <FormattedMessage
+                  id="xpack.ml.fileDatavisualizer.bottomBar.readMode.importButtonLabel"
+                  defaultMessage="Import"
+                />
+              </EuiButton>
+            </EuiToolTip>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty color="ghost" onClick={() => onCancel()}>
+              <FormattedMessage
+                id="xpack.ml.fileDatavisualizer.bottomBar.readMode.cancelButtonLabel"
+                defaultMessage="Cancel"
+              />
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiBottomBar>
+    );
+  } else {
+    return (
+      <EuiBottomBar>
+        <EuiFlexGroup>
+          <EuiFlexItem grow={false}>
+            <EuiButton color="ghost" onClick={() => onChangeMode(DATAVISUALIZER_MODE.READ)}>
+              <FormattedMessage
+                id="xpack.ml.fileDatavisualizer.bottomBar.backButtonLabel"
+                defaultMessage="Back"
+              />
+            </EuiButton>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty color="ghost" onClick={() => onCancel()}>
+              <FormattedMessage
+                id="xpack.ml.fileDatavisualizer.bottomBar.cancelButtonLabel"
+                defaultMessage="Cancel"
+              />
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiBottomBar>
+    );
+  }
+};
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/index.js b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/index.ts
similarity index 99%
rename from x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/index.js
rename to x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/index.ts
index 236a5aa577f28..24202d7c746b8 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/index.js
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/bottom_bar/index.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-
 export { BottomBar } from './bottom_bar';
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/file_datavisualizer_view/constants.ts b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/file_datavisualizer_view/constants.ts
new file mode 100644
index 0000000000000..7c463d58c607c
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/file_datavisualizer_view/constants.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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/**
+ *  File data visualizer modes.
+ */
+export enum MODE {
+  READ,
+  IMPORT,
+}
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/file_datavisualizer_view/file_datavisualizer_view.js b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/file_datavisualizer_view/file_datavisualizer_view.js
index fee0c423f023d..94e9c2c2ac584 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/file_datavisualizer_view/file_datavisualizer_view.js
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/file_datavisualizer_view/file_datavisualizer_view.js
@@ -31,11 +31,7 @@ import {
   reduceData,
   hasImportPermission,
 } from '../utils';
-
-export const MODE = {
-  READ: 0,
-  IMPORT: 1,
-};
+import { MODE } from './constants';
 
 const UPLOAD_SIZE_MB = 5;
 
@@ -306,13 +302,12 @@ export class FileDataVisualizerView extends Component {
               fields={fields}
             />
 
-            <BottomBar
-              showBar={(bottomBarVisible && loaded)}
+            {(bottomBarVisible && loaded) && <BottomBar
               mode={MODE.READ}
-              changeMode={this.changeMode}
+              onChangeMode={this.changeMode}
               onCancel={this.onCancel}
               disableImport={(hasPermissionToImport === false)}
-            />
+            />}
 
             <BottomPadding />
           </React.Fragment>
@@ -329,12 +324,11 @@ export class FileDataVisualizerView extends Component {
               hideBottomBar={this.hideBottomBar}
             />
 
-            <BottomBar
-              showBar={bottomBarVisible}
+            {bottomBarVisible && <BottomBar
               mode={MODE.IMPORT}
-              changeMode={this.changeMode}
+              onChangeMode={this.changeMode}
               onCancel={this.onCancel}
-            />
+            />}
 
             <BottomPadding />
           </React.Fragment>
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/file_datavisualizer_view/index.js b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/file_datavisualizer_view/index.js
index 5721b35045434..cc9714d2b4c45 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/file_datavisualizer_view/index.js
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/file_datavisualizer_view/index.js
@@ -5,4 +5,4 @@
  */
 
 
-export { FileDataVisualizerView, MODE } from './file_datavisualizer_view';
+export { FileDataVisualizerView } from './file_datavisualizer_view';
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/utils/utils.js b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/utils/utils.js
index f9148da5ed826..2707e3f5510db 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/utils/utils.js
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/utils/utils.js
@@ -116,8 +116,12 @@ export function processResults(results) {
   };
 }
 
-// a check for the minimum privileges needed to create and ingest data into an index.
-// if called with no indexName, the check will just look for the minimum cluster privileges.
+/**
+ * A check for the minimum privileges needed to create and ingest data into an index.
+ * If called with no indexName, the check will just look for the minimum cluster privileges.
+ * @param {string} indexName
+ * @returns {Promise<boolean>}
+ */
 export async function hasImportPermission(indexName) {
   const priv = {
     cluster: [
diff --git a/x-pack/legacy/plugins/ml/public/util/chart_utils.test.js b/x-pack/legacy/plugins/ml/public/util/chart_utils.test.js
index aaec5e412c4cb..6d13f1bc66808 100644
--- a/x-pack/legacy/plugins/ml/public/util/chart_utils.test.js
+++ b/x-pack/legacy/plugins/ml/public/util/chart_utils.test.js
@@ -14,19 +14,18 @@ jest.mock('ui/registry/field_formats', () => ({
 
 jest.mock('ui/timefilter', () => {
   const dateMath = require('@elastic/datemath');
-  const { dataPluginMock } = require('../../../../../../src/legacy/core_plugins/data/public/mocks');
-  const dataSetup = dataPluginMock.createSetup();
-  const { timefilter } = dataSetup.timefilter;
   let _time = undefined;
-  timefilter.setTime.mockImplementation((time) => {
-    _time = time;
-  });
-  timefilter.getActiveBounds.mockImplementation(() => {
-    return {
-      min: dateMath.parse(_time.from),
-      max: dateMath.parse(_time.to),
-    };
-  });
+  const timefilter = {
+    setTime: (time) => {
+      _time = time;
+    },
+    getActiveBounds: () => {
+      return {
+        min: dateMath.parse(_time.from),
+        max: dateMath.parse(_time.to),
+      };
+    }
+  };
   return {
     timefilter,
   };
diff --git a/x-pack/legacy/plugins/reporting/public/components/report_listing.test.tsx b/x-pack/legacy/plugins/reporting/public/components/report_listing.test.tsx
index 87360efe04e8b..d78eb5c409c1f 100644
--- a/x-pack/legacy/plugins/reporting/public/components/report_listing.test.tsx
+++ b/x-pack/legacy/plugins/reporting/public/components/report_listing.test.tsx
@@ -39,15 +39,15 @@ jest.mock('ui/kfetch', () => ({
     if (pathname === '/api/reporting/jobs/list') {
       return Promise.resolve([
         { _index: '.reporting-2019.08.18', _id: 'jzoik8dh1q2i89fb5f19znm6', _source: { payload: { layout: { id: 'preserve_layout', dimensions: { width: 1635, height: 792 } }, type: 'dashboard', title: 'Names', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:24.869Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
-        { _index: '.reporting-2019.08.18', _type: '_doc', _id: 'jzoik7tn1q2i89fb5f60e5ve', _score: null, _source: { payload: { layout: { id: 'preserve_layout', dimensions: { width: 1635, height: 792 } }, type: 'dashboard', title: 'Names', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:24.155Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
-        { _index: '.reporting-2019.08.18', _type: '_doc', _id: 'jzoik5tb1q2i89fb5fckchny', _score: null, _source: { payload: { layout: { id: 'png', dimensions: { width: 1898, height: 876 } }, title: 'cool dashboard', type: 'dashboard', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:21.551Z', jobtype: 'PNG', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
-        { _index: '.reporting-2019.08.18', _type: '_doc', _id: 'jzoik5a11q2i89fb5f130t2m', _score: null, _source: { payload: { layout: { id: 'png', dimensions: { width: 1898, height: 876 } }, title: 'cool dashboard', type: 'dashboard', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:20.857Z', jobtype: 'PNG', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
-        { _index: '.reporting-2019.08.18', _type: '_doc', _id: 'jzoik3ka1q2i89fb5fdx93g7', _score: null, _source: { payload: { layout: { id: 'preserve_layout', dimensions: { width: 1898, height: 876 } }, type: 'dashboard', title: 'cool dashboard', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:18.634Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
-        { _index: '.reporting-2019.08.18', _type: '_doc', _id: 'jzoik2vt1q2i89fb5ffw723n', _score: null, _source: { payload: { layout: { id: 'preserve_layout', dimensions: { width: 1898, height: 876 } }, type: 'dashboard', title: 'cool dashboard', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:17.753Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
-        { _index: '.reporting-2019.08.18', _type: '_doc', _id: 'jzoik1851q2i89fb5fdge6e7', _score: null, _source: { payload: { layout: { id: 'preserve_layout', dimensions: { width: 1080, height: 720 } }, type: 'canvas workpad', title: 'My Canvas Workpad - Dark', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:15.605Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
-        { _index: '.reporting-2019.08.18', _type: '_doc', _id: 'jzoijyre1q2i89fb5fa7xzvi', _score: null, _source: { payload: { type: 'dashboard', title: 'tests-panels', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:12.410Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
-        { _index: '.reporting-2019.08.18', _type: '_doc', _id: 'jzoijv5h1q2i89fb5ffklnhx', _score: null, _source: { payload: { type: 'dashboard', title: 'tests-panels', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:07.733Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
-        { _index: '.reporting-2019.08.18', _type: '_doc', _id: 'jznhgk7r1bx789fb5f6hxok7', _score: null, _source: { kibana_name: 'spicy.local', browser_type: 'chromium', created_at: '2019-08-23T02:15:47.799Z', jobtype: 'printable_pdf', created_by: 'elastic', kibana_id: 'ca75e26c-2b7d-464f-aef0-babb67c735a0', output: { content_type: 'application/pdf', size: 877114 }, completed_at: '2019-08-23T02:15:57.707Z', payload: { type: 'dashboard (legacy)', title: 'tests-panels', }, max_attempts: 3, started_at: '2019-08-23T02:15:48.794Z', attempts: 1, status: 'completed', }, }, // prettier-ignore
+        { _index: '.reporting-2019.08.18', _id: 'jzoik7tn1q2i89fb5f60e5ve', _score: null, _source: { payload: { layout: { id: 'preserve_layout', dimensions: { width: 1635, height: 792 } }, type: 'dashboard', title: 'Names', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:24.155Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
+        { _index: '.reporting-2019.08.18', _id: 'jzoik5tb1q2i89fb5fckchny', _score: null, _source: { payload: { layout: { id: 'png', dimensions: { width: 1898, height: 876 } }, title: 'cool dashboard', type: 'dashboard', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:21.551Z', jobtype: 'PNG', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
+        { _index: '.reporting-2019.08.18', _id: 'jzoik5a11q2i89fb5f130t2m', _score: null, _source: { payload: { layout: { id: 'png', dimensions: { width: 1898, height: 876 } }, title: 'cool dashboard', type: 'dashboard', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:20.857Z', jobtype: 'PNG', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
+        { _index: '.reporting-2019.08.18', _id: 'jzoik3ka1q2i89fb5fdx93g7', _score: null, _source: { payload: { layout: { id: 'preserve_layout', dimensions: { width: 1898, height: 876 } }, type: 'dashboard', title: 'cool dashboard', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:18.634Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
+        { _index: '.reporting-2019.08.18', _id: 'jzoik2vt1q2i89fb5ffw723n', _score: null, _source: { payload: { layout: { id: 'preserve_layout', dimensions: { width: 1898, height: 876 } }, type: 'dashboard', title: 'cool dashboard', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:17.753Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
+        { _index: '.reporting-2019.08.18', _id: 'jzoik1851q2i89fb5fdge6e7', _score: null, _source: { payload: { layout: { id: 'preserve_layout', dimensions: { width: 1080, height: 720 } }, type: 'canvas workpad', title: 'My Canvas Workpad - Dark', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:15.605Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
+        { _index: '.reporting-2019.08.18', _id: 'jzoijyre1q2i89fb5fa7xzvi', _score: null, _source: { payload: { type: 'dashboard', title: 'tests-panels', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:12.410Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
+        { _index: '.reporting-2019.08.18', _id: 'jzoijv5h1q2i89fb5ffklnhx', _score: null, _source: { payload: { type: 'dashboard', title: 'tests-panels', }, max_attempts: 3, browser_type: 'chromium', created_at: '2019-08-23T19:34:07.733Z', jobtype: 'printable_pdf', created_by: 'elastic', attempts: 0, status: 'pending', }, }, // prettier-ignore
+        { _index: '.reporting-2019.08.18', _id: 'jznhgk7r1bx789fb5f6hxok7', _score: null, _source: { kibana_name: 'spicy.local', browser_type: 'chromium', created_at: '2019-08-23T02:15:47.799Z', jobtype: 'printable_pdf', created_by: 'elastic', kibana_id: 'ca75e26c-2b7d-464f-aef0-babb67c735a0', output: { content_type: 'application/pdf', size: 877114 }, completed_at: '2019-08-23T02:15:57.707Z', payload: { type: 'dashboard (legacy)', title: 'tests-panels', }, max_attempts: 3, started_at: '2019-08-23T02:15:48.794Z', attempts: 1, status: 'completed', }, }, // prettier-ignore
       ]);
     }
 
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/worker.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/worker.js
index 9f638670a6b59..84549d0680ff3 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/worker.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/__tests__/worker.js
@@ -1072,7 +1072,6 @@ describe('Get Doc Path from ES Response', () => {
   it('returns a formatted string after response of an update', function () {
     const responseMock = {
       _index: 'foo',
-      _type: '_doc',
       _id: 'booId',
     };
     expect(getUpdatedDocPath(responseMock)).equal('/foo/_doc/booId');
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js
index 61af0437575e9..fe2e578f83cc5 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/worker.js
@@ -22,8 +22,8 @@ export function formatJobObject(job) {
 }
 
 export function getUpdatedDocPath(response) {
-  const { _index: ind, _type: type = '_doc', _id: id } = response;
-  return `/${ind}/${type}/${id}`;
+  const { _index: ind, _id: id } = response;
+  return `/${ind}/${id}`;
 }
 
 const MAX_PARTIAL_ERROR_LENGTH = 1000; // 1000 of beginning, 1000 of end
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/profile_query_editor.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/profile_query_editor.tsx
index ea3421ffe89aa..b879f15b72998 100644
--- a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/profile_query_editor.tsx
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/profile_query_editor.tsx
@@ -86,8 +86,10 @@ export const ProfileQueryEditor = memo(() => {
                 <EuiFieldText
                   disabled={!licenseEnabled}
                   inputRef={ref => {
-                    indexInputRef.current = ref!;
-                    ref!.value = DEFAULT_INDEX_VALUE;
+                    if (ref) {
+                      indexInputRef.current = ref;
+                      ref.value = DEFAULT_INDEX_VALUE;
+                    }
                   }}
                 />
               </EuiFormRow>
diff --git a/x-pack/legacy/plugins/siem/public/components/search_bar/index.tsx b/x-pack/legacy/plugins/siem/public/components/search_bar/index.tsx
index c885d001542e5..5b60b62521293 100644
--- a/x-pack/legacy/plugins/siem/public/components/search_bar/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/search_bar/index.tsx
@@ -41,7 +41,6 @@ import { esFilters } from '../../../../../../../src/plugins/data/public';
 const {
   ui: { SearchBar },
   search,
-  timefilter,
 } = data;
 
 export const siemFilterManager = npStart.plugins.data.query.filterManager;
@@ -99,10 +98,11 @@ const SearchBarComponent = memo<SiemSearchBarProps & SiemSearchBarRedux & SiemSe
     toStr,
     updateSearch,
   }) => {
+    const { timefilter } = npStart.plugins.data.query.timefilter;
     if (fromStr != null && toStr != null) {
-      timefilter.timefilter.setTime({ from: fromStr, to: toStr });
+      timefilter.setTime({ from: fromStr, to: toStr });
     } else if (start != null && end != null) {
-      timefilter.timefilter.setTime({
+      timefilter.setTime({
         from: new Date(start).toISOString(),
         to: new Date(end).toISOString(),
       });
diff --git a/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_signals.js b/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_signals.js
index 5692ce2721870..9b2a38e372ae3 100644
--- a/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_signals.js
+++ b/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_signals.js
@@ -28,10 +28,10 @@ const path = require('path');
 // this type of information. You usually will want to make any hand edits after
 // doing a search to KQL conversion before posting it as a signal or checking it
 // into another repository.
-const INTERVAL = '24h';
+const INTERVAL = '5m';
 const SEVERITY = 'low';
 const TYPE = 'query';
-const FROM = 'now-24h';
+const FROM = 'now-6m';
 const TO = 'now';
 const INDEX = ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'];
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/create_signals.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/create_signals.ts
index 2caf00ed0179c..038effbd30086 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/create_signals.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/create_signals.ts
@@ -57,10 +57,12 @@ export const updateIfIdExists = async ({
     });
     return signal;
   } catch (err) {
-    // This happens when we cannot get a saved object back from reading a signal.
-    // So we continue normally as we have nothing we can upsert.
+    if (err.output.statusCode === 404) {
+      return null;
+    } else {
+      return err;
+    }
   }
-  return null;
 };
 
 export const createSignals = async ({
@@ -124,7 +126,7 @@ export const createSignals = async ({
 
     return alertsClient.create({
       data: {
-        name: 'SIEM Alert',
+        name,
         alertTypeId: SIGNALS_ID,
         alertTypeParams: {
           description,
@@ -137,7 +139,6 @@ export const createSignals = async ({
           savedId,
           filters,
           maxSignals,
-          name,
           severity,
           to,
           type,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/find_signals.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/find_signals.ts
index ebddf6ac5b3c7..23f4e38a95eea 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/find_signals.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/find_signals.ts
@@ -7,16 +7,12 @@
 import { SIGNALS_ID } from '../../../../common/constants';
 import { FindSignalParams } from './types';
 
-// TODO: Change this from a search to a filter once this ticket is solved:
-// https://github.com/elastic/kibana/projects/26#card-27462236
-export const findSignals = async ({ alertsClient, perPage, page, fields }: FindSignalParams) => {
-  return alertsClient.find({
+export const findSignals = async ({ alertsClient, perPage, page, fields }: FindSignalParams) =>
+  alertsClient.find({
     options: {
       fields,
       page,
       perPage,
-      searchFields: ['alertTypeId'],
-      search: SIGNALS_ID,
+      filter: `alert.attributes.alertTypeId: ${SIGNALS_ID}`,
     },
   });
-};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/signals_alert_type.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/signals_alert_type.ts
index fc18c1b552198..6673b7bd1423b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/signals_alert_type.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/signals_alert_type.ts
@@ -11,11 +11,7 @@ import { Logger } from '../../../../../../../../src/core/server';
 // TODO: Remove this for the build_events_query call eventually
 import { buildEventsReIndex } from './build_events_reindex';
 
-// TODO: Comment this in and use this instead of the reIndex API
-// once scrolling and other things are done with it.
 import { buildEventsSearchQuery } from './build_events_query';
-
-// bulk scroll class
 import { searchAfterAndBulkIndex } from './utils';
 import { SignalAlertTypeDefinition } from './types';
 import { getFilter } from './get_filter';
@@ -37,7 +33,6 @@ export const signalsAlertType = ({ logger }: { logger: Logger }): SignalAlertTyp
         query: schema.nullable(schema.string()),
         filters: schema.nullable(schema.arrayOf(schema.object({}, { allowUnknowns: true }))),
         maxSignals: schema.number({ defaultValue: 100 }),
-        name: schema.string(),
         severity: schema.string(),
         to: schema.string(),
         type: schema.string(),
@@ -46,8 +41,6 @@ export const signalsAlertType = ({ logger }: { logger: Logger }): SignalAlertTyp
       }),
     },
     async executor({ services, params }) {
-      const instance = services.alertInstanceFactory('siem-signals');
-
       const {
         description,
         filter,
@@ -80,7 +73,6 @@ export const signalsAlertType = ({ logger }: { logger: Logger }): SignalAlertTyp
         index,
       });
 
-      // TODO: Turn these options being sent in into a template for the alert type
       const noReIndex = buildEventsSearchQuery({
         index,
         from,
@@ -90,11 +82,7 @@ export const signalsAlertType = ({ logger }: { logger: Logger }): SignalAlertTyp
       });
 
       try {
-        logger.info('Starting SIEM signal job');
-
-        // TODO: Comment this in eventually and use this for manual insertion of the
-        // signals instead of the ReIndex() api
-
+        logger.debug(`Starting signal rule "${id}"`);
         if (process.env.USE_REINDEX_API === 'true') {
           const reIndex = buildEventsReIndex({
             index,
@@ -115,14 +103,19 @@ export const signalsAlertType = ({ logger }: { logger: Logger }): SignalAlertTyp
             references,
           });
           const result = await services.callCluster('reindex', reIndex);
-
-          // TODO: Error handling here and writing of any errors that come back from ES by
-          logger.info(`Result of reindex: ${JSON.stringify(result, null, 2)}`);
+          if (result.total > 0) {
+            logger.info(
+              `Total signals found from signal rule "${id}" (reindex algorithm): ${result.total}`
+            );
+          }
         } else {
-          logger.info(`[+] Initial search call`);
-
+          logger.debug(`[+] Initial search call of signal rule "${id}"`);
           const noReIndexResult = await services.callCluster('search', noReIndex);
-          logger.info(`Total docs to reindex: ${noReIndexResult.hits.total.value}`);
+          if (noReIndexResult.hits.total.value !== 0) {
+            logger.info(
+              `Total signals found from signal rule "${id}": ${noReIndexResult.hits.total.value}`
+            );
+          }
 
           const bulkIndexResult = await searchAfterAndBulkIndex(
             noReIndexResult,
@@ -132,19 +125,23 @@ export const signalsAlertType = ({ logger }: { logger: Logger }): SignalAlertTyp
           );
 
           if (bulkIndexResult) {
-            logger.info('Finished SIEM signal job');
+            logger.debug(`Finished signal rule "${id}"`);
           } else {
-            logger.error('Error processing SIEM signal job');
+            logger.error(`Error processing signal rule "${id}"`);
           }
         }
       } catch (err) {
         // TODO: Error handling and writing of errors into a signal that has error
         // handling/conditions
-        logger.error(`You encountered an error of: ${err.message}`);
+        logger.error(`Error from signal rule "${id}", ${err.message}`);
       }
 
+      // TODO: Schedule and fire any and all actions configured for the signals rule
+      // such as email/slack/etc... Note you will not be able to save in-memory state
+      // without calling this at least once but we are not using in-memory state at the moment.
       // Schedule the default action which is nothing if it's a plain signal.
-      instance.scheduleActions('default');
+      // const instance = services.alertInstanceFactory('siem-signals');
+      // instance.scheduleActions('default');
     },
   };
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/types.ts
index b8d7af5c45303..96a319c944bd9 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/types.ts
@@ -47,6 +47,10 @@ export type SignalAlertParamsRest = Omit<SignalAlertParams, 'maxSignals' | 'save
   max_signals: SignalAlertParams['maxSignals'];
 };
 
+export type UpdateSignalAlertParamsRest = Partial<Omit<SignalAlertParamsRest, 'id'>> & {
+  id: SignalAlertParams['id'];
+};
+
 export interface FindParamsRest {
   per_page: number;
   page: number;
@@ -61,6 +65,10 @@ export interface Clients {
 
 export type SignalParams = SignalAlertParams & Clients;
 
+export type UpdateSignalParams = Partial<Omit<SignalAlertParams, 'id'>> & {
+  id: SignalAlertParams['id'];
+} & Clients;
+
 export type DeleteSignalParams = Clients & { id: string };
 
 export interface FindSignalsRequest extends Omit<Hapi.Request, 'query'> {
@@ -95,6 +103,10 @@ export interface SignalsRequest extends Hapi.Request {
   payload: SignalAlertParamsRest;
 }
 
+export interface UpdateSignalsRequest extends Hapi.Request {
+  payload: UpdateSignalAlertParamsRest;
+}
+
 export type SignalExecutorOptions = Omit<AlertExecutorOptions, 'params'> & {
   params: SignalAlertParams & {
     scrollSize: number;
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.test.ts
index 46ebfe98ce3d9..39f7951a8eab9 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { calculateInterval } from './update_signals';
+import { calculateInterval, calculateName } from './update_signals';
 
 describe('update_signals', () => {
   describe('#calculateInterval', () => {
@@ -23,4 +23,26 @@ describe('update_signals', () => {
       expect(interval).toEqual('5m');
     });
   });
+
+  describe('#calculateName', () => {
+    test('should return the updated name when it and originalName is there', () => {
+      const name = calculateName({ updatedName: 'updated', originalName: 'original' });
+      expect(name).toEqual('updated');
+    });
+
+    test('should return the updated name when originalName is undefined', () => {
+      const name = calculateName({ updatedName: 'updated', originalName: undefined });
+      expect(name).toEqual('updated');
+    });
+
+    test('should return the original name when updatedName is undefined', () => {
+      const name = calculateName({ updatedName: undefined, originalName: 'original' });
+      expect(name).toEqual('original');
+    });
+
+    test('should return untitled when both updatedName and originalName is undefined', () => {
+      const name = calculateName({ updatedName: undefined, originalName: undefined });
+      expect(name).toEqual('untitled');
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.ts
index 9cb30a29173d7..422d9123a286b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.ts
@@ -7,7 +7,7 @@
 import { defaults } from 'lodash/fp';
 import { AlertAction } from '../../../../../alerting/server/types';
 import { readSignals } from './read_signals';
-import { SignalParams } from './types';
+import { UpdateSignalParams } from './types';
 
 export const calculateInterval = (
   interval: string | undefined,
@@ -22,6 +22,25 @@ export const calculateInterval = (
   }
 };
 
+export const calculateName = ({
+  updatedName,
+  originalName,
+}: {
+  updatedName: string | undefined;
+  originalName: string | undefined;
+}): string => {
+  if (updatedName != null) {
+    return updatedName;
+  } else if (originalName != null) {
+    return originalName;
+  } else {
+    // You really should never get to this point. This is a fail safe way to send back
+    // the name of "untitled" just in case a signal rule name became null or undefined at
+    // some point since TypeScript allows it.
+    return 'untitled';
+  }
+};
+
 export const updateSignal = async ({
   alertsClient,
   actionsClient, // TODO: Use this whenever we add feature support for different action types
@@ -42,7 +61,7 @@ export const updateSignal = async ({
   to,
   type,
   references,
-}: SignalParams) => {
+}: UpdateSignalParams) => {
   // TODO: Error handling and abstraction. Right now if this is an error then what happens is we get the error of
   // "message": "Saved object [alert/{id}] not found"
   const signal = await readSignals({ alertsClient, id });
@@ -67,7 +86,6 @@ export const updateSignal = async ({
       filters,
       index,
       maxSignals,
-      name,
       severity,
       to,
       type,
@@ -84,7 +102,7 @@ export const updateSignal = async ({
   return alertsClient.update({
     id: signal.id,
     data: {
-      name: 'SIEM Alert',
+      name: calculateName({ updatedName: name, originalName: signal.name }),
       interval: calculateInterval(interval, signal.interval),
       actions,
       alertTypeParams: nextAlertTypeParams,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/utils.ts
index 08e99de0f2581..a514baa186fd2 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/utils.ts
@@ -43,8 +43,7 @@ export const singleBulkIndex = async (
   logger: Logger
 ): Promise<boolean> => {
   if (sr.hits.hits.length === 0) {
-    logger.warn('First search result yielded 0 documents');
-    return false;
+    return true;
   }
   const bulkBody = sr.hits.hits.flatMap(doc => [
     {
@@ -62,8 +61,8 @@ export const singleBulkIndex = async (
     body: bulkBody,
   });
   const time2 = performance.now();
-  logger.info(`individual bulk process time took: ${time2 - time1} milliseconds`);
-  logger.info(`took property says bulk took: ${firstResult.took} milliseconds`);
+  logger.debug(`individual bulk process time took: ${time2 - time1} milliseconds`);
+  logger.debug(`took property says bulk took: ${firstResult.took} milliseconds`);
   if (firstResult.errors) {
     logger.error(`[-] bulkResponse had errors: ${JSON.stringify(firstResult.errors, null, 2)}}`);
     return false;
@@ -105,20 +104,24 @@ export const searchAfterAndBulkIndex = async (
   service: AlertServices,
   logger: Logger
 ): Promise<boolean> => {
-  logger.info('[+] starting bulk insertion');
+  if (someResult.hits.hits.length === 0) {
+    return true;
+  }
+
+  logger.debug('[+] starting bulk insertion');
   const firstBulkIndexSuccess = await singleBulkIndex(someResult, params, service, logger);
   if (!firstBulkIndexSuccess) {
-    logger.warn('First bulk index was unsuccessful');
+    logger.error('First bulk index was unsuccessful');
     return false;
   }
 
   const totalHits =
     typeof someResult.hits.total === 'number' ? someResult.hits.total : someResult.hits.total.value;
   let size = someResult.hits.hits.length - 1;
-  logger.info(`first size: ${size}`);
+  logger.debug(`first size: ${size}`);
   let sortIds = someResult.hits.hits[0].sort;
   if (sortIds == null && totalHits > 0) {
-    logger.warn('sortIds was empty on first search but expected more ');
+    logger.error(`sortIds was empty on first search when encountering ${totalHits}`);
     return false;
   } else if (sortIds == null && totalHits === 0) {
     return true;
@@ -130,7 +133,7 @@ export const searchAfterAndBulkIndex = async (
   while (size < totalHits) {
     // utilize track_total_hits instead of true
     try {
-      logger.info(`sortIds: ${sortIds}`);
+      logger.debug(`sortIds: ${sortIds}`);
       const searchAfterResult: SignalSearchResponse = await singleSearchAfter(
         sortId,
         params,
@@ -138,24 +141,24 @@ export const searchAfterAndBulkIndex = async (
         logger
       );
       size += searchAfterResult.hits.hits.length - 1;
-      logger.info(`size: ${size}`);
+      logger.debug(`size adjusted: ${size}`);
       sortIds = searchAfterResult.hits.hits[0].sort;
       if (sortIds == null) {
-        logger.warn('sortIds was empty search');
+        logger.error('sortIds was empty search when running a signal rule');
         return false;
       }
       sortId = sortIds[0];
-      logger.info('next bulk index');
+      logger.debug('next bulk index');
       const bulkSuccess = await singleBulkIndex(searchAfterResult, params, service, logger);
-      logger.info('finished next bulk index');
+      logger.debug('finished next bulk index');
       if (!bulkSuccess) {
-        logger.error('[-] bulk index failed');
+        logger.error('[-] bulk index failed but continuing');
       }
     } catch (exc) {
       logger.error(`[-] search_after and bulk threw an error ${exc}`);
       return false;
     }
   }
-  logger.info(`[+] completed bulk index of ${totalHits}`);
+  logger.debug(`[+] completed bulk index of ${totalHits}`);
   return true;
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.ts
index 08307ef633ffe..8248d1505143a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.ts
@@ -8,7 +8,7 @@ import Hapi from 'hapi';
 import Joi from 'joi';
 import { isFunction } from 'lodash/fp';
 import { updateSignal } from '../alerts/update_signals';
-import { SignalsRequest } from '../alerts/types';
+import { UpdateSignalsRequest } from '../alerts/types';
 import { updateSignalSchema } from './schemas';
 
 export const createUpdateSignalsRoute: Hapi.ServerRoute = {
@@ -30,7 +30,7 @@ export const createUpdateSignalsRoute: Hapi.ServerRoute = {
       payload: updateSignalSchema,
     },
   },
-  async handler(request: SignalsRequest, headers) {
+  async handler(request: UpdateSignalsRequest, headers) {
     const {
       description,
       enabled,
@@ -53,14 +53,13 @@ export const createUpdateSignalsRoute: Hapi.ServerRoute = {
       type,
       references,
     } = request.payload;
-    const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
 
+    const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
     const actionsClient = isFunction(request.getActionsClient) ? request.getActionsClient() : null;
 
     if (!alertsClient || !actionsClient) {
       return headers.response().code(404);
     }
-
     return updateSignal({
       alertsClient,
       actionsClient,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/delete_all_api_keys.sh b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/delete_all_api_keys.sh
new file mode 100755
index 0000000000000..efcee69a0152c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/delete_all_api_keys.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+#
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+#
+
+set -e
+./check_env_variables.sh
+
+# Example: ./delete_all_api_keys.sh
+# https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-invalidate-api-key.html
+curl -s -k \
+  -H "Content-Type: application/json" \
+  -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
+  -X DELETE ${ELASTICSEARCH_URL}/_security/api_key \
+  --data "{
+    \"username\": \"${ELASTICSEARCH_USERNAME}\"
+  }" \
+  | jq .
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/hard_reset.sh b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/hard_reset.sh
index ee8fa18e1234d..9c37e93831ccb 100755
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/hard_reset.sh
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/hard_reset.sh
@@ -14,3 +14,4 @@ set -e
 ./delete_all_alert_tasks.sh
 ./delete_signal_index.sh
 ./put_signal_index.sh
+./delete_all_api_keys.sh
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_update_1.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_update_1.json
index 71d79903a01db..589583d417a13 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_update_1.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_update_1.json
@@ -1,14 +1,14 @@
 {
   "id": "rule-1",
-  "description": "Detecting root and admin users",
-  "index": ["auditbeat-*", "filebeat-*", "packetbeat-*", "winlogbeat-*"],
-  "interval": "5m",
-  "name": "Detect Root/Admin Users",
+  "description": "Changed Description of only detecting root user",
+  "index": ["auditbeat-*"], 
+  "interval": "50m",
+  "name": "A different name",
   "severity": "high",
   "type": "query",
   "from": "now-6m",
-  "to": "now",
-  "query": "user.name: root or user.name: admin",
+  "to": "now-5m",
+  "query": "user.name: root",
   "language": "kuery",
-  "references": []
+  "references": ["https://update1.example.com", "https://update2.example.com"]
 }
diff --git a/x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts b/x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
index eea3ec6bb79d8..1216a8d2c4c24 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
+++ b/x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts
@@ -915,7 +915,6 @@ describe('reindexService', () => {
           expect(updatedOp.attributes.reindexTaskPercComplete).toEqual(1);
           expect(callCluster).toHaveBeenCalledWith('delete', {
             index: '.tasks',
-            type: 'task',
             id: 'xyz',
           });
         });
@@ -950,7 +949,6 @@ describe('reindexService', () => {
           expect(updatedOp.attributes.status).toEqual(ReindexStatus.cancelled);
           expect(callCluster).toHaveBeenCalledWith('delete', {
             index: '.tasks',
-            type: 'task',
             id: 'xyz',
           });
         });
diff --git a/x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts b/x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
index 21f45c401e2d4..6fe4d72db3f16 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
+++ b/x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
@@ -376,7 +376,6 @@ export const reindexServiceFactory = (
     // Delete the task from ES .tasks index
     const deleteTaskResp = await callCluster('delete', {
       index: '.tasks',
-      type: 'task',
       id: taskId,
     });
 
diff --git a/x-pack/legacy/plugins/uptime/common/constants/plugin.ts b/x-pack/legacy/plugins/uptime/common/constants/plugin.ts
index eeb0683fc9bbb..93c3f00a0a45c 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/plugin.ts
+++ b/x-pack/legacy/plugins/uptime/common/constants/plugin.ts
@@ -7,6 +7,6 @@
 export const PLUGIN = {
   APP_ROOT_ID: 'react-uptime-root',
   ID: 'uptime',
-  ROUTER_BASE_NAME: '/app/uptime',
+  ROUTER_BASE_NAME: '/app/uptime#',
   LOCAL_STORAGE_KEY: 'xpack.uptime',
 };
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 0a30e0bee5b66..e263e3281518a 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -581,8 +581,6 @@
     "core.ui.overlays.banner.closeButtonLabel": "閉じる",
     "core.ui.chrome.headerGlobalNav.goHomePageIconAriaLabel": "ホームページに移動",
     "core.ui.chrome.headerGlobalNav.helpMenuButtonAriaLabel": "ヘルプメニュー",
-    "core.ui.chrome.headerGlobalNav.helpMenuGoToDocumentation": "ドキュメントに移動",
-    "core.ui.chrome.headerGlobalNav.helpMenuHelpDescription": "不明な点、アップデートなどの情報はドキュメントをご覧ください。",
     "core.ui.chrome.headerGlobalNav.helpMenuTitle": "ヘルプ",
     "core.ui.chrome.headerGlobalNav.helpMenuVersion": "v {version}",
     "core.ui.chrome.sideGlobalNav.viewRecentItemsFlyoutTitle": "最近のアイテム",
@@ -4314,10 +4312,6 @@
     "xpack.graph.sidebar.selections.selectNoneButtonLabel": "なし",
     "xpack.graph.sidebar.selections.selectNoneButtonTooltip": "どれも選択しません",
     "xpack.graph.sidebar.selectionsTitle": "選択項目",
-    "xpack.graph.sidebar.similarLabels.keyTermsText": "キー用語: {inferredEdgeLabel}",
-    "xpack.graph.sidebar.similarLabels.mergeSrcToTargetButtonTooltip": "{srcLabel} を {targetLabel} に結合します",
-    "xpack.graph.sidebar.similarLabels.mergeTargetToSrcButtonTooltip": "{targetLabel} を {srcLabel} に結合します",
-    "xpack.graph.sidebar.similarLabelsTitle": "類似ラベル",
     "xpack.graph.sidebar.styleVerticesTitle": "スタイルが選択された頂点",
     "xpack.graph.sidebar.topMenu.addLinksButtonTooltip": "既存の用語の間にリンクを追加します",
     "xpack.graph.sidebar.topMenu.blacklistButtonTooltip": "選択項目がワークスペースに戻らないようブラックリストに追加します",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 0069d71786cec..85f74956dde43 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -582,8 +582,6 @@
     "core.ui.overlays.banner.closeButtonLabel": "关闭",
     "core.ui.chrome.headerGlobalNav.goHomePageIconAriaLabel": "前往主页",
     "core.ui.chrome.headerGlobalNav.helpMenuButtonAriaLabel": "帮助菜单",
-    "core.ui.chrome.headerGlobalNav.helpMenuGoToDocumentation": "前往文档",
-    "core.ui.chrome.headerGlobalNav.helpMenuHelpDescription": "在我们的文档中获取更新、信息以及答案。",
     "core.ui.chrome.headerGlobalNav.helpMenuTitle": "帮助",
     "core.ui.chrome.headerGlobalNav.helpMenuVersion": "v {version}",
     "core.ui.chrome.sideGlobalNav.viewRecentItemsFlyoutTitle": "最近项",
@@ -4315,10 +4313,6 @@
     "xpack.graph.sidebar.selections.selectNoneButtonLabel": "无",
     "xpack.graph.sidebar.selections.selectNoneButtonTooltip": "不选择任何内容",
     "xpack.graph.sidebar.selectionsTitle": "选择的内容",
-    "xpack.graph.sidebar.similarLabels.keyTermsText": "关键字词：{inferredEdgeLabel}",
-    "xpack.graph.sidebar.similarLabels.mergeSrcToTargetButtonTooltip": "将 {srcLabel} 合并到 {targetLabel}",
-    "xpack.graph.sidebar.similarLabels.mergeTargetToSrcButtonTooltip": "将 {targetLabel} 合并到 {srcLabel}",
-    "xpack.graph.sidebar.similarLabelsTitle": "类似标签",
     "xpack.graph.sidebar.styleVerticesTitle": "样式选择的顶点",
     "xpack.graph.sidebar.topMenu.addLinksButtonTooltip": "在现有字词之间添加链接",
     "xpack.graph.sidebar.topMenu.blacklistButtonTooltip": "返回工作空间时选择的黑名单",
diff --git a/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts b/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts
index 53ece86b92483..88d7d8716d0f5 100644
--- a/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts
+++ b/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts
@@ -88,7 +88,8 @@ export default function({ getService }: FtrProviderContext) {
           }
         });
 
-        it('should return log highlights in a field column', async () => {
+        // https://github.com/elastic/kibana/issues/49959
+        it.skip('should return log highlights in a field column', async () => {
           const {
             data: {
               source: { logEntryHighlights },
diff --git a/x-pack/test/api_integration/apis/lens/telemetry.ts b/x-pack/test/api_integration/apis/lens/telemetry.ts
index 5bba8848fe1d9..6428ef9f478d4 100644
--- a/x-pack/test/api_integration/apis/lens/telemetry.ts
+++ b/x-pack/test/api_integration/apis/lens/telemetry.ts
@@ -95,9 +95,10 @@ export default ({ getService }: FtrProviderContext) => {
       const olderDate = moment()
         .subtract(100, 'days')
         .valueOf();
+
+      // @ts-ignore optional type: string
       await es.index({
         index: '.kibana',
-        type: '_doc',
         body: {
           type: 'lens-ui-telemetry',
           'lens-ui-telemetry': {
diff --git a/x-pack/test/api_integration/apis/management/index_management/settings.js b/x-pack/test/api_integration/apis/management/index_management/settings.js
index 7d9e1732f19d6..bed71c0a62166 100644
--- a/x-pack/test/api_integration/apis/management/index_management/settings.js
+++ b/x-pack/test/api_integration/apis/management/index_management/settings.js
@@ -57,7 +57,6 @@ export default function ({ getService }) {
         'priority',
         'codec',
         'max_rescore_window',
-        'max_adjacency_matrix_filters',
         'analyze',
         'gc_deletes',
         'max_ngram_diff',
diff --git a/x-pack/test/api_integration/apis/siem/timeline_details.ts b/x-pack/test/api_integration/apis/siem/timeline_details.ts
index b702adfc1d35e..5d1e645bcf80b 100644
--- a/x-pack/test/api_integration/apis/siem/timeline_details.ts
+++ b/x-pack/test/api_integration/apis/siem/timeline_details.ts
@@ -289,7 +289,6 @@ const EXPECTED_DATA: DetailItem[] = [
     values: ['filebeat-7.0.0-iot-2019.06'],
     originalValue: 'filebeat-7.0.0-iot-2019.06',
   },
-  { field: '_type', values: ['_doc'], originalValue: '_doc' },
   {
     field: '_id',
     values: ['QRhG1WgBqd-n62SwZYDT'],
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts
index 8dfbee84515b8..52e4daef5ecf2 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts
@@ -206,6 +206,8 @@ export default function({ getService }: FtrProviderContext) {
       },
     },
     {
+      // TODO: fix and re-enable the categorization test as soon as Kibana and ES are in sync again
+      skipTest: true,
       suiteTitle: 'with categorization detector and default datafeed settings',
       jobSource: 'ecommerce',
       jobId: `ec_advanced_2_${Date.now()}`,
@@ -285,7 +287,9 @@ export default function({ getService }: FtrProviderContext) {
       await ml.api.cleanMlIndices();
     });
 
-    for (const testData of testDataList) {
+    for (const testData of testDataList.filter(td => {
+      return td.skipTest !== true;
+    })) {
       describe(`${testData.suiteTitle}`, function() {
         it('job creation loads the job management page', async () => {
           await ml.navigation.navigateToMl();
diff --git a/x-pack/test/functional/apps/maps/documents_source/docvalue_fields.js b/x-pack/test/functional/apps/maps/documents_source/docvalue_fields.js
index 90d4da02e3ed7..4aa8e1767818c 100644
--- a/x-pack/test/functional/apps/maps/documents_source/docvalue_fields.js
+++ b/x-pack/test/functional/apps/maps/documents_source/docvalue_fields.js
@@ -31,7 +31,7 @@ export default function ({ getPageObjects, getService }) {
       await PageObjects.maps.loadSavedMap('document example');
       const response = await getResponse();
       const firstHit = response.hits.hits[0];
-      expect(Object.keys(firstHit).join(',')).to.equal('_index,_type,_id,_score,fields');
+      expect(Object.keys(firstHit).join(',')).to.equal('_index,_id,_score,fields');
       expect(Object.keys(firstHit.fields).join(',')).to.equal('geo.coordinates');
     });
 
@@ -39,7 +39,7 @@ export default function ({ getPageObjects, getService }) {
       await PageObjects.maps.loadSavedMap('document example with data driven styles');
       const response = await getResponse();
       const firstHit = response.hits.hits[0];
-      expect(Object.keys(firstHit).join(',')).to.equal('_index,_type,_id,_score,fields');
+      expect(Object.keys(firstHit).join(',')).to.equal('_index,_id,_score,fields');
       expect(Object.keys(firstHit.fields).join(',')).to.equal('geo.coordinates,bytes,hour_of_day');
     });
 
@@ -47,7 +47,7 @@ export default function ({ getPageObjects, getService }) {
       await PageObjects.maps.loadSavedMap('document example with data driven styles on date field');
       const response = await getResponse();
       const firstHit = response.hits.hits[0];
-      expect(Object.keys(firstHit).join(',')).to.equal('_index,_type,_id,_score,fields');
+      expect(Object.keys(firstHit).join(',')).to.equal('_index,_id,_score,fields');
       expect(Object.keys(firstHit.fields).join(',')).to.equal('geo.coordinates,bytes,@timestamp');
       expect(firstHit.fields['@timestamp']).to.be.an('array');
       expect(firstHit.fields['@timestamp'][0]).to.equal('1442709321445');
diff --git a/x-pack/test/functional/apps/security/doc_level_security_roles.js b/x-pack/test/functional/apps/security/doc_level_security_roles.js
index 0766a1e2b15f1..9dac150b9a0e6 100644
--- a/x-pack/test/functional/apps/security/doc_level_security_roles.js
+++ b/x-pack/test/functional/apps/security/doc_level_security_roles.js
@@ -74,7 +74,7 @@ export default function ({ getService, getPageObjects }) {
         expect(hitCount).to.be('1');
       });
       const rowData = await PageObjects.discover.getDocTableIndex(1);
-      expect(rowData).to.be('name:ABC Company region:EAST _id:doc1 _type:_doc _index:dlstest _score:0');
+      expect(rowData).to.be('name:ABC Company region:EAST _id:doc1 _type: - _index:dlstest _score:0');
     });
     after('logout', async () => {
       await PageObjects.security.logout();
diff --git a/x-pack/test/functional/apps/security/field_level_security.js b/x-pack/test/functional/apps/security/field_level_security.js
index 640289fd119b6..2939805d70859 100644
--- a/x-pack/test/functional/apps/security/field_level_security.js
+++ b/x-pack/test/functional/apps/security/field_level_security.js
@@ -98,7 +98,7 @@ export default function ({ getService, getPageObjects }) {
       });
       const rowData = await PageObjects.discover.getDocTableIndex(1);
       expect(rowData).to
-        .be('customer_ssn:444.555.6666 customer_name:ABC Company customer_region:WEST _id:2 _type:_doc _index:flstest _score:0');
+        .be('customer_ssn:444.555.6666 customer_name:ABC Company customer_region:WEST _id:2 _type: - _index:flstest _score:0');
     });
 
     it('user customer2 should not see ssn', async function () {
@@ -110,7 +110,7 @@ export default function ({ getService, getPageObjects }) {
         expect(hitCount).to.be('2');
       });
       const rowData = await PageObjects.discover.getDocTableIndex(1);
-      expect(rowData).to.be('customer_name:ABC Company customer_region:WEST _id:2 _type:_doc _index:flstest _score:0');
+      expect(rowData).to.be('customer_name:ABC Company customer_region:WEST _id:2 _type: - _index:flstest _score:0');
     });
 
     after(async function () {
diff --git a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts
index 7be9816f40de3..1c7be6def614d 100644
--- a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts
@@ -21,7 +21,6 @@ export default function({ getService }: FtrProviderContext) {
         _source: { [SAVED_OBJECT_WITH_SECRET_TYPE]: savedObject },
       } = await es.get({
         id: generateRawID(id),
-        type: '_doc',
         index: '.kibana',
       });
 
diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
index e2ec45151418d..d719543fa3807 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
@@ -119,7 +119,6 @@ export function bulkCreateTestSuiteFactory(es: any, esArchiver: any, supertest:
       // query ES directory to ensure namespace was or wasn't specified
       const { _source } = await es.get({
         id: `${expectedSpacePrefix}${savedObject.type}:${savedObject.id}`,
-        type: '_doc',
         index: '.kibana',
       });
 
diff --git a/x-pack/test/saved_object_api_integration/common/suites/create.ts b/x-pack/test/saved_object_api_integration/common/suites/create.ts
index a6af4b7ad2469..3ee0548b707bc 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/create.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/create.ts
@@ -82,7 +82,6 @@ export function createTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
     // query ES directory to ensure namespace was or wasn't specified
     const { _source } = await es.get({
       id: `${expectedSpacePrefix}${spaceAwareType}:${resp.body.id}`,
-      type: '_doc',
       index: '.kibana',
     });
 
@@ -121,7 +120,6 @@ export function createTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
     // query ES directory to ensure namespace wasn't specified
     const { _source } = await es.get({
       id: `${notSpaceAwareType}:${resp.body.id}`,
-      type: '_doc',
       index: '.kibana',
     });