diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bf1e341c796fa..e54b7b56707e8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -170,7 +170,7 @@
 /x-pack/legacy/plugins/index_lifecycle_management/  @elastic/es-ui
 /x-pack/legacy/plugins/index_management/  @elastic/es-ui
 /x-pack/legacy/plugins/license_management/  @elastic/es-ui
-/x-pack/legacy/plugins/remote_clusters/  @elastic/es-ui
+/x-pack/plugins/remote_clusters/  @elastic/es-ui
 /x-pack/legacy/plugins/rollup/  @elastic/es-ui
 /x-pack/plugins/searchprofiler/  @elastic/es-ui
 /x-pack/legacy/plugins/snapshot_restore/  @elastic/es-ui
diff --git a/package.json b/package.json
index 3156e87e763b2..e801f75b976f8 100644
--- a/package.json
+++ b/package.json
@@ -294,8 +294,8 @@
     "@kbn/eslint-import-resolver-kibana": "2.0.0",
     "@kbn/eslint-plugin-eslint": "1.0.0",
     "@kbn/expect": "1.0.0",
-    "@kbn/plugin-generator": "1.0.0",
     "@kbn/optimizer": "1.0.0",
+    "@kbn/plugin-generator": "1.0.0",
     "@kbn/test": "1.0.0",
     "@kbn/utility-types": "1.0.0",
     "@microsoft/api-documenter": "7.7.2",
@@ -394,7 +394,7 @@
     "chai": "3.5.0",
     "chance": "1.0.18",
     "cheerio": "0.22.0",
-    "chromedriver": "79.0.0",
+    "chromedriver": "^80.0.1",
     "classnames": "2.2.6",
     "dedent": "^0.7.0",
     "delete-empty": "^2.0.0",
diff --git a/packages/kbn-optimizer/src/common/rxjs_helpers.ts b/packages/kbn-optimizer/src/common/rxjs_helpers.ts
index 1114f65bacb19..f37bebb49efe9 100644
--- a/packages/kbn-optimizer/src/common/rxjs_helpers.ts
+++ b/packages/kbn-optimizer/src/common/rxjs_helpers.ts
@@ -24,9 +24,9 @@ type Operator<T1, T2> = (source: Rx.Observable<T1>) => Rx.Observable<T2>;
 type MapFn<T1, T2> = (item: T1, index: number) => T2;
 
 /**
- * Wrap an operator chain in a closure so that is can have some local
- * state. The `fn` is called each time the final observable is
- * subscribed so the pipeline/closure is setup for each subscription.
+ * Wrap an operator chain in a closure so that it can have some local
+ * state. The `fn` is called each time the returned observable is
+ * subscribed; the closure is recreated for each subscription.
  */
 export const pipeClosure = <T1, T2>(fn: Operator<T1, T2>): Operator<T1, T2> => {
   return (source: Rx.Observable<T1>) => {
diff --git a/packages/kbn-optimizer/src/optimizer/handle_optimizer_completion.test.ts b/packages/kbn-optimizer/src/optimizer/handle_optimizer_completion.test.ts
new file mode 100644
index 0000000000000..7a8575a6c91fe
--- /dev/null
+++ b/packages/kbn-optimizer/src/optimizer/handle_optimizer_completion.test.ts
@@ -0,0 +1,104 @@
+/*
+ * 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.
+ */
+
+import * as Rx from 'rxjs';
+import { REPO_ROOT } from '@kbn/dev-utils';
+
+import { Update } from '../common';
+
+import { OptimizerState } from './optimizer_reducer';
+import { OptimizerConfig } from './optimizer_config';
+import { handleOptimizerCompletion } from './handle_optimizer_completion';
+import { toArray } from 'rxjs/operators';
+
+const createUpdate$ = (phase: OptimizerState['phase']) =>
+  Rx.of<Update<any, OptimizerState>>({
+    state: {
+      phase,
+      compilerStates: [],
+      durSec: 0,
+      offlineBundles: [],
+      onlineBundles: [],
+      startTime: Date.now(),
+    },
+  });
+
+const config = (watch?: boolean) =>
+  OptimizerConfig.create({
+    repoRoot: REPO_ROOT,
+    watch,
+  });
+const collect = <T>(stream: Rx.Observable<T>): Promise<T[]> => stream.pipe(toArray()).toPromise();
+
+it('errors if the optimizer completes when in watch mode', async () => {
+  const update$ = createUpdate$('success');
+
+  await expect(
+    collect(update$.pipe(handleOptimizerCompletion(config(true))))
+  ).rejects.toThrowErrorMatchingInlineSnapshot(
+    `"optimizer unexpectedly completed when in watch mode"`
+  );
+});
+
+it('errors if the optimizer completes in phase "issue"', async () => {
+  const update$ = createUpdate$('issue');
+
+  await expect(
+    collect(update$.pipe(handleOptimizerCompletion(config())))
+  ).rejects.toThrowErrorMatchingInlineSnapshot(`"webpack issue"`);
+});
+
+it('errors if the optimizer completes in phase "initializing"', async () => {
+  const update$ = createUpdate$('initializing');
+
+  await expect(
+    collect(update$.pipe(handleOptimizerCompletion(config())))
+  ).rejects.toThrowErrorMatchingInlineSnapshot(
+    `"optimizer unexpectedly exit in phase \\"initializing\\""`
+  );
+});
+
+it('errors if the optimizer completes in phase "reallocating"', async () => {
+  const update$ = createUpdate$('reallocating');
+
+  await expect(
+    collect(update$.pipe(handleOptimizerCompletion(config())))
+  ).rejects.toThrowErrorMatchingInlineSnapshot(
+    `"optimizer unexpectedly exit in phase \\"reallocating\\""`
+  );
+});
+
+it('errors if the optimizer completes in phase "running"', async () => {
+  const update$ = createUpdate$('running');
+
+  await expect(
+    collect(update$.pipe(handleOptimizerCompletion(config())))
+  ).rejects.toThrowErrorMatchingInlineSnapshot(
+    `"optimizer unexpectedly exit in phase \\"running\\""`
+  );
+});
+
+it('passes through errors on the source stream', async () => {
+  const error = new Error('foo');
+  const update$ = Rx.throwError(error);
+
+  await expect(collect(update$.pipe(handleOptimizerCompletion(config())))).rejects.toThrowError(
+    error
+  );
+});
diff --git a/packages/kbn-optimizer/src/optimizer/handle_optimizer_completion.ts b/packages/kbn-optimizer/src/optimizer/handle_optimizer_completion.ts
new file mode 100644
index 0000000000000..fe2fa320818a2
--- /dev/null
+++ b/packages/kbn-optimizer/src/optimizer/handle_optimizer_completion.ts
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+import * as Rx from 'rxjs';
+import { tap } from 'rxjs/operators';
+import { createFailError } from '@kbn/dev-utils';
+
+import { pipeClosure, Update } from '../common';
+
+import { OptimizerState } from './optimizer_reducer';
+import { OptimizerConfig } from './optimizer_config';
+
+export function handleOptimizerCompletion(config: OptimizerConfig) {
+  return pipeClosure((source$: Rx.Observable<Update<any, OptimizerState>>) => {
+    let prevState: OptimizerState | undefined;
+
+    return source$.pipe(
+      tap({
+        next: update => {
+          prevState = update.state;
+        },
+        complete: () => {
+          if (config.watch) {
+            throw new Error('optimizer unexpectedly completed when in watch mode');
+          }
+
+          if (prevState?.phase === 'success') {
+            return;
+          }
+
+          if (prevState?.phase === 'issue') {
+            throw createFailError('webpack issue');
+          }
+
+          throw new Error(`optimizer unexpectedly exit in phase "${prevState?.phase}"`);
+        },
+      })
+    );
+  });
+}
diff --git a/packages/kbn-optimizer/src/optimizer/index.ts b/packages/kbn-optimizer/src/optimizer/index.ts
index b7f14cf3c517f..3df8ed9302668 100644
--- a/packages/kbn-optimizer/src/optimizer/index.ts
+++ b/packages/kbn-optimizer/src/optimizer/index.ts
@@ -24,3 +24,4 @@ export * from './cache_keys';
 export * from './watch_bundles_for_changes';
 export * from './run_workers';
 export * from './bundle_cache';
+export * from './handle_optimizer_completion';
diff --git a/packages/kbn-optimizer/src/run_optimizer.ts b/packages/kbn-optimizer/src/run_optimizer.ts
index e6cce8d306e35..d2daa79feab7e 100644
--- a/packages/kbn-optimizer/src/run_optimizer.ts
+++ b/packages/kbn-optimizer/src/run_optimizer.ts
@@ -32,6 +32,7 @@ import {
   runWorkers,
   OptimizerInitializedEvent,
   createOptimizerReducer,
+  handleOptimizerCompletion,
 } from './optimizer';
 
 export type OptimizerUpdate = Update<OptimizerEvent, OptimizerState>;
@@ -77,6 +78,7 @@ export function runOptimizer(config: OptimizerConfig) {
         },
         createOptimizerReducer(config)
       );
-    })
+    }),
+    handleOptimizerCompletion(config)
   );
 }
diff --git a/packages/kbn-test/package.json b/packages/kbn-test/package.json
index 0cc54fa2a64c4..a01c4ebab8ad0 100644
--- a/packages/kbn-test/package.json
+++ b/packages/kbn-test/package.json
@@ -5,7 +5,7 @@
   "license": "Apache-2.0",
   "private": true,
   "scripts": {
-    "build": "babel src --out-dir target --delete-dir-on-start --extensions .ts,.js,.tsx --ignore *.test.js,**/__tests__/**",
+    "build": "babel src --out-dir target --delete-dir-on-start --extensions .ts,.js,.tsx --ignore *.test.js,**/__tests__/** --source-maps=inline",
     "kbn:bootstrap": "yarn build",
     "kbn:watch": "yarn build --watch"
   },
diff --git a/packages/kbn-test/src/failed_tests_reporter/test_report.ts b/packages/kbn-test/src/failed_tests_reporter/test_report.ts
index 6b759ef1d4c62..43d84163462d3 100644
--- a/packages/kbn-test/src/failed_tests_reporter/test_report.ts
+++ b/packages/kbn-test/src/failed_tests_reporter/test_report.ts
@@ -47,7 +47,7 @@ export interface TestSuite {
     /* number of skipped tests as a string */
     skipped: string;
   };
-  testcase: TestCase[];
+  testcase?: TestCase[];
 }
 
 export interface TestCase {
@@ -89,7 +89,7 @@ export function* makeTestCaseIter(report: TestReport) {
   const testSuites = 'testsuites' in report ? report.testsuites.testsuite : [report.testsuite];
 
   for (const testSuite of testSuites) {
-    for (const testCase of testSuite.testcase) {
+    for (const testCase of testSuite.testcase || []) {
       yield testCase;
     }
   }
diff --git a/src/legacy/core_plugins/data/public/search/aggs/buckets/date_range.ts b/src/legacy/core_plugins/data/public/search/aggs/buckets/date_range.ts
index 40ef7329dee6b..1dc24ca80035c 100644
--- a/src/legacy/core_plugins/data/public/search/aggs/buckets/date_range.ts
+++ b/src/legacy/core_plugins/data/public/search/aggs/buckets/date_range.ts
@@ -20,21 +20,19 @@ import { get } from 'lodash';
 import moment from 'moment-timezone';
 import { i18n } from '@kbn/i18n';
 import { npStart } from 'ui/new_platform';
+import { convertDateRangeToString, DateRangeKey } from './lib/date_range';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { BucketAggType, IBucketAggConfig } from './_bucket_agg_type';
 import { createFilterDateRange } from './create_filter/date_range';
 
 import { KBN_FIELD_TYPES, fieldFormats } from '../../../../../../../plugins/data/public';
 
+export { convertDateRangeToString, DateRangeKey };
+
 const dateRangeTitle = i18n.translate('data.search.aggs.buckets.dateRangeTitle', {
   defaultMessage: 'Date Range',
 });
 
-export interface DateRangeKey {
-  from: number;
-  to: number;
-}
-
 export const dateRangeBucketAgg = new BucketAggType({
   name: BUCKET_TYPES.DATE_RANGE,
   title: dateRangeTitle,
@@ -106,16 +104,3 @@ export const dateRangeBucketAgg = new BucketAggType({
     },
   ],
 });
-
-export const convertDateRangeToString = (
-  { from, to }: DateRangeKey,
-  format: (val: any) => string
-) => {
-  if (!from) {
-    return 'Before ' + format(to);
-  } else if (!to) {
-    return 'After ' + format(from);
-  } else {
-    return format(from) + ' to ' + format(to);
-  }
-};
diff --git a/src/legacy/core_plugins/data/public/search/aggs/buckets/ip_range.ts b/src/legacy/core_plugins/data/public/search/aggs/buckets/ip_range.ts
index e5497bef49165..91bdf53e7f809 100644
--- a/src/legacy/core_plugins/data/public/search/aggs/buckets/ip_range.ts
+++ b/src/legacy/core_plugins/data/public/search/aggs/buckets/ip_range.ts
@@ -20,21 +20,19 @@
 import { noop, map, omit, isNull } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { npStart } from 'ui/new_platform';
+import { IpRangeKey, convertIPRangeToString } from './lib/ip_range';
 import { BucketAggType } from './_bucket_agg_type';
 import { BUCKET_TYPES } from './bucket_agg_types';
 
 // @ts-ignore
 import { createFilterIpRange } from './create_filter/ip_range';
 import { KBN_FIELD_TYPES, fieldFormats } from '../../../../../../../plugins/data/public';
+export { IpRangeKey, convertIPRangeToString };
 
 const ipRangeTitle = i18n.translate('data.search.aggs.buckets.ipRangeTitle', {
   defaultMessage: 'IPv4 Range',
 });
 
-export type IpRangeKey =
-  | { type: 'mask'; mask: string }
-  | { type: 'range'; from: string; to: string };
-
 export const ipRangeBucketAgg = new BucketAggType({
   name: BUCKET_TYPES.IP_RANGE,
   title: ipRangeTitle,
@@ -97,13 +95,3 @@ export const ipRangeBucketAgg = new BucketAggType({
     },
   ],
 });
-
-export const convertIPRangeToString = (range: IpRangeKey, format: (val: any) => string) => {
-  if (range.type === 'mask') {
-    return format(range.mask);
-  }
-  const from = range.from ? format(range.from) : '-Infinity';
-  const to = range.to ? format(range.to) : 'Infinity';
-
-  return `${from} to ${to}`;
-};
diff --git a/src/legacy/core_plugins/data/public/search/aggs/buckets/lib/date_range.ts b/src/legacy/core_plugins/data/public/search/aggs/buckets/lib/date_range.ts
new file mode 100644
index 0000000000000..01b853fc669b5
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/aggs/buckets/lib/date_range.ts
@@ -0,0 +1,36 @@
+/*
+ * 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 interface DateRangeKey {
+  from: number;
+  to: number;
+}
+
+export const convertDateRangeToString = (
+  { from, to }: DateRangeKey,
+  format: (val: any) => string
+) => {
+  if (!from) {
+    return 'Before ' + format(to);
+  } else if (!to) {
+    return 'After ' + format(from);
+  } else {
+    return format(from) + ' to ' + format(to);
+  }
+};
diff --git a/src/legacy/core_plugins/data/public/search/aggs/buckets/lib/ip_range.ts b/src/legacy/core_plugins/data/public/search/aggs/buckets/lib/ip_range.ts
new file mode 100644
index 0000000000000..be1ac28934c7c
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/aggs/buckets/lib/ip_range.ts
@@ -0,0 +1,32 @@
+/*
+ * 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 type IpRangeKey =
+  | { type: 'mask'; mask: string }
+  | { type: 'range'; from: string; to: string };
+
+export const convertIPRangeToString = (range: IpRangeKey, format: (val: any) => string) => {
+  if (range.type === 'mask') {
+    return format(range.mask);
+  }
+  const from = range.from ? format(range.from) : '-Infinity';
+  const to = range.to ? format(range.to) : 'Infinity';
+
+  return `${from} to ${to}`;
+};
diff --git a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
index 32c99f68a066e..6a466c9cd0211 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
+++ b/src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_component.test.tsx
@@ -22,6 +22,10 @@ import { shallow } from 'enzyme';
 
 import { Vis } from 'src/legacy/core_plugins/visualizations/public';
 import { MetricVisComponent, MetricVisComponentProps } from './metric_vis_component';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { npStart } from 'ui/new_platform';
+import { fieldFormats } from '../../../../../plugins/data/public';
+import { identity } from 'lodash';
 
 jest.mock('ui/new_platform');
 
@@ -62,6 +66,12 @@ describe('MetricVisComponent', function() {
     return shallow(<MetricVisComponent {...props} />);
   };
 
+  beforeAll(() => {
+    (npStart.plugins.data.fieldFormats.deserialize as jest.Mock).mockImplementation(() => {
+      return new (fieldFormats.FieldFormat.from(identity))();
+    });
+  });
+
   it('should render component', () => {
     expect(getComponent().exists()).toBe(true);
   });
diff --git a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.test.ts b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.test.ts
index 28565e0181b84..15cd920b79e4a 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.test.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.test.ts
@@ -44,6 +44,9 @@ describe('metric_vis - createMetricVisTypeDefinition', () => {
     (npStart.plugins.data.fieldFormats.getType as jest.Mock).mockImplementation(() => {
       return fieldFormats.UrlFormat;
     });
+    (npStart.plugins.data.fieldFormats.deserialize as jest.Mock).mockImplementation(mapping => {
+      return new fieldFormats.UrlFormat(mapping ? mapping.params : {});
+    });
   });
 
   const setup = () => {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts b/src/legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts
index 3d04c04f9b1a6..9c79be98a320c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts
@@ -18,10 +18,11 @@
  */
 
 export { AggType, AggGroupNames, IAggConfig, IAggType, Schemas } from 'ui/agg_types';
-export { getFormat, getTableAggs } from 'ui/visualize/loader/pipeline_helpers/utilities';
+export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 // @ts-ignore
 export { tabifyAggResponse } from 'ui/agg_response/tabify';
 // @ts-ignore
 export { buildHierarchicalData } from 'ui/agg_response/hierarchical/build_hierarchical_data';
 // @ts-ignore
 export { buildPointSeriesData } from 'ui/agg_response/point_series/point_series';
+export { tabifyGetColumns } from '../../../ui/public/agg_response/tabify/_get_columns';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx b/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
index a170af33583df..c1563625c3b8c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
@@ -22,14 +22,24 @@ import { compact, uniq, map } from 'lodash';
 
 import { i18n } from '@kbn/i18n';
 import { EuiPopoverProps, EuiIcon, keyCodes, htmlIdGenerator } from '@elastic/eui';
+import { IAggConfig } from '../../../../../data/public';
 
 // @ts-ignore
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { createFiltersFromEvent } from '../../../../../data/public/actions/filters/create_filters_from_event';
 import { CUSTOM_LEGEND_VIS_TYPES, LegendItem } from './models';
 import { VisLegendItem } from './legend_item';
 import { getPieNames } from './pie_utils';
-import { getTableAggs } from '../../../legacy_imports';
+
+import { Vis } from '../../../../../visualizations/public';
+import { tabifyGetColumns } from '../../../legacy_imports';
+
+const getTableAggs = (vis: Vis): IAggConfig[] => {
+  if (!vis.aggs || !vis.aggs.getResponseAggs) {
+    return [];
+  }
+  const columns = tabifyGetColumns(vis.aggs.getResponseAggs(), !vis.isHierarchical());
+  return columns.map(c => c.aggConfig);
+};
 
 export interface VisLegendProps {
   vis: any;
diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts b/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
index 7228e506accb9..cb25c66dfd2fe 100644
--- a/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
+++ b/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
@@ -17,150 +17,15 @@
  * under the License.
  */
 
-import { i18n } from '@kbn/i18n';
-import { identity } from 'lodash';
-import { IAggConfig } from 'ui/agg_types';
 import { npStart } from 'ui/new_platform';
-import { SerializedFieldFormat } from 'src/plugins/expressions/public';
-import {
-  fieldFormats,
-  IFieldFormat,
-  FieldFormatId,
-  FieldFormatsContentType,
-} from '../../../../../../plugins/data/public';
-import { Vis } from '../../../../../core_plugins/visualizations/public';
+import { fieldFormats, IFieldFormat } from '../../../../../../plugins/data/public';
+import { SerializedFieldFormat } from '../../../../../../plugins/expressions/common/types';
 
-import { tabifyGetColumns } from '../../../agg_response/tabify/_get_columns';
-import { DateRangeKey, convertDateRangeToString } from '../../../agg_types';
-import { IpRangeKey, convertIPRangeToString } from '../../../agg_types';
+type FormatFactory = (mapping?: SerializedFieldFormat) => IFieldFormat;
 
-interface TermsFieldFormatParams {
-  otherBucketLabel: string;
-  missingBucketLabel: string;
-  id: string;
-}
-
-function isTermsFieldFormat(
-  serializedFieldFormat: SerializedFieldFormat
-): serializedFieldFormat is SerializedFieldFormat<TermsFieldFormatParams> {
-  return serializedFieldFormat.id === 'terms';
-}
-
-const getConfig = (key: string, defaultOverride?: any): any =>
-  npStart.core.uiSettings.get(key, defaultOverride);
-const DefaultFieldFormat = fieldFormats.FieldFormat.from(identity);
-
-const getFieldFormat = (id?: FieldFormatId, params: object = {}): IFieldFormat => {
-  const fieldFormatsService = npStart.plugins.data.fieldFormats;
-
-  if (id) {
-    const Format = fieldFormatsService.getType(id);
-
-    if (Format) {
-      return new Format(params, getConfig);
-    }
-  }
-
-  return new DefaultFieldFormat();
-};
-
-export const createFormat = (agg: IAggConfig): SerializedFieldFormat => {
-  const format: SerializedFieldFormat = agg.params.field ? agg.params.field.format.toJSON() : {};
-  const formats: Record<string, () => SerializedFieldFormat> = {
-    date_range: () => ({ id: 'date_range', params: format }),
-    ip_range: () => ({ id: 'ip_range', params: format }),
-    percentile_ranks: () => ({ id: 'percent' }),
-    count: () => ({ id: 'number' }),
-    cardinality: () => ({ id: 'number' }),
-    date_histogram: () => ({
-      id: 'date',
-      params: {
-        pattern: (agg as any).buckets.getScaledDateFormat(),
-      },
-    }),
-    terms: () => ({
-      id: 'terms',
-      params: {
-        id: format.id,
-        otherBucketLabel: agg.params.otherBucketLabel,
-        missingBucketLabel: agg.params.missingBucketLabel,
-        ...format.params,
-      },
-    }),
-    range: () => ({
-      id: 'range',
-      params: { id: format.id, ...format.params },
-    }),
-  };
-
-  return formats[agg.type.name] ? formats[agg.type.name]() : format;
-};
-
-export type FormatFactory = (mapping?: SerializedFieldFormat) => IFieldFormat;
-
-export const getFormat: FormatFactory = mapping => {
-  if (!mapping) {
-    return new DefaultFieldFormat();
-  }
-  const { id } = mapping;
-  if (id === 'range') {
-    const RangeFormat = fieldFormats.FieldFormat.from((range: any) => {
-      const format = getFieldFormat(id, mapping.params);
-      const gte = '\u2265';
-      const lt = '\u003c';
-      return i18n.translate('common.ui.aggTypes.rangesFormatMessage', {
-        defaultMessage: '{gte} {from} and {lt} {to}',
-        values: {
-          gte,
-          from: format.convert(range.gte),
-          lt,
-          to: format.convert(range.lt),
-        },
-      });
-    });
-    return new RangeFormat();
-  } else if (id === 'date_range') {
-    const nestedFormatter = mapping.params as SerializedFieldFormat;
-    const DateRangeFormat = fieldFormats.FieldFormat.from((range: DateRangeKey) => {
-      const format = getFieldFormat(nestedFormatter.id, nestedFormatter.params);
-      return convertDateRangeToString(range, format.convert.bind(format));
-    });
-    return new DateRangeFormat();
-  } else if (id === 'ip_range') {
-    const nestedFormatter = mapping.params as SerializedFieldFormat;
-    const IpRangeFormat = fieldFormats.FieldFormat.from((range: IpRangeKey) => {
-      const format = getFieldFormat(nestedFormatter.id, nestedFormatter.params);
-      return convertIPRangeToString(range, format.convert.bind(format));
-    });
-    return new IpRangeFormat();
-  } else if (isTermsFieldFormat(mapping) && mapping.params) {
-    const { params } = mapping;
-    const convert = (val: string, type: FieldFormatsContentType) => {
-      const format = getFieldFormat(params.id, mapping.params);
-
-      if (val === '__other__') {
-        return params.otherBucketLabel;
-      }
-      if (val === '__missing__') {
-        return params.missingBucketLabel;
-      }
-
-      return format.convert(val, type);
-    };
-
-    return {
-      convert,
-      getConverterFor: (type: FieldFormatsContentType) => (val: string) => convert(val, type),
-    } as IFieldFormat;
-  } else {
-    return getFieldFormat(id, mapping.params);
-  }
+const createFormat = fieldFormats.serialize;
+const getFormat: FormatFactory = (mapping?) => {
+  return npStart.plugins.data.fieldFormats.deserialize(mapping as any);
 };
 
-export const getTableAggs = (vis: Vis): IAggConfig[] => {
-  if (!vis.aggs || !vis.aggs.getResponseAggs) {
-    return [];
-  }
-  const columns = tabifyGetColumns(vis.aggs.getResponseAggs(), !vis.isHierarchical());
-  return columns.map(c => c.aggConfig);
-};
+export { getFormat, createFormat, FormatFactory };
diff --git a/src/plugins/data/common/field_formats/field_formats_registry.ts b/src/plugins/data/common/field_formats/field_formats_registry.ts
index 6e4880a221c46..9fe9a31307b6a 100644
--- a/src/plugins/data/common/field_formats/field_formats_registry.ts
+++ b/src/plugins/data/common/field_formats/field_formats_registry.ts
@@ -18,9 +18,9 @@
  */
 
 // eslint-disable-next-line max-classes-per-file
-import { forOwn, isFunction, memoize } from 'lodash';
+import { forOwn, isFunction, memoize, identity } from 'lodash';
 
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../common';
+import { ES_FIELD_TYPES, IFieldFormat, KBN_FIELD_TYPES } from '../../common';
 
 import {
   FieldFormatsGetConfigFn,
@@ -32,12 +32,17 @@ import {
 } from './types';
 import { baseFormatters } from './constants/base_formatters';
 import { FieldFormat } from './field_format';
+import { SerializedFieldFormat } from '../../../expressions/common/types';
 
 export class FieldFormatsRegistry {
   protected fieldFormats: Map<FieldFormatId, IFieldFormatType> = new Map();
   protected defaultMap: Record<string, FieldFormatConfig> = {};
   protected metaParamsOptions: Record<string, any> = {};
   protected getConfig?: FieldFormatsGetConfigFn;
+  // overriden on the public contract
+  public deserialize: (mapping: SerializedFieldFormat) => IFieldFormat = () => {
+    return new (FieldFormat.from(identity))();
+  };
 
   init(
     getConfig: FieldFormatsGetConfigFn,
diff --git a/src/plugins/data/common/field_formats/index.ts b/src/plugins/data/common/field_formats/index.ts
index 0847ac0db745f..d7858966f2620 100644
--- a/src/plugins/data/common/field_formats/index.ts
+++ b/src/plugins/data/common/field_formats/index.ts
@@ -41,7 +41,7 @@ export {
   TruncateFormat,
 } from './converters';
 
-export { getHighlightRequest } from './utils';
+export { getHighlightRequest, serializeFieldFormat } from './utils';
 
 export { DEFAULT_CONVERTER_COLOR } from './constants/color_default';
 export { FIELD_FORMAT_IDS } from './types';
diff --git a/src/plugins/data/common/field_formats/utils/index.ts b/src/plugins/data/common/field_formats/utils/index.ts
index 81b33115a44bb..3832c941ffad7 100644
--- a/src/plugins/data/common/field_formats/utils/index.ts
+++ b/src/plugins/data/common/field_formats/utils/index.ts
@@ -17,5 +17,11 @@
  * under the License.
  */
 
+import { SerializedFieldFormat } from '../../../../expressions/common/types';
+import { IFieldFormat } from '../index';
+
 export { asPrettyString } from './as_pretty_string';
 export { getHighlightHtml, getHighlightRequest } from './highlight';
+export { serializeFieldFormat } from './serialize';
+
+export type FormatFactory = (mapping?: SerializedFieldFormat) => IFieldFormat;
diff --git a/src/plugins/data/common/field_formats/utils/serialize.ts b/src/plugins/data/common/field_formats/utils/serialize.ts
new file mode 100644
index 0000000000000..9931f55c30a9e
--- /dev/null
+++ b/src/plugins/data/common/field_formats/utils/serialize.ts
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+import { IAggConfig } from '../../../../../legacy/ui/public/agg_types';
+import { SerializedFieldFormat } from '../../../../expressions/common/types';
+
+export const serializeFieldFormat = (agg: IAggConfig): SerializedFieldFormat => {
+  const format: SerializedFieldFormat = agg.params.field ? agg.params.field.format.toJSON() : {};
+  const formats: Record<string, () => SerializedFieldFormat> = {
+    date_range: () => ({ id: 'date_range', params: format }),
+    ip_range: () => ({ id: 'ip_range', params: format }),
+    percentile_ranks: () => ({ id: 'percent' }),
+    count: () => ({ id: 'number' }),
+    cardinality: () => ({ id: 'number' }),
+    date_histogram: () => ({
+      id: 'date',
+      params: {
+        pattern: (agg as any).buckets.getScaledDateFormat(),
+      },
+    }),
+    terms: () => ({
+      id: 'terms',
+      params: {
+        id: format.id,
+        otherBucketLabel: agg.params.otherBucketLabel,
+        missingBucketLabel: agg.params.missingBucketLabel,
+        ...format.params,
+      },
+    }),
+    range: () => ({
+      id: 'range',
+      params: { id: format.id, ...format.params },
+    }),
+  };
+
+  return formats[agg.type.name] ? formats[agg.type.name]() : format;
+};
diff --git a/src/plugins/data/public/field_formats/field_formats_service.ts b/src/plugins/data/public/field_formats/field_formats_service.ts
index 1c43ce2198645..785bedf9b35d3 100644
--- a/src/plugins/data/public/field_formats/field_formats_service.ts
+++ b/src/plugins/data/public/field_formats/field_formats_service.ts
@@ -19,6 +19,8 @@
 
 import { CoreSetup } from 'src/core/public';
 import { FieldFormatsRegistry } from '../../common/field_formats';
+import { deserializeFieldFormat } from './utils/deserialize';
+import { FormatFactory } from '../../common/field_formats/utils';
 
 export class FieldFormatsService {
   private readonly fieldFormatsRegistry: FieldFormatsRegistry = new FieldFormatsRegistry();
@@ -44,6 +46,10 @@ export class FieldFormatsService {
   }
 
   public start() {
+    this.fieldFormatsRegistry.deserialize = deserializeFieldFormat.bind(
+      this.fieldFormatsRegistry as FieldFormatsStart
+    );
+
     return this.fieldFormatsRegistry as FieldFormatsStart;
   }
 }
@@ -52,4 +58,6 @@ export class FieldFormatsService {
 export type FieldFormatsSetup = Pick<FieldFormatsRegistry, 'register'>;
 
 /** @public */
-export type FieldFormatsStart = Omit<FieldFormatsRegistry, 'init' & 'register'>;
+export type FieldFormatsStart = Omit<FieldFormatsRegistry, 'init' & 'register'> & {
+  deserialize: FormatFactory;
+};
diff --git a/src/plugins/data/public/field_formats/utils/deserialize.ts b/src/plugins/data/public/field_formats/utils/deserialize.ts
new file mode 100644
index 0000000000000..c10ebfbe3eb1e
--- /dev/null
+++ b/src/plugins/data/public/field_formats/utils/deserialize.ts
@@ -0,0 +1,129 @@
+/*
+ * 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.
+ */
+
+import { identity } from 'lodash';
+import { i18n } from '@kbn/i18n';
+import {
+  convertDateRangeToString,
+  DateRangeKey,
+} from '../../../../../legacy/core_plugins/data/public/search/aggs/buckets/lib/date_range';
+import {
+  convertIPRangeToString,
+  IpRangeKey,
+} from '../../../../../legacy/core_plugins/data/public/search/aggs/buckets/lib/ip_range';
+import { SerializedFieldFormat } from '../../../../expressions/common/types';
+import { FieldFormatId, FieldFormatsContentType, IFieldFormat } from '../..';
+import { FieldFormat } from '../../../common';
+import { DataPublicPluginStart } from '../../../public';
+import { getUiSettings } from '../../../public/services';
+import { FormatFactory } from '../../../common/field_formats/utils';
+
+interface TermsFieldFormatParams {
+  otherBucketLabel: string;
+  missingBucketLabel: string;
+  id: string;
+}
+
+function isTermsFieldFormat(
+  serializedFieldFormat: SerializedFieldFormat
+): serializedFieldFormat is SerializedFieldFormat<TermsFieldFormatParams> {
+  return serializedFieldFormat.id === 'terms';
+}
+
+const getConfig = (key: string, defaultOverride?: any): any =>
+  getUiSettings().get(key, defaultOverride);
+const DefaultFieldFormat = FieldFormat.from(identity);
+
+const getFieldFormat = (
+  fieldFormatsService: DataPublicPluginStart['fieldFormats'],
+  id?: FieldFormatId,
+  params: object = {}
+): IFieldFormat => {
+  if (id) {
+    const Format = fieldFormatsService.getType(id);
+
+    if (Format) {
+      return new Format(params, getConfig);
+    }
+  }
+
+  return new DefaultFieldFormat();
+};
+
+export const deserializeFieldFormat: FormatFactory = function(
+  this: DataPublicPluginStart['fieldFormats'],
+  mapping?: SerializedFieldFormat
+) {
+  if (!mapping) {
+    return new DefaultFieldFormat();
+  }
+  const { id } = mapping;
+  if (id === 'range') {
+    const RangeFormat = FieldFormat.from((range: any) => {
+      const format = getFieldFormat(this, id, mapping.params);
+      const gte = '\u2265';
+      const lt = '\u003c';
+      return i18n.translate('data.aggTypes.buckets.ranges.rangesFormatMessage', {
+        defaultMessage: '{gte} {from} and {lt} {to}',
+        values: {
+          gte,
+          from: format.convert(range.gte),
+          lt,
+          to: format.convert(range.lt),
+        },
+      });
+    });
+    return new RangeFormat();
+  } else if (id === 'date_range') {
+    const nestedFormatter = mapping.params as SerializedFieldFormat;
+    const DateRangeFormat = FieldFormat.from((range: DateRangeKey) => {
+      const format = getFieldFormat(this, nestedFormatter.id, nestedFormatter.params);
+      return convertDateRangeToString(range, format.convert.bind(format));
+    });
+    return new DateRangeFormat();
+  } else if (id === 'ip_range') {
+    const nestedFormatter = mapping.params as SerializedFieldFormat;
+    const IpRangeFormat = FieldFormat.from((range: IpRangeKey) => {
+      const format = getFieldFormat(this, nestedFormatter.id, nestedFormatter.params);
+      return convertIPRangeToString(range, format.convert.bind(format));
+    });
+    return new IpRangeFormat();
+  } else if (isTermsFieldFormat(mapping) && mapping.params) {
+    const { params } = mapping;
+    const convert = (val: string, type: FieldFormatsContentType) => {
+      const format = getFieldFormat(this, params.id, mapping.params);
+
+      if (val === '__other__') {
+        return params.otherBucketLabel;
+      }
+      if (val === '__missing__') {
+        return params.missingBucketLabel;
+      }
+
+      return format.convert(val, type);
+    };
+
+    return {
+      convert,
+      getConverterFor: (type: FieldFormatsContentType) => (val: string) => convert(val, type),
+    } as IFieldFormat;
+  } else {
+    return getFieldFormat(this, id, mapping.params);
+  }
+};
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 8704ca08ae905..cdc4167f545af 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -168,6 +168,7 @@ import {
   UrlFormat,
   StringFormat,
   TruncateFormat,
+  serializeFieldFormat,
 } from '../common/field_formats';
 
 // Field formats helpers namespace:
@@ -175,6 +176,8 @@ export const fieldFormats = {
   FieldFormat,
   FieldFormatsRegistry, // exported only for tests. Consider mock.
 
+  serialize: serializeFieldFormat,
+
   DEFAULT_CONVERTER_COLOR,
   HTML_CONTEXT_TYPE,
   TEXT_CONTEXT_TYPE,
@@ -305,7 +308,6 @@ export {
   TimeHistoryContract,
 } from './query';
 export * from './ui';
-
 export {
   // kbn field types
   castEsToKbnFieldTypeName,
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
index 103f9d385b3f9..b6ca91169a933 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
@@ -31,7 +31,7 @@ import { setNotifications, setFieldFormats } from '../../services';
 // Temporary disable eslint, will be removed after moving to new platform folder
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { notificationServiceMock } from '../../../../../core/public/notifications/notifications_service.mock';
-import { FieldFormatsRegistry } from '../../../common/field_formats';
+import { FieldFormatsStart } from '../../field_formats';
 
 jest.mock('../../../../kibana_utils/public', () => {
   const originalModule = jest.requireActual('../../../../kibana_utils/public');
@@ -125,7 +125,8 @@ describe('IndexPattern', () => {
     setNotifications(notifications);
     setFieldFormats(({
       getDefaultInstance: jest.fn(),
-    } as unknown) as FieldFormatsRegistry);
+      deserialize: jest.fn() as any,
+    } as unknown) as FieldFormatsStart);
 
     return create(indexPatternId).then((pattern: IndexPattern) => {
       indexPattern = pattern;
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index 0a093644c3939..c723c34cd0a22 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -49,6 +49,7 @@ const fieldFormatsMock: IFieldFormatsRegistry = {
   init: jest.fn(),
   register: jest.fn(),
   parseDefaultTypeMap: jest.fn(),
+  deserialize: jest.fn(),
 };
 
 const createSetupContract = (): Setup => {
diff --git a/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap b/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
index eebbc63f6f1e4..990386687bade 100644
--- a/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
+++ b/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
@@ -173,6 +173,7 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
                 "hasQuerySuggestions": [MockFunction],
               },
               "fieldFormats": Object {
+                "deserialize": [MockFunction],
                 "getByFieldType": [MockFunction],
                 "getDefaultConfig": [MockFunction],
                 "getDefaultInstance": [MockFunction],
@@ -825,6 +826,7 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
                         "hasQuerySuggestions": [MockFunction],
                       },
                       "fieldFormats": Object {
+                        "deserialize": [MockFunction],
                         "getByFieldType": [MockFunction],
                         "getDefaultConfig": [MockFunction],
                         "getDefaultInstance": [MockFunction],
@@ -1459,6 +1461,7 @@ exports[`QueryStringInput Should pass the query language to the language switche
                 "hasQuerySuggestions": [MockFunction],
               },
               "fieldFormats": Object {
+                "deserialize": [MockFunction],
                 "getByFieldType": [MockFunction],
                 "getDefaultConfig": [MockFunction],
                 "getDefaultInstance": [MockFunction],
@@ -2108,6 +2111,7 @@ exports[`QueryStringInput Should pass the query language to the language switche
                         "hasQuerySuggestions": [MockFunction],
                       },
                       "fieldFormats": Object {
+                        "deserialize": [MockFunction],
                         "getByFieldType": [MockFunction],
                         "getDefaultConfig": [MockFunction],
                         "getDefaultInstance": [MockFunction],
@@ -2742,6 +2746,7 @@ exports[`QueryStringInput Should render the given query 1`] = `
                 "hasQuerySuggestions": [MockFunction],
               },
               "fieldFormats": Object {
+                "deserialize": [MockFunction],
                 "getByFieldType": [MockFunction],
                 "getDefaultConfig": [MockFunction],
                 "getDefaultInstance": [MockFunction],
@@ -3391,6 +3396,7 @@ exports[`QueryStringInput Should render the given query 1`] = `
                         "hasQuerySuggestions": [MockFunction],
                       },
                       "fieldFormats": Object {
+                        "deserialize": [MockFunction],
                         "getByFieldType": [MockFunction],
                         "getDefaultConfig": [MockFunction],
                         "getDefaultInstance": [MockFunction],
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index e8f422d94909f..3ee98a318de35 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -95,12 +95,15 @@ import {
   UrlFormat,
   StringFormat,
   TruncateFormat,
+  serializeFieldFormat,
 } from '../common/field_formats';
 
 export const fieldFormats = {
   FieldFormatsRegistry,
   FieldFormat,
 
+  serializeFieldFormat,
+
   BoolFormat,
   BytesFormat,
   ColorFormat,
diff --git a/src/test_utils/public/stub_field_formats.ts b/src/test_utils/public/stub_field_formats.ts
index 32bdca1eea258..5a20823134ebd 100644
--- a/src/test_utils/public/stub_field_formats.ts
+++ b/src/test_utils/public/stub_field_formats.ts
@@ -17,7 +17,8 @@
  * under the License.
  */
 import { CoreSetup } from 'kibana/public';
-import { fieldFormats } from '../../plugins/data/public';
+import { DataPublicPluginStart, fieldFormats } from '../../plugins/data/public';
+import { deserializeFieldFormat } from '../../plugins/data/public/field_formats/utils/deserialize';
 
 export const getFieldFormatsRegistry = (core: CoreSetup) => {
   const fieldFormatsRegistry = new fieldFormats.FieldFormatsRegistry();
@@ -25,5 +26,9 @@ export const getFieldFormatsRegistry = (core: CoreSetup) => {
 
   fieldFormatsRegistry.init(getConfig, {});
 
+  fieldFormatsRegistry.deserialize = deserializeFieldFormat.bind(
+    fieldFormatsRegistry as DataPublicPluginStart['fieldFormats']
+  );
+
   return fieldFormatsRegistry;
 };
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index 27da54042594d..032efcee20afd 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -27,7 +27,7 @@
     "xpack.maps": "legacy/plugins/maps",
     "xpack.ml": "legacy/plugins/ml",
     "xpack.monitoring": "legacy/plugins/monitoring",
-    "xpack.remoteClusters": ["plugins/remote_clusters", "legacy/plugins/remote_clusters"],
+    "xpack.remoteClusters": "plugins/remote_clusters",
     "xpack.reporting": ["plugins/reporting", "legacy/plugins/reporting"],
     "xpack.rollupJobs": "legacy/plugins/rollup",
     "xpack.searchProfiler": "plugins/searchprofiler",
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.js b/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.js
deleted file mode 100644
index d2385dc900bb2..0000000000000
--- a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.js
+++ /dev/null
@@ -1,35 +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 axios from 'axios';
-import axiosXhrAdapter from 'axios/lib/adapters/xhr';
-import chrome from 'ui/chrome'; // eslint-disable-line import/no-unresolved
-import { MANAGEMENT_BREADCRUMB } from 'ui/management'; // eslint-disable-line import/no-unresolved
-import { fatalError, toastNotifications } from 'ui/notify'; // eslint-disable-line import/no-unresolved
-
-import { init as initBreadcrumb } from '../../../public/app/services/breadcrumb';
-import { init as initHttp } from '../../../public/app/services/http';
-import { init as initNotification } from '../../../public/app/services/notification';
-import { init as initUiMetric } from '../../../public/app/services/ui_metric';
-import { init as initHttpRequests } from './http_requests';
-
-export const setupEnvironment = () => {
-  chrome.breadcrumbs = {
-    set: () => {},
-  };
-  // axios has a $http like interface so using it to simulate $http
-  initHttp(axios.create({ adapter: axiosXhrAdapter }), path => path);
-  initBreadcrumb(() => {}, MANAGEMENT_BREADCRUMB);
-  initNotification(toastNotifications, fatalError);
-  initUiMetric(() => () => {});
-
-  const { server, httpRequestsMockHelpers } = initHttpRequests();
-
-  return {
-    server,
-    httpRequestsMockHelpers,
-  };
-};
diff --git a/x-pack/legacy/plugins/remote_clusters/common/cluster_serialization.test.ts b/x-pack/legacy/plugins/remote_clusters/common/cluster_serialization.test.ts
deleted file mode 100644
index 476fbee7fb6a0..0000000000000
--- a/x-pack/legacy/plugins/remote_clusters/common/cluster_serialization.test.ts
+++ /dev/null
@@ -1,137 +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 { deserializeCluster, serializeCluster } from './cluster_serialization';
-
-describe('cluster_serialization', () => {
-  describe('deserializeCluster()', () => {
-    it('should throw an error for invalid arguments', () => {
-      expect(() => deserializeCluster('foo', 'bar')).toThrowError();
-    });
-
-    it('should deserialize a complete cluster object', () => {
-      expect(
-        deserializeCluster('test_cluster', {
-          seeds: ['localhost:9300'],
-          connected: true,
-          num_nodes_connected: 1,
-          max_connections_per_cluster: 3,
-          initial_connect_timeout: '30s',
-          skip_unavailable: false,
-          transport: {
-            ping_schedule: '-1',
-            compress: false,
-          },
-        })
-      ).toEqual({
-        name: 'test_cluster',
-        seeds: ['localhost:9300'],
-        isConnected: true,
-        connectedNodesCount: 1,
-        maxConnectionsPerCluster: 3,
-        initialConnectTimeout: '30s',
-        skipUnavailable: false,
-        transportPingSchedule: '-1',
-        transportCompress: false,
-      });
-    });
-
-    it('should deserialize a cluster object without transport information', () => {
-      expect(
-        deserializeCluster('test_cluster', {
-          seeds: ['localhost:9300'],
-          connected: true,
-          num_nodes_connected: 1,
-          max_connections_per_cluster: 3,
-          initial_connect_timeout: '30s',
-          skip_unavailable: false,
-        })
-      ).toEqual({
-        name: 'test_cluster',
-        seeds: ['localhost:9300'],
-        isConnected: true,
-        connectedNodesCount: 1,
-        maxConnectionsPerCluster: 3,
-        initialConnectTimeout: '30s',
-        skipUnavailable: false,
-      });
-    });
-
-    it('should deserialize a cluster object with arbitrary missing properties', () => {
-      expect(
-        deserializeCluster('test_cluster', {
-          seeds: ['localhost:9300'],
-          connected: true,
-          num_nodes_connected: 1,
-          initial_connect_timeout: '30s',
-          transport: {
-            compress: false,
-          },
-        })
-      ).toEqual({
-        name: 'test_cluster',
-        seeds: ['localhost:9300'],
-        isConnected: true,
-        connectedNodesCount: 1,
-        initialConnectTimeout: '30s',
-        transportCompress: false,
-      });
-    });
-  });
-
-  describe('serializeCluster()', () => {
-    it('should throw an error for invalid arguments', () => {
-      expect(() => serializeCluster('foo')).toThrowError();
-    });
-
-    it('should serialize a complete cluster object to only dynamic properties', () => {
-      expect(
-        serializeCluster({
-          name: 'test_cluster',
-          seeds: ['localhost:9300'],
-          isConnected: true,
-          connectedNodesCount: 1,
-          maxConnectionsPerCluster: 3,
-          initialConnectTimeout: '30s',
-          skipUnavailable: false,
-          transportPingSchedule: '-1',
-          transportCompress: false,
-        })
-      ).toEqual({
-        persistent: {
-          cluster: {
-            remote: {
-              test_cluster: {
-                seeds: ['localhost:9300'],
-                skip_unavailable: false,
-              },
-            },
-          },
-        },
-      });
-    });
-
-    it('should serialize a cluster object with missing properties', () => {
-      expect(
-        serializeCluster({
-          name: 'test_cluster',
-          seeds: ['localhost:9300'],
-        })
-      ).toEqual({
-        persistent: {
-          cluster: {
-            remote: {
-              test_cluster: {
-                seeds: ['localhost:9300'],
-                skip_unavailable: null,
-              },
-            },
-          },
-        },
-      });
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/remote_clusters/common/cluster_serialization.ts b/x-pack/legacy/plugins/remote_clusters/common/cluster_serialization.ts
deleted file mode 100644
index 07ea79d42b800..0000000000000
--- a/x-pack/legacy/plugins/remote_clusters/common/cluster_serialization.ts
+++ /dev/null
@@ -1,71 +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.
- */
-
-export function deserializeCluster(name: string, esClusterObject: any): any {
-  if (!name || !esClusterObject || typeof esClusterObject !== 'object') {
-    throw new Error('Unable to deserialize cluster');
-  }
-
-  const {
-    seeds,
-    connected: isConnected,
-    num_nodes_connected: connectedNodesCount,
-    max_connections_per_cluster: maxConnectionsPerCluster,
-    initial_connect_timeout: initialConnectTimeout,
-    skip_unavailable: skipUnavailable,
-    transport,
-  } = esClusterObject;
-
-  let deserializedClusterObject: any = {
-    name,
-    seeds,
-    isConnected,
-    connectedNodesCount,
-    maxConnectionsPerCluster,
-    initialConnectTimeout,
-    skipUnavailable,
-  };
-
-  if (transport) {
-    const { ping_schedule: transportPingSchedule, compress: transportCompress } = transport;
-
-    deserializedClusterObject = {
-      ...deserializedClusterObject,
-      transportPingSchedule,
-      transportCompress,
-    };
-  }
-
-  // It's unnecessary to send undefined values back to the client, so we can remove them.
-  Object.keys(deserializedClusterObject).forEach(key => {
-    if (deserializedClusterObject[key] === undefined) {
-      delete deserializedClusterObject[key];
-    }
-  });
-
-  return deserializedClusterObject;
-}
-
-export function serializeCluster(deserializedClusterObject: any): any {
-  if (!deserializedClusterObject || typeof deserializedClusterObject !== 'object') {
-    throw new Error('Unable to serialize cluster');
-  }
-
-  const { name, seeds, skipUnavailable } = deserializedClusterObject;
-
-  return {
-    persistent: {
-      cluster: {
-        remote: {
-          [name]: {
-            seeds: seeds ? seeds : null,
-            skip_unavailable: skipUnavailable !== undefined ? skipUnavailable : null,
-          },
-        },
-      },
-    },
-  };
-}
diff --git a/x-pack/legacy/plugins/remote_clusters/common/index.ts b/x-pack/legacy/plugins/remote_clusters/common/index.ts
index 8f80b3b7dc6a3..c643f549cbfe1 100644
--- a/x-pack/legacy/plugins/remote_clusters/common/index.ts
+++ b/x-pack/legacy/plugins/remote_clusters/common/index.ts
@@ -4,20 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { i18n } from '@kbn/i18n';
-import { LICENSE_TYPE_BASIC, LicenseType } from '../../../common/constants';
-
 export const PLUGIN = {
   ID: 'remote_clusters',
-  // Remote Clusters are used in both CCS and CCR, and CCS is available for all licenses.
-  MINIMUM_LICENSE_REQUIRED: LICENSE_TYPE_BASIC as LicenseType,
-  getI18nName: (): string => {
-    return i18n.translate('xpack.remoteClusters.appName', {
-      defaultMessage: 'Remote Clusters',
-    });
-  },
 };
-
-export const API_BASE_PATH = '/api/remote_clusters';
-
-export { deserializeCluster, serializeCluster } from './cluster_serialization';
diff --git a/x-pack/legacy/plugins/remote_clusters/index.ts b/x-pack/legacy/plugins/remote_clusters/index.ts
index 5dd823e09eb8b..37b2224f8d7c2 100644
--- a/x-pack/legacy/plugins/remote_clusters/index.ts
+++ b/x-pack/legacy/plugins/remote_clusters/index.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Legacy } from 'kibana';
 import { resolve } from 'path';
 import { PLUGIN } from './common';
 
@@ -13,18 +12,11 @@ export function remoteClusters(kibana: any) {
     id: PLUGIN.ID,
     configPrefix: 'xpack.remote_clusters',
     publicDir: resolve(__dirname, 'public'),
-    // xpack_main is required for license checking.
-    require: ['kibana', 'elasticsearch', 'xpack_main', 'index_management'],
+    require: ['kibana'],
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-      managementSections: ['plugins/remote_clusters'],
-      injectDefaultVars(server: Legacy.Server) {
-        const config = server.config();
-        return {
-          remoteClustersUiEnabled: config.get('xpack.remote_clusters.ui.enabled'),
-        };
-      },
     },
+    // TODO: Remove once CCR has migrated to NP
     config(Joi: any) {
       return Joi.object({
         // display menu item
@@ -41,6 +33,6 @@ export function remoteClusters(kibana: any) {
         config.get('xpack.remote_clusters.enabled') && config.get('xpack.index_management.enabled')
       );
     },
-    init(server: any) {},
+    init() {},
   });
 }
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/connection_status/_index.scss b/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/connection_status/_index.scss
deleted file mode 100644
index c85cb36c5dc5a..0000000000000
--- a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/connection_status/_index.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * 1. Prevent inherited flexbox layout from compressing this element on IE.
- */
- .remoteClustersConnectionStatus__message {
-  flex-basis: auto !important; /* 1 */
-}
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/http.ts b/x-pack/legacy/plugins/remote_clusters/public/app/services/http.ts
deleted file mode 100644
index 54dadf0ae3cb1..0000000000000
--- a/x-pack/legacy/plugins/remote_clusters/public/app/services/http.ts
+++ /dev/null
@@ -1,39 +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.
- */
-
-let _httpClient: any;
-let _prependBasePath: any;
-
-export function init(httpClient: any, prependBasePath: any): void {
-  _httpClient = httpClient;
-  _prependBasePath = prependBasePath;
-}
-
-export function getFullPath(path: string): string {
-  const apiPrefix = _prependBasePath('/api/remote_clusters');
-
-  if (path) {
-    return `${apiPrefix}/${path}`;
-  }
-
-  return apiPrefix;
-}
-
-export function sendPost(path: string, payload: any): any {
-  return _httpClient.post(getFullPath(path), payload);
-}
-
-export function sendGet(path: string): any {
-  return _httpClient.get(getFullPath(path));
-}
-
-export function sendPut(path: string, payload: any): any {
-  return _httpClient.put(getFullPath(path), payload);
-}
-
-export function sendDelete(path: string): any {
-  return _httpClient.delete(getFullPath(path));
-}
diff --git a/x-pack/legacy/plugins/remote_clusters/public/index.html b/x-pack/legacy/plugins/remote_clusters/public/index.html
deleted file mode 100644
index 4de600769fb40..0000000000000
--- a/x-pack/legacy/plugins/remote_clusters/public/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<kbn-management-app section="elasticsearch/remote_clusters">
-  <div id="remoteClustersReactRoot"></div>
-</kbn-management-app>
diff --git a/x-pack/legacy/plugins/remote_clusters/public/index.js b/x-pack/legacy/plugins/remote_clusters/public/index.js
deleted file mode 100644
index 0a08011dd71a0..0000000000000
--- a/x-pack/legacy/plugins/remote_clusters/public/index.js
+++ /dev/null
@@ -1,12 +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 { Plugin as RemoteClustersPlugin } from './plugin';
-import { createShim } from './shim';
-
-const { coreStart, pluginsStart } = createShim();
-const remoteClustersPlugin = new RemoteClustersPlugin();
-remoteClustersPlugin.start(coreStart, pluginsStart);
diff --git a/x-pack/legacy/plugins/remote_clusters/public/index.scss b/x-pack/legacy/plugins/remote_clusters/public/index.scss
index 4618b005312a5..4ae11323642d8 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/index.scss
+++ b/x-pack/legacy/plugins/remote_clusters/public/index.scss
@@ -1,8 +1,7 @@
 // Import the EUI global scope so we can use EUI constants
 @import 'src/legacy/ui/public/styles/_styling_constants';
-@import './app/sections/remote_cluster_list/components/connection_status/index';
 
-// Index management plugin styles
+// Remote clusters plugin styles
 
 // Prefix all styles with "remoteClusters" to avoid conflicts.
 // Examples
@@ -16,8 +15,14 @@
  *    as the 'Reset to defaults' link is added to and removed from the DOM.
  * 2. Fix the positioning.
  */
-
 .remoteClusterSkipIfUnavailableSwitch {
   justify-content: flex-start !important; /* 1 */
   padding-top: $euiSizeS !important;
 }
+
+/**
+ * 1. Prevent inherited flexbox layout from compressing this element on IE.
+ */
+ .remoteClustersConnectionStatus__message {
+  flex-basis: auto !important; /* 1 */
+}
diff --git a/x-pack/legacy/plugins/remote_clusters/public/plugin.js b/x-pack/legacy/plugins/remote_clusters/public/plugin.js
deleted file mode 100644
index 8dbcfb98859cd..0000000000000
--- a/x-pack/legacy/plugins/remote_clusters/public/plugin.js
+++ /dev/null
@@ -1,123 +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 { unmountComponentAtNode } from 'react-dom';
-import { i18n } from '@kbn/i18n';
-import routes from 'ui/routes';
-
-import template from './index.html';
-import { renderReact } from './app';
-import { CRUD_APP_BASE_PATH } from './app/constants';
-import { setUserHasLeftApp, setRedirect } from './app/services';
-import { init as initBreadcrumbs } from './app/services/breadcrumb';
-import { init as initDocumentation } from './app/services/documentation';
-import { init as initHttp } from './app/services/http';
-import { init as initUiMetric } from './app/services/ui_metric';
-import { init as initNotification } from './app/services/notification';
-
-const REACT_ROOT_ID = 'remoteClustersReactRoot';
-
-export class Plugin {
-  start(coreStart, pluginsStart) {
-    const {
-      i18n: { Context },
-      chrome: { setBreadcrumbs },
-      notifications: { toasts },
-      fatalError,
-      http: {
-        basePath: { prepend: prependBasePath },
-      },
-      injectedMetadata: { getInjectedVar },
-      documentation: { elasticWebsiteUrl, docLinkVersion },
-    } = coreStart;
-
-    if (getInjectedVar('remoteClustersUiEnabled')) {
-      const {
-        management: { getSection, breadcrumb: managementBreadcrumb },
-        uiMetric: { createUiStatsReporter },
-      } = pluginsStart;
-
-      const esSection = getSection('elasticsearch');
-      esSection.register('remote_clusters', {
-        visible: true,
-        display: i18n.translate('xpack.remoteClusters.appTitle', {
-          defaultMessage: 'Remote Clusters',
-        }),
-        order: 5,
-        url: `#${CRUD_APP_BASE_PATH}/list`,
-      });
-
-      // Initialize services
-      initBreadcrumbs(setBreadcrumbs, managementBreadcrumb);
-      initDocumentation(`${elasticWebsiteUrl}guide/en/elasticsearch/reference/${docLinkVersion}/`);
-      initUiMetric(createUiStatsReporter);
-      initNotification(toasts, fatalError);
-
-      const unmountReactApp = () => {
-        const appElement = document.getElementById(REACT_ROOT_ID);
-        if (appElement) {
-          unmountComponentAtNode(appElement);
-        }
-      };
-
-      // NOTE: The New Platform will implicitly handle much of this logic by mounting the app at
-      // the base route.
-      routes.when(`${CRUD_APP_BASE_PATH}/:view?/:id?`, {
-        template,
-        controllerAs: 'remoteClusters',
-        controller: class RemoteClustersController {
-          constructor($scope, $route, $http, kbnUrl) {
-            // NOTE: We depend upon Angular's $http service because it's decorated with interceptors,
-            // e.g. to check license status per request.
-            initHttp($http, prependBasePath);
-
-            setRedirect(path => {
-              $scope.$evalAsync(() => {
-                kbnUrl.redirect(path);
-              });
-            });
-
-            // If returning to the app, we'll need to reset this state.
-            setUserHasLeftApp(false);
-
-            // React-router's <Redirect> will cause this controller to re-execute without the $destroy
-            // handler being called. This means the app will re-mount, so we need to unmount it first
-            // here.
-            unmountReactApp();
-
-            $scope.$$postDigest(() => {
-              const appElement = document.getElementById(REACT_ROOT_ID);
-              if (appElement) {
-                renderReact(appElement, Context);
-              }
-
-              const appRoute = $route.current;
-              const stopListeningForLocationChange = $scope.$on('$locationChangeSuccess', () => {
-                const currentRoute = $route.current;
-                const isNavigationInApp =
-                  currentRoute.$$route.template === appRoute.$$route.template;
-
-                // When we navigate within the app, prevent Angular from re-matching the route and
-                // rebuilding the app.
-                if (isNavigationInApp) {
-                  $route.current = appRoute;
-                } else {
-                  // Set internal flag so we can prevent reacting to the route change internally.
-                  setUserHasLeftApp(true);
-                }
-              });
-
-              $scope.$on('$destroy', () => {
-                stopListeningForLocationChange();
-                unmountReactApp();
-              });
-            });
-          }
-        },
-      });
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/remote_clusters/public/shim.ts b/x-pack/legacy/plugins/remote_clusters/public/shim.ts
deleted file mode 100644
index 83975fa4bd0fe..0000000000000
--- a/x-pack/legacy/plugins/remote_clusters/public/shim.ts
+++ /dev/null
@@ -1,42 +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 { npStart } from 'ui/new_platform';
-import { management, MANAGEMENT_BREADCRUMB } from 'ui/management';
-import { fatalError } from 'ui/notify';
-import { DOC_LINK_VERSION, ELASTIC_WEBSITE_URL } from 'ui/documentation_links';
-
-import { createUiStatsReporter } from '../../../../../src/legacy/core_plugins/ui_metric/public';
-
-export function createShim() {
-  const {
-    core: { chrome, i18n, notifications, http, injectedMetadata },
-  } = npStart;
-
-  return {
-    coreStart: {
-      chrome,
-      i18n,
-      notifications,
-      fatalError,
-      injectedMetadata,
-      http,
-      documentation: {
-        elasticWebsiteUrl: ELASTIC_WEBSITE_URL,
-        docLinkVersion: DOC_LINK_VERSION,
-      },
-    },
-    pluginsStart: {
-      management: {
-        getSection: management.getSection.bind(management),
-        breadcrumb: MANAGEMENT_BREADCRUMB,
-      },
-      uiMetric: {
-        createUiStatsReporter,
-      },
-    },
-  };
-}
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
index d33574666cebd..919f0800c291c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
@@ -74,6 +74,12 @@ describe('validateActionTypeSecrets()', () => {
     }).toThrowErrorMatchingInlineSnapshot(
       `"error validating action type secrets: [webhookUrl]: expected value of type [string] but got [number]"`
     );
+
+    expect(() => {
+      validateSecrets(actionType, { webhookUrl: 'fee-fi-fo-fum' });
+    }).toThrowErrorMatchingInlineSnapshot(
+      `"error validating action type secrets: error configuring slack action: unable to parse host name from webhookUrl"`
+    );
   });
 
   test('should validate and pass when the slack webhookUrl is whitelisted', () => {
@@ -95,8 +101,8 @@ describe('validateActionTypeSecrets()', () => {
     actionType = getActionType({
       configurationUtilities: {
         ...configUtilsMock,
-        ensureWhitelistedUri: url => {
-          throw new Error(`target url is not whitelisted`);
+        ensureWhitelistedHostname: url => {
+          throw new Error(`target hostname is not whitelisted`);
         },
       },
     });
@@ -104,7 +110,7 @@ describe('validateActionTypeSecrets()', () => {
     expect(() => {
       validateSecrets(actionType, { webhookUrl: 'https://api.slack.com/' });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"error validating action type secrets: error configuring slack action: target url is not whitelisted"`
+      `"error validating action type secrets: error configuring slack action: target hostname is not whitelisted"`
     );
   });
 });
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
index b8989e59a2257..042853796695d 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { URL } from 'url';
 import { curry } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
@@ -66,8 +67,17 @@ function valdiateActionTypeConfig(
   configurationUtilities: ActionsConfigurationUtilities,
   secretsObject: ActionTypeSecretsType
 ) {
+  let url: URL;
   try {
-    configurationUtilities.ensureWhitelistedUri(secretsObject.webhookUrl);
+    url = new URL(secretsObject.webhookUrl);
+  } catch (err) {
+    return i18n.translate('xpack.actions.builtin.slack.slackConfigurationErrorNoHostname', {
+      defaultMessage: 'error configuring slack action: unable to parse host name from webhookUrl',
+    });
+  }
+
+  try {
+    configurationUtilities.ensureWhitelistedHostname(url.hostname);
   } catch (whitelistError) {
     return i18n.translate('xpack.actions.builtin.slack.slackConfigurationError', {
       defaultMessage: 'error configuring slack action: {message}',
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/constants.js b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/constants.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/constants.js
rename to x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/constants.js
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.js b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.js
rename to x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/http_requests.js
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/index.js b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/index.js
similarity index 96%
rename from x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/index.js
rename to x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/index.js
index 084a370666e45..d70ba2a21e176 100644
--- a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/index.js
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/index.js
@@ -8,7 +8,7 @@ import { setup as remoteClustersAddSetup } from './remote_clusters_add.helpers';
 import { setup as remoteClustersEditSetup } from './remote_clusters_edit.helpers';
 import { setup as remoteClustersListSetup } from './remote_clusters_list.helpers';
 
-export { nextTick, getRandomString, findTestSubject } from '../../../../../../test_utils';
+export { nextTick, getRandomString, findTestSubject } from '../../../../../test_utils';
 
 export { setupEnvironment } from './setup_environment';
 
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_add.helpers.js b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_add.helpers.js
similarity index 66%
rename from x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_add.helpers.js
rename to x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_add.helpers.js
index e573a4ebcef92..dd1d5d2187176 100644
--- a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_add.helpers.js
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_add.helpers.js
@@ -4,10 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { registerTestBed } from '../../../../../../test_utils';
-import { RemoteClusterAdd } from '../../../public/app/sections/remote_cluster_add';
-import { createRemoteClustersStore } from '../../../public/app/store';
-import { registerRouter } from '../../../public/app/services/routing';
+import { registerTestBed } from '../../../../../test_utils';
+
+/* eslint-disable @kbn/eslint/no-restricted-paths */
+import { RemoteClusterAdd } from '../../../public/application/sections/remote_cluster_add';
+import { createRemoteClustersStore } from '../../../public/application/store';
+import { registerRouter } from '../../../public/application/services/routing';
 
 const testBedConfig = {
   store: createRemoteClustersStore,
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_edit.helpers.js b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_edit.helpers.js
similarity index 68%
rename from x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_edit.helpers.js
rename to x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_edit.helpers.js
index 6a90ed6657c78..426aea90e5a99 100644
--- a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_edit.helpers.js
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_edit.helpers.js
@@ -4,10 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { registerTestBed } from '../../../../../../test_utils';
-import { RemoteClusterEdit } from '../../../public/app/sections/remote_cluster_edit';
-import { createRemoteClustersStore } from '../../../public/app/store';
-import { registerRouter } from '../../../public/app/services/routing';
+import { registerTestBed } from '../../../../../test_utils';
+
+/* eslint-disable @kbn/eslint/no-restricted-paths */
+import { RemoteClusterEdit } from '../../../public/application/sections/remote_cluster_edit';
+import { createRemoteClustersStore } from '../../../public/application/store';
+import { registerRouter } from '../../../public/application/services/routing';
 
 import { REMOTE_CLUSTER_EDIT_NAME } from './constants';
 
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_list.helpers.js b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_list.helpers.js
similarity index 88%
rename from x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_list.helpers.js
rename to x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_list.helpers.js
index 0009bd84ffa6a..dc9b22b40542a 100644
--- a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_list.helpers.js
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/remote_clusters_list.helpers.js
@@ -4,10 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { registerTestBed, findTestSubject } from '../../../../../../test_utils';
-import { RemoteClusterList } from '../../../public/app/sections/remote_cluster_list';
-import { createRemoteClustersStore } from '../../../public/app/store';
-import { registerRouter } from '../../../public/app/services/routing';
+import { registerTestBed, findTestSubject } from '../../../../../test_utils';
+
+/* eslint-disable @kbn/eslint/no-restricted-paths */
+import { RemoteClusterList } from '../../../public/application/sections/remote_cluster_list';
+import { createRemoteClustersStore } from '../../../public/application/store';
+import { registerRouter } from '../../../public/application/services/routing';
 
 const testBedConfig = {
   store: createRemoteClustersStore,
diff --git a/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.js b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.js
new file mode 100644
index 0000000000000..c912a4ddabc9d
--- /dev/null
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/helpers/setup_environment.js
@@ -0,0 +1,48 @@
+/*
+ * 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 {
+  notificationServiceMock,
+  fatalErrorsServiceMock,
+  docLinksServiceMock,
+  injectedMetadataServiceMock,
+} from '../../../../../../src/core/public/mocks';
+
+import { usageCollectionPluginMock } from '../../../../../../src/plugins/usage_collection/public/mocks';
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { HttpService } from '../../../../../../src/core/public/http';
+
+/* eslint-disable @kbn/eslint/no-restricted-paths */
+import { init as initBreadcrumb } from '../../../public/application/services/breadcrumb';
+import { init as initHttp } from '../../../public/application/services/http';
+import { init as initNotification } from '../../../public/application/services/notification';
+import { init as initUiMetric } from '../../../public/application/services/ui_metric';
+import { init as initDocumentation } from '../../../public/application/services/documentation';
+import { init as initHttpRequests } from './http_requests';
+
+export const setupEnvironment = () => {
+  const httpServiceSetupMock = new HttpService().setup({
+    injectedMetadata: injectedMetadataServiceMock.createSetupContract(),
+    fatalErrors: fatalErrorsServiceMock.createSetupContract(),
+  });
+
+  initBreadcrumb(() => {});
+  initDocumentation(docLinksServiceMock.createStartContract());
+  initUiMetric(usageCollectionPluginMock.createSetupContract());
+  initNotification(
+    notificationServiceMock.createSetupContract().toasts,
+    fatalErrorsServiceMock.createSetupContract()
+  );
+  initHttp(httpServiceSetupMock);
+
+  const { server, httpRequestsMockHelpers } = initHttpRequests();
+
+  return {
+    server,
+    httpRequestsMockHelpers,
+  };
+};
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_add.test.js b/x-pack/plugins/remote_clusters/__jest__/client_integration/remote_clusters_add.test.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_add.test.js
rename to x-pack/plugins/remote_clusters/__jest__/client_integration/remote_clusters_add.test.js
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_edit.test.js b/x-pack/plugins/remote_clusters/__jest__/client_integration/remote_clusters_edit.test.js
similarity index 93%
rename from x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_edit.test.js
rename to x-pack/plugins/remote_clusters/__jest__/client_integration/remote_clusters_edit.test.js
index 95dc65a96e30a..cab91854a5114 100644
--- a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_edit.test.js
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/remote_clusters_edit.test.js
@@ -5,7 +5,7 @@
  */
 
 jest.mock('ui/new_platform');
-import { RemoteClusterForm } from '../../public/app/sections/components/remote_cluster_form';
+import { RemoteClusterForm } from '../../public/application/sections/components/remote_cluster_form';
 import { pageHelpers, setupEnvironment, nextTick } from './helpers';
 import { REMOTE_CLUSTER_EDIT, REMOTE_CLUSTER_EDIT_NAME } from './helpers/constants';
 
@@ -31,7 +31,7 @@ describe('Edit Remote cluster', () => {
     httpRequestsMockHelpers.setLoadRemoteClustersResponse([REMOTE_CLUSTER_EDIT]);
 
     ({ component, find, exists } = setup());
-    await nextTick();
+    await nextTick(100); // We need to wait next tick for the mock server response to kick in
     component.update();
   });
 
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_list.test.js b/x-pack/plugins/remote_clusters/__jest__/client_integration/remote_clusters_list.test.js
similarity index 96%
rename from x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_list.test.js
rename to x-pack/plugins/remote_clusters/__jest__/client_integration/remote_clusters_list.test.js
index 699c00e450a1f..1b7c600218cee 100644
--- a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_list.test.js
+++ b/x-pack/plugins/remote_clusters/__jest__/client_integration/remote_clusters_list.test.js
@@ -12,7 +12,7 @@ import {
   findTestSubject,
 } from './helpers';
 
-import { getRouter } from '../../public/app/services';
+import { getRouter } from '../../public/application/services';
 import { getRemoteClusterMock } from '../../fixtures/remote_cluster';
 
 jest.mock('ui/new_platform');
@@ -39,11 +39,11 @@ describe('<RemoteClusterList />', () => {
   describe('on component mount', () => {
     let exists;
 
-    beforeEach(async () => {
+    beforeEach(() => {
       ({ exists } = setup());
     });
 
-    test('should show a "loading remote clusters" indicator', async () => {
+    test('should show a "loading remote clusters" indicator', () => {
       expect(exists('remoteClustersTableLoading')).toBe(true);
     });
   });
@@ -55,7 +55,7 @@ describe('<RemoteClusterList />', () => {
     beforeEach(async () => {
       ({ exists, component } = setup());
 
-      await nextTick(); // We need to wait next tick for the mock server response to kick in
+      await nextTick(100); // We need to wait next tick for the mock server response to kick in
       component.update();
     });
 
@@ -97,7 +97,7 @@ describe('<RemoteClusterList />', () => {
       // Mount the component
       ({ component, find, exists, table, actions } = setup());
 
-      await nextTick(); // Make sure that the Http request is fulfilled
+      await nextTick(100); // Make sure that the Http request is fulfilled
       component.update();
 
       // Read the remote clusters list table
@@ -206,7 +206,7 @@ describe('<RemoteClusterList />', () => {
         actions.clickBulkDeleteButton();
         actions.clickConfirmModalDeleteRemoteCluster();
 
-        await nextTick(550); // there is a 500ms timeout in the api action
+        await nextTick(600); // there is a 500ms timeout in the api action
         component.update();
 
         ({ rows } = table.getMetaData('remoteClusterListTable'));
diff --git a/x-pack/legacy/plugins/remote_clusters/fixtures/remote_cluster.js b/x-pack/plugins/remote_clusters/fixtures/remote_cluster.js
similarity index 91%
rename from x-pack/legacy/plugins/remote_clusters/fixtures/remote_cluster.js
rename to x-pack/plugins/remote_clusters/fixtures/remote_cluster.js
index 248e2b8232cad..e3e087548cf00 100644
--- a/x-pack/legacy/plugins/remote_clusters/fixtures/remote_cluster.js
+++ b/x-pack/plugins/remote_clusters/fixtures/remote_cluster.js
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { getRandomString } from '../../../../test_utils';
+import { getRandomString } from '../../../test_utils';
 
 export const getRemoteClusterMock = ({
   name = getRandomString(),
diff --git a/x-pack/plugins/remote_clusters/kibana.json b/x-pack/plugins/remote_clusters/kibana.json
index de1e3d1e26865..27ae6802966dd 100644
--- a/x-pack/plugins/remote_clusters/kibana.json
+++ b/x-pack/plugins/remote_clusters/kibana.json
@@ -1,9 +1,17 @@
 {
   "id": "remote_clusters",
   "version": "kibana",
+  "configPath": [
+    "xpack",
+    "remote_clusters"
+  ],
   "requiredPlugins": [
-    "licensing"
+    "licensing",
+    "management"
+  ],
+  "optionalPlugins": [
+    "usageCollection"
   ],
   "server": true,
-  "ui": false
+  "ui": true
 }
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/app.js b/x-pack/plugins/remote_clusters/public/application/app.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/app.js
rename to x-pack/plugins/remote_clusters/public/application/app.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/constants/index.ts b/x-pack/plugins/remote_clusters/public/application/constants/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/constants/index.ts
rename to x-pack/plugins/remote_clusters/public/application/constants/index.ts
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/constants/paths.ts b/x-pack/plugins/remote_clusters/public/application/constants/paths.ts
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/constants/paths.ts
rename to x-pack/plugins/remote_clusters/public/application/constants/paths.ts
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/constants/ui_metric.ts b/x-pack/plugins/remote_clusters/public/application/constants/ui_metric.ts
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/constants/ui_metric.ts
rename to x-pack/plugins/remote_clusters/public/application/constants/ui_metric.ts
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/redirect.js b/x-pack/plugins/remote_clusters/public/application/index.d.ts
similarity index 50%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/redirect.js
rename to x-pack/plugins/remote_clusters/public/application/index.d.ts
index ec77c2a2bfe99..b5c5ad5522134 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/services/redirect.js
+++ b/x-pack/plugins/remote_clusters/public/application/index.d.ts
@@ -4,14 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// This depends upon Angular, which is why we use this provider pattern to access it within
-// our React app.
-let _redirect;
+import { RegisterManagementAppArgs, I18nStart } from '../types';
 
-export function setRedirect(redirect) {
-  _redirect = redirect;
-}
-
-export function redirect(path) {
-  _redirect(path);
-}
+export declare const renderApp: (
+  elem: HTMLElement | null,
+  I18nContext: I18nStart['Context']
+) => ReturnType<RegisterManagementAppArgs['mount']>;
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/index.js b/x-pack/plugins/remote_clusters/public/application/index.js
similarity index 80%
rename from x-pack/legacy/plugins/remote_clusters/public/app/index.js
rename to x-pack/plugins/remote_clusters/public/application/index.js
index 2de59f4590553..0b8b26ace5daa 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/index.js
+++ b/x-pack/plugins/remote_clusters/public/application/index.js
@@ -5,14 +5,14 @@
  */
 
 import React from 'react';
-import { render } from 'react-dom';
+import { render, unmountComponentAtNode } from 'react-dom';
 import { HashRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 
 import { App } from './app';
 import { remoteClustersStore } from './store';
 
-export const renderReact = async (elem, I18nContext) => {
+export const renderApp = (elem, I18nContext) => {
   render(
     <I18nContext>
       <Provider store={remoteClustersStore}>
@@ -23,4 +23,5 @@ export const renderReact = async (elem, I18nContext) => {
     </I18nContext>,
     elem
   );
+  return () => unmountComponentAtNode(elem);
 };
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/configured_by_node_warning/configured_by_node_warning.js b/x-pack/plugins/remote_clusters/public/application/sections/components/configured_by_node_warning/configured_by_node_warning.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/configured_by_node_warning/configured_by_node_warning.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/configured_by_node_warning/configured_by_node_warning.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/configured_by_node_warning/index.js b/x-pack/plugins/remote_clusters/public/application/sections/components/configured_by_node_warning/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/configured_by_node_warning/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/configured_by_node_warning/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/index.js b/x-pack/plugins/remote_clusters/public/application/sections/components/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/index.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/remote_cluster_form.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
similarity index 99%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/remote_cluster_form.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
index f070bb218be42..08cd01496a8b9 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/remote_cluster_form.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
@@ -491,7 +491,7 @@ export class RemoteClusterForm extends Component {
 
       let errorBody;
 
-      if (cause) {
+      if (cause && Array.isArray(cause)) {
         if (cause.length === 1) {
           errorBody = <p>{cause[0]}</p>;
         } else {
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/remote_cluster_form.test.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.test.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/remote_cluster_form.test.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.test.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/request_flyout.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/request_flyout.js
similarity index 97%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/request_flyout.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/request_flyout.js
index deec26129abe5..70e2267001e3c 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/request_flyout.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/request_flyout.js
@@ -26,7 +26,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { serializeCluster } from '../../../../../common';
+import { serializeCluster } from '../../../../../common/constants';
 
 export class RequestFlyout extends PureComponent {
   static propTypes = {
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/__snapshots__/validate_name.test.js.snap b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_name.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/__snapshots__/validate_name.test.js.snap
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_name.test.js.snap
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/__snapshots__/validate_seeds.test.js.snap b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_seeds.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/__snapshots__/validate_seeds.test.js.snap
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/__snapshots__/validate_seeds.test.js.snap
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/index.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_name.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_name.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_name.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_name.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_name.test.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_name.test.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_name.test.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_name.test.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_seed.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seed.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_seed.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seed.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_seed.test.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seed.test.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_seed.test.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seed.test.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_seeds.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seeds.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_seeds.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seeds.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_seeds.test.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seeds.test.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/validators/validate_seeds.test.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_seeds.test.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_page_title/index.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_page_title/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_page_title/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_page_title/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_page_title/remote_cluster_page_title.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_page_title/remote_cluster_page_title.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_page_title/remote_cluster_page_title.js
rename to x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_page_title/remote_cluster_page_title.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/index.js b/x-pack/plugins/remote_clusters/public/application/sections/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_add/index.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_add/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_add/remote_cluster_add.container.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/remote_cluster_add.container.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_add/remote_cluster_add.container.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/remote_cluster_add.container.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_add/remote_cluster_add.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/remote_cluster_add.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_add/remote_cluster_add.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/remote_cluster_add.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_edit/index.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_edit/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_edit/remote_cluster_edit.container.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.container.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_edit/remote_cluster_edit.container.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.container.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_edit/remote_cluster_edit.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_edit/remote_cluster_edit.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/connection_status/connection_status.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/connection_status/connection_status.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/connection_status/connection_status.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/connection_status/connection_status.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/connection_status/index.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/connection_status/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/connection_status/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/connection_status/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/index.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/remove_cluster_button_provider/index.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/remove_cluster_button_provider/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/remove_cluster_button_provider/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/remove_cluster_button_provider/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/remove_cluster_button_provider/remove_cluster_button_provider.container.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/remove_cluster_button_provider/remove_cluster_button_provider.container.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/remove_cluster_button_provider/remove_cluster_button_provider.container.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/remove_cluster_button_provider/remove_cluster_button_provider.container.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/remove_cluster_button_provider/remove_cluster_button_provider.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/remove_cluster_button_provider/remove_cluster_button_provider.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/components/remove_cluster_button_provider/remove_cluster_button_provider.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/components/remove_cluster_button_provider/remove_cluster_button_provider.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/detail_panel/detail_panel.container.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.container.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/detail_panel/detail_panel.container.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.container.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/detail_panel/detail_panel.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/detail_panel/detail_panel.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/detail_panel/index.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/detail_panel/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/index.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/remote_cluster_list.container.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.container.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/remote_cluster_list.container.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.container.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/remote_cluster_list.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js
similarity index 98%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/remote_cluster_list.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js
index dea6bc7627cc1..207aa8045c011 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/remote_cluster_list.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_list.js
@@ -145,9 +145,9 @@ export class RemoteClusterList extends Component {
   }
 
   renderError(error) {
-    // We can safely depend upon the shape of this error coming from Angular $http, because we
+    // We can safely depend upon the shape of this error coming from http service, because we
     // handle unexpected error shapes in the API action.
-    const { statusCode, error: errorString } = error.data;
+    const { statusCode, error: errorString } = error.body;
 
     const title = i18n.translate('xpack.remoteClusters.remoteClusterList.loadingErrorTitle', {
       defaultMessage: 'Error loading remote clusters',
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/remote_cluster_table/index.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/remote_cluster_table/index.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.container.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.container.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.container.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.container.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
rename to x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/api.js b/x-pack/plugins/remote_clusters/public/application/services/api.js
similarity index 93%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/api.js
rename to x-pack/plugins/remote_clusters/public/application/services/api.js
index 8631bc5af12a8..72d5e3f9c3f9e 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/services/api.js
+++ b/x-pack/plugins/remote_clusters/public/application/services/api.js
@@ -9,19 +9,19 @@ import { trackUserRequest } from './ui_metric';
 import { sendGet, sendPost, sendPut, sendDelete } from './http';
 
 export async function loadClusters() {
-  const response = await sendGet();
-  return response.data;
+  return await sendGet();
 }
 
 export async function addCluster(cluster) {
   const request = sendPost('', cluster);
+
   return await trackUserRequest(request, UIM_CLUSTER_ADD);
 }
 
 export async function editCluster(cluster) {
   const { name, ...rest } = cluster;
-
   const request = sendPut(name, rest);
+
   return await trackUserRequest(request, UIM_CLUSTER_UPDATE);
 }
 
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/api_errors.js b/x-pack/plugins/remote_clusters/public/application/services/api_errors.js
similarity index 77%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/api_errors.js
rename to x-pack/plugins/remote_clusters/public/application/services/api_errors.js
index c50ad92532071..8376f37f36f49 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/services/api_errors.js
+++ b/x-pack/plugins/remote_clusters/public/application/services/api_errors.js
@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { fatalError, toasts } from './notification';
+import { toasts, fatalError } from './notification';
 
 function createToastConfig(error, errorTitle) {
-  // Expect an error in the shape provided by Angular's $http service.
-  if (error && error.data) {
-    const { error: errorString, statusCode, message } = error.data;
+  // Expect an error in the shape provided by http service.
+  if (error && error.body) {
+    const { error: errorString, statusCode, message } = error.body;
     return {
       title: errorTitle,
       text: `${statusCode}: ${errorString}. ${message}`,
@@ -26,7 +26,7 @@ export function showApiWarning(error, errorTitle) {
 
   // This error isn't an HTTP error, so let the fatal error screen tell the user something
   // unexpected happened.
-  return fatalError(error, errorTitle);
+  return fatalError.add(error, errorTitle);
 }
 
 export function showApiError(error, errorTitle) {
@@ -38,5 +38,5 @@ export function showApiError(error, errorTitle) {
 
   // This error isn't an HTTP error, so let the fatal error screen tell the user something
   // unexpected happened.
-  fatalError(error, errorTitle);
+  fatalError.add(error, errorTitle);
 }
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/breadcrumb.ts b/x-pack/plugins/remote_clusters/public/application/services/breadcrumb.ts
similarity index 68%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/breadcrumb.ts
rename to x-pack/plugins/remote_clusters/public/application/services/breadcrumb.ts
index 68d34cc2a17d4..f90a0d3456166 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/services/breadcrumb.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/breadcrumb.ts
@@ -8,13 +8,22 @@ import { i18n } from '@kbn/i18n';
 
 import { CRUD_APP_BASE_PATH } from '../constants';
 
-let _setBreadcrumbs: any;
-let _breadcrumbs: any;
+interface Breadcrumb {
+  text: string;
+  href?: string;
+}
+interface Breadcrumbs {
+  home: Breadcrumb;
+  add: Breadcrumb;
+  edit: Breadcrumb;
+}
+
+let _setBreadcrumbs: (breadcrumbs: Breadcrumb[]) => void;
+let _breadcrumbs: Breadcrumbs;
 
-export function init(setGlobalBreadcrumbs: any, managementBreadcrumb: any): void {
+export function init(setGlobalBreadcrumbs: (breadcrumbs: Breadcrumb[]) => void): void {
   _setBreadcrumbs = setGlobalBreadcrumbs;
   _breadcrumbs = {
-    management: managementBreadcrumb,
     home: {
       text: i18n.translate('xpack.remoteClusters.listBreadcrumbTitle', {
         defaultMessage: 'Remote Clusters',
@@ -34,13 +43,13 @@ export function init(setGlobalBreadcrumbs: any, managementBreadcrumb: any): void
   };
 }
 
-export function setBreadcrumbs(type: string, queryParams?: string): void {
+export function setBreadcrumbs(type: 'home' | 'add' | 'edit', queryParams?: string): void {
   if (!_breadcrumbs[type]) {
     return;
   }
 
   if (type === 'home') {
-    _setBreadcrumbs([_breadcrumbs.management, _breadcrumbs.home]);
+    _setBreadcrumbs([_breadcrumbs.home]);
   } else {
     // Support deep-linking back to a remote cluster in the detail panel.
     const homeBreadcrumb = {
@@ -48,6 +57,6 @@ export function setBreadcrumbs(type: string, queryParams?: string): void {
       href: `${_breadcrumbs.home.href}${queryParams}`,
     };
 
-    _setBreadcrumbs([_breadcrumbs.management, homeBreadcrumb, _breadcrumbs[type]]);
+    _setBreadcrumbs([homeBreadcrumb, _breadcrumbs[type]]);
   }
 }
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/documentation.ts b/x-pack/plugins/remote_clusters/public/application/services/documentation.ts
similarity index 70%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/documentation.ts
rename to x-pack/plugins/remote_clusters/public/application/services/documentation.ts
index 4d04aa6fad74d..38cf2223a313b 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/services/documentation.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/documentation.ts
@@ -4,11 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { DocLinksStart } from 'kibana/public';
+
 export let skippingDisconnectedClustersUrl: string;
 export let remoteClustersUrl: string;
 export let transportPortUrl: string;
 
-export function init(esDocBasePath: string): void {
+export function init(docLinks: DocLinksStart): void {
+  const { DOC_LINK_VERSION, ELASTIC_WEBSITE_URL } = docLinks;
+  const esDocBasePath = `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}`;
+
   skippingDisconnectedClustersUrl = `${esDocBasePath}/modules-cross-cluster-search.html#_skipping_disconnected_clusters`;
   remoteClustersUrl = `${esDocBasePath}/modules-remote-clusters.html`;
   transportPortUrl = `${esDocBasePath}/modules-transport.html`;
diff --git a/x-pack/plugins/remote_clusters/public/application/services/http.ts b/x-pack/plugins/remote_clusters/public/application/services/http.ts
new file mode 100644
index 0000000000000..b49e95f3a5c65
--- /dev/null
+++ b/x-pack/plugins/remote_clusters/public/application/services/http.ts
@@ -0,0 +1,55 @@
+/*
+ * 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 { HttpSetup, HttpResponse } from 'kibana/public';
+import { API_BASE_PATH } from '../../../common/constants';
+
+let _httpClient: HttpSetup;
+
+export function init(httpClient: HttpSetup): void {
+  _httpClient = httpClient;
+}
+
+export function getFullPath(path: string): string {
+  if (path) {
+    return `${API_BASE_PATH}/${path}`;
+  }
+
+  return API_BASE_PATH;
+}
+
+export function sendPost(
+  path: string,
+  payload: {
+    name: string;
+    seeds: string[];
+    skipUnavailable: boolean;
+  }
+): Promise<HttpResponse> {
+  return _httpClient.post(getFullPath(path), {
+    body: JSON.stringify(payload),
+  });
+}
+
+export function sendGet(path: string): Promise<HttpResponse> {
+  return _httpClient.get(getFullPath(path));
+}
+
+export function sendPut(
+  path: string,
+  payload: {
+    seeds: string[];
+    skipUnavailable: boolean;
+  }
+): Promise<HttpResponse> {
+  return _httpClient.put(getFullPath(path), {
+    body: JSON.stringify(payload),
+  });
+}
+
+export function sendDelete(path: string): Promise<HttpResponse> {
+  return _httpClient.delete(getFullPath(path));
+}
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/index.js b/x-pack/plugins/remote_clusters/public/application/services/index.js
similarity index 93%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/index.js
rename to x-pack/plugins/remote_clusters/public/application/services/index.js
index 69679e55dfef5..031770d9500ed 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/services/index.js
+++ b/x-pack/plugins/remote_clusters/public/application/services/index.js
@@ -8,7 +8,7 @@ export { loadClusters, addCluster, editCluster, removeClusterRequest } from './a
 
 export { showApiError, showApiWarning } from './api_errors';
 
-export { setRedirect, redirect } from './redirect';
+export { initRedirect, redirect } from './redirect';
 
 export { isSeedNodeValid, isSeedNodePortValid } from './validate_seed_node';
 
diff --git a/x-pack/plugins/remote_clusters/public/application/services/notification.ts b/x-pack/plugins/remote_clusters/public/application/services/notification.ts
new file mode 100644
index 0000000000000..1c9173e519b48
--- /dev/null
+++ b/x-pack/plugins/remote_clusters/public/application/services/notification.ts
@@ -0,0 +1,15 @@
+/*
+ * 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 { NotificationsSetup, FatalErrorsSetup } from 'src/core/public';
+
+export let toasts: NotificationsSetup['toasts'];
+export let fatalError: FatalErrorsSetup;
+
+export function init(_toasts: NotificationsSetup['toasts'], _fatalError: FatalErrorsSetup): void {
+  toasts = _toasts;
+  fatalError = _fatalError;
+}
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/query_params.js b/x-pack/plugins/remote_clusters/public/application/services/query_params.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/query_params.js
rename to x-pack/plugins/remote_clusters/public/application/services/query_params.js
diff --git a/x-pack/plugins/remote_clusters/public/application/services/redirect.ts b/x-pack/plugins/remote_clusters/public/application/services/redirect.ts
new file mode 100644
index 0000000000000..00a97fa74c5ce
--- /dev/null
+++ b/x-pack/plugins/remote_clusters/public/application/services/redirect.ts
@@ -0,0 +1,17 @@
+/*
+ * 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 { CoreStart } from 'kibana/public';
+
+let navigateToApp: CoreStart['application']['navigateToApp'];
+
+export function init(_navigateToApp: CoreStart['application']['navigateToApp']) {
+  navigateToApp = _navigateToApp;
+}
+
+export function redirect(path: string) {
+  navigateToApp('kibana', { path: `#${path}` });
+}
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/routing.js b/x-pack/plugins/remote_clusters/public/application/services/routing.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/routing.js
rename to x-pack/plugins/remote_clusters/public/application/services/routing.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/ui_metric.ts b/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
similarity index 62%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/ui_metric.ts
rename to x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
index 36a23476c1873..91354155cacb0 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/services/ui_metric.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
@@ -4,17 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { UiStatsMetricType } from '@kbn/analytics';
 import { UIM_APP_NAME } from '../constants';
-import {
-  createUiStatsReporter,
-  METRIC_TYPE,
-} from '../../../../../../../src/legacy/core_plugins/ui_metric/public';
 
-export let trackUiMetric: ReturnType<typeof createUiStatsReporter>;
-export { METRIC_TYPE };
+export let trackUiMetric: (metricType: UiStatsMetricType, eventName: string) => void;
+export let METRIC_TYPE: UsageCollectionSetup['METRIC_TYPE'];
 
-export function init(getReporter: typeof createUiStatsReporter): void {
-  trackUiMetric = getReporter(UIM_APP_NAME);
+export function init(usageCollection: UsageCollectionSetup): void {
+  trackUiMetric = usageCollection.reportUiStats.bind(usageCollection, UIM_APP_NAME);
+  METRIC_TYPE = usageCollection.METRIC_TYPE;
 }
 
 /**
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/validate_seed_node.js b/x-pack/plugins/remote_clusters/public/application/services/validate_seed_node.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/validate_seed_node.js
rename to x-pack/plugins/remote_clusters/public/application/services/validate_seed_node.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/validate_seed_node.test.js b/x-pack/plugins/remote_clusters/public/application/services/validate_seed_node.test.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/validate_seed_node.test.js
rename to x-pack/plugins/remote_clusters/public/application/services/validate_seed_node.test.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/action_types.js b/x-pack/plugins/remote_clusters/public/application/store/action_types.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/action_types.js
rename to x-pack/plugins/remote_clusters/public/application/store/action_types.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/add_cluster.js b/x-pack/plugins/remote_clusters/public/application/store/actions/add_cluster.js
similarity index 88%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/actions/add_cluster.js
rename to x-pack/plugins/remote_clusters/public/application/store/actions/add_cluster.js
index 726bc56b08f12..0b7838f48b137 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/add_cluster.js
+++ b/x-pack/plugins/remote_clusters/public/application/store/actions/add_cluster.js
@@ -35,12 +35,12 @@ export const addCluster = cluster => async dispatch => {
     ]);
   } catch (error) {
     if (error) {
-      const { statusCode, data } = error;
+      const { body } = error;
 
-      // Expect an error in the shape provided by Angular's $http service.
-      if (data) {
-        // Some errors have statusCode directly available but some are under a data property.
-        if ((statusCode || (data && data.statusCode)) === 409) {
+      // Expect an error in the shape provided by http service.
+      if (body) {
+        const { statusCode, message } = body;
+        if (statusCode && statusCode === 409) {
           return dispatch({
             type: ADD_CLUSTER_FAILURE,
             payload: {
@@ -63,9 +63,8 @@ export const addCluster = cluster => async dispatch => {
             error: {
               message: i18n.translate('xpack.remoteClusters.addAction.failedDefaultErrorMessage', {
                 defaultMessage: 'Request failed with a {statusCode} error. {message}',
-                values: { statusCode, message: data.message },
+                values: { statusCode, message },
               }),
-              cause: data.cause,
             },
           },
         });
@@ -74,7 +73,7 @@ export const addCluster = cluster => async dispatch => {
 
     // This error isn't an HTTP error, so let the fatal error screen tell the user something
     // unexpected happened.
-    return fatalError(
+    return fatalError.add(
       error,
       i18n.translate('xpack.remoteClusters.addAction.errorTitle', {
         defaultMessage: 'Error adding cluster',
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/detail_panel.js b/x-pack/plugins/remote_clusters/public/application/store/actions/detail_panel.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/actions/detail_panel.js
rename to x-pack/plugins/remote_clusters/public/application/store/actions/detail_panel.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/edit_cluster.js b/x-pack/plugins/remote_clusters/public/application/store/actions/edit_cluster.js
similarity index 90%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/actions/edit_cluster.js
rename to x-pack/plugins/remote_clusters/public/application/store/actions/edit_cluster.js
index 3ed481aa0f8ea..062704472521e 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/edit_cluster.js
+++ b/x-pack/plugins/remote_clusters/public/application/store/actions/edit_cluster.js
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { fatalError, toasts } from '../../services/notification';
+import { toasts, fatalError } from '../../services/notification';
 import { CRUD_APP_BASE_PATH } from '../../constants';
 import { loadClusters } from './load_clusters';
 
@@ -39,19 +39,19 @@ export const editCluster = cluster => async dispatch => {
     ]);
   } catch (error) {
     if (error) {
-      const { statusCode, data } = error;
+      const { body } = error;
 
-      // Expect an error in the shape provided by Angular's $http service.
-      if (data) {
+      // Expect an error in the shape provided by http service.
+      if (body) {
+        const { statusCode, message } = body;
         return dispatch({
           type: EDIT_CLUSTER_FAILURE,
           payload: {
             error: {
               message: i18n.translate('xpack.remoteClusters.editAction.failedDefaultErrorMessage', {
                 defaultMessage: 'Request failed with a {statusCode} error. {message}',
-                values: { statusCode, message: data.message },
+                values: { statusCode, message },
               }),
-              cause: data.cause,
             },
           },
         });
@@ -60,7 +60,7 @@ export const editCluster = cluster => async dispatch => {
 
     // This error isn't an HTTP error, so let the fatal error screen tell the user something
     // unexpected happened.
-    return fatalError(
+    return fatalError.add(
       error,
       i18n.translate('xpack.remoteClusters.editAction.errorTitle', {
         defaultMessage: 'Error editing cluster',
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/index.js b/x-pack/plugins/remote_clusters/public/application/store/actions/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/actions/index.js
rename to x-pack/plugins/remote_clusters/public/application/store/actions/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/load_clusters.js b/x-pack/plugins/remote_clusters/public/application/store/actions/load_clusters.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/actions/load_clusters.js
rename to x-pack/plugins/remote_clusters/public/application/store/actions/load_clusters.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/refresh_clusters.js b/x-pack/plugins/remote_clusters/public/application/store/actions/refresh_clusters.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/actions/refresh_clusters.js
rename to x-pack/plugins/remote_clusters/public/application/store/actions/refresh_clusters.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/remove_clusters.js b/x-pack/plugins/remote_clusters/public/application/store/actions/remove_clusters.js
similarity index 95%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/actions/remove_clusters.js
rename to x-pack/plugins/remote_clusters/public/application/store/actions/remove_clusters.js
index 4086a91e29021..8e22eac8b292b 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/store/actions/remove_clusters.js
+++ b/x-pack/plugins/remote_clusters/public/application/store/actions/remove_clusters.js
@@ -30,7 +30,7 @@ function getErrorTitle(count, name = null) {
     }
   } else {
     return i18n.translate('xpack.remoteClusters.removeAction.errorMultipleNotificationTitle', {
-      defaultMessage: `Error removing '{count}' remote clusters`,
+      defaultMessage: `Error removing {count} remote clusters`,
       values: { count },
     });
   }
@@ -46,7 +46,7 @@ export const removeClusters = names => async (dispatch, getState) => {
 
   await Promise.all([
     sendRemoveClusterRequest(names.join(',')).then(response => {
-      ({ itemsDeleted, errors } = response.data);
+      ({ itemsDeleted, errors } = response);
     }),
     // Wait at least half a second to avoid a weird flicker of the saving feedback (only visible
     // when requests resolve very quickly).
@@ -55,7 +55,7 @@ export const removeClusters = names => async (dispatch, getState) => {
     const errorTitle = getErrorTitle(names.length, names[0]);
     toasts.addDanger({
       title: errorTitle,
-      text: error.data.message,
+      text: error.body?.message,
     });
   });
 
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/index.js b/x-pack/plugins/remote_clusters/public/application/store/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/index.js
rename to x-pack/plugins/remote_clusters/public/application/store/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/middleware/detail_panel.js b/x-pack/plugins/remote_clusters/public/application/store/middleware/detail_panel.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/middleware/detail_panel.js
rename to x-pack/plugins/remote_clusters/public/application/store/middleware/detail_panel.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/middleware/index.js b/x-pack/plugins/remote_clusters/public/application/store/middleware/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/middleware/index.js
rename to x-pack/plugins/remote_clusters/public/application/store/middleware/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/add_cluster.js b/x-pack/plugins/remote_clusters/public/application/store/reducers/add_cluster.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/add_cluster.js
rename to x-pack/plugins/remote_clusters/public/application/store/reducers/add_cluster.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/clusters.js b/x-pack/plugins/remote_clusters/public/application/store/reducers/clusters.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/clusters.js
rename to x-pack/plugins/remote_clusters/public/application/store/reducers/clusters.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/detail_panel.js b/x-pack/plugins/remote_clusters/public/application/store/reducers/detail_panel.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/detail_panel.js
rename to x-pack/plugins/remote_clusters/public/application/store/reducers/detail_panel.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/edit_cluster.js b/x-pack/plugins/remote_clusters/public/application/store/reducers/edit_cluster.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/edit_cluster.js
rename to x-pack/plugins/remote_clusters/public/application/store/reducers/edit_cluster.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/index.js b/x-pack/plugins/remote_clusters/public/application/store/reducers/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/index.js
rename to x-pack/plugins/remote_clusters/public/application/store/reducers/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/remove_cluster.js b/x-pack/plugins/remote_clusters/public/application/store/reducers/remove_cluster.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/reducers/remove_cluster.js
rename to x-pack/plugins/remote_clusters/public/application/store/reducers/remove_cluster.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/selectors/index.js b/x-pack/plugins/remote_clusters/public/application/store/selectors/index.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/selectors/index.js
rename to x-pack/plugins/remote_clusters/public/application/store/selectors/index.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/store/store.js b/x-pack/plugins/remote_clusters/public/application/store/store.js
similarity index 100%
rename from x-pack/legacy/plugins/remote_clusters/public/app/store/store.js
rename to x-pack/plugins/remote_clusters/public/application/store/store.js
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/services/notification.ts b/x-pack/plugins/remote_clusters/public/index.ts
similarity index 59%
rename from x-pack/legacy/plugins/remote_clusters/public/app/services/notification.ts
rename to x-pack/plugins/remote_clusters/public/index.ts
index 1ac329253cddb..dbe22b71b48df 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/services/notification.ts
+++ b/x-pack/plugins/remote_clusters/public/index.ts
@@ -3,11 +3,6 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { RemoteClustersUIPlugin } from './plugin';
 
-export let toasts: any;
-export let fatalError: any;
-
-export function init(_toasts: any, _fatalError: any): void {
-  toasts = _toasts;
-  fatalError = _fatalError;
-}
+export const plugin = () => new RemoteClustersUIPlugin();
diff --git a/x-pack/plugins/remote_clusters/public/plugin.ts b/x-pack/plugins/remote_clusters/public/plugin.ts
new file mode 100644
index 0000000000000..5b84fa1fde369
--- /dev/null
+++ b/x-pack/plugins/remote_clusters/public/plugin.ts
@@ -0,0 +1,55 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+import { CoreSetup, Plugin, CoreStart } from 'kibana/public';
+import { init as initBreadcrumbs } from './application/services/breadcrumb';
+import { init as initDocumentation } from './application/services/documentation';
+import { init as initHttp } from './application/services/http';
+import { init as initUiMetric } from './application/services/ui_metric';
+import { init as initNotification } from './application/services/notification';
+import { init as initRedirect } from './application/services/redirect';
+import { Dependencies } from './types';
+
+export class RemoteClustersUIPlugin implements Plugin<void, void, Dependencies, any> {
+  setup(
+    { notifications: { toasts }, http, getStartServices }: CoreSetup,
+    { management, usageCollection }: Dependencies
+  ) {
+    const esSection = management.sections.getSection('elasticsearch');
+
+    esSection!.registerApp({
+      id: 'remote_clusters',
+      title: i18n.translate('xpack.remoteClusters.appTitle', {
+        defaultMessage: 'Remote Clusters',
+      }),
+      mount: async ({ element, setBreadcrumbs }) => {
+        const [core] = await getStartServices();
+        const {
+          i18n: { Context: i18nContext },
+          docLinks,
+          fatalErrors,
+        } = core;
+
+        // Initialize services
+        initBreadcrumbs(setBreadcrumbs);
+        initDocumentation(docLinks);
+        initUiMetric(usageCollection);
+        initNotification(toasts, fatalErrors);
+        initHttp(http);
+
+        const { renderApp } = await import('./application');
+        return renderApp(element, i18nContext);
+      },
+    });
+  }
+
+  start({ application }: CoreStart) {
+    initRedirect(application.navigateToApp);
+  }
+
+  stop() {}
+}
diff --git a/x-pack/plugins/remote_clusters/public/types.ts b/x-pack/plugins/remote_clusters/public/types.ts
new file mode 100644
index 0000000000000..45ae90f91587a
--- /dev/null
+++ b/x-pack/plugins/remote_clusters/public/types.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ManagementSetup } from 'src/plugins/management/public';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
+import { RegisterManagementAppArgs } from 'src/plugins/management/public';
+import { I18nStart } from 'kibana/public';
+
+export interface Dependencies {
+  management: ManagementSetup;
+  usageCollection: UsageCollectionSetup;
+}
+
+export { RegisterManagementAppArgs };
+
+export { I18nStart };
diff --git a/x-pack/plugins/remote_clusters/server/config.ts b/x-pack/plugins/remote_clusters/server/config.ts
new file mode 100644
index 0000000000000..9525fe1e2a0db
--- /dev/null
+++ b/x-pack/plugins/remote_clusters/server/config.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+import { PluginConfigDescriptor } from 'kibana/server';
+
+export const configSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: true }),
+});
+
+export type ConfigType = TypeOf<typeof configSchema>;
+
+export const config: PluginConfigDescriptor<ConfigType> = {
+  schema: configSchema,
+  exposeToBrowser: {
+    enabled: true,
+  },
+};
diff --git a/x-pack/plugins/remote_clusters/server/index.ts b/x-pack/plugins/remote_clusters/server/index.ts
index 896161d82919b..927fa768fc9fd 100644
--- a/x-pack/plugins/remote_clusters/server/index.ts
+++ b/x-pack/plugins/remote_clusters/server/index.ts
@@ -6,4 +6,6 @@
 import { PluginInitializerContext } from 'kibana/server';
 import { RemoteClustersServerPlugin } from './plugin';
 
+export { config } from './config';
+
 export const plugin = (ctx: PluginInitializerContext) => new RemoteClustersServerPlugin(ctx);
diff --git a/x-pack/plugins/remote_clusters/server/plugin.ts b/x-pack/plugins/remote_clusters/server/plugin.ts
index dd0bb536d2695..d15ae44c8d5db 100644
--- a/x-pack/plugins/remote_clusters/server/plugin.ts
+++ b/x-pack/plugins/remote_clusters/server/plugin.ts
@@ -6,10 +6,12 @@
 import { i18n } from '@kbn/i18n';
 
 import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'src/core/server';
-import { PLUGIN } from '../common/constants';
+import { Observable } from 'rxjs';
 import { LICENSE_CHECK_STATE } from '../../licensing/common/types';
-import { Dependencies, LicenseStatus, RouteDependencies } from './types';
 
+import { PLUGIN } from '../common/constants';
+import { Dependencies, LicenseStatus, RouteDependencies } from './types';
+import { ConfigType } from './config';
 import {
   registerGetRoute,
   registerAddRoute,
@@ -20,9 +22,11 @@ import {
 export class RemoteClustersServerPlugin implements Plugin<void, void, any, any> {
   licenseStatus: LicenseStatus;
   log: Logger;
+  config: Observable<ConfigType>;
 
-  constructor({ logger }: PluginInitializerContext) {
+  constructor({ logger, config }: PluginInitializerContext) {
     this.log = logger.get();
+    this.config = config.create();
     this.licenseStatus = { valid: false };
   }
 
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts
index aa09b6bf45667..e4ede01ca23ea 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/add_route.ts
@@ -38,8 +38,7 @@ export const register = (deps: RouteDependencies): void => {
       // Check if cluster already exists.
       const existingCluster = await doesClusterExist(callAsCurrentUser, name);
       if (existingCluster) {
-        return response.customError({
-          statusCode: 409,
+        return response.conflict({
           body: {
             message: i18n.translate(
               'xpack.remoteClusters.addRemoteCluster.existingRemoteClusterErrorMessage',
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
index fd707f15ad11e..ed584307d84c1 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
@@ -44,8 +44,7 @@ export const register = (deps: RouteDependencies): void => {
       // Check if cluster does exist.
       const existingCluster = await doesClusterExist(callAsCurrentUser, name);
       if (!existingCluster) {
-        return response.customError({
-          statusCode: 404,
+        return response.notFound({
           body: {
             message: i18n.translate(
               'xpack.remoteClusters.updateRemoteCluster.noRemoteClusterErrorMessage',
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 79b826bc4524f..ee2abeff74496 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -77,7 +77,6 @@
   },
   "messages": {
     "common.ui.aggResponse.allDocsTitle": "すべてのドキュメント",
-    "common.ui.aggTypes.rangesFormatMessage": "{gte} {from} と {lt} {to}",
     "common.ui.directives.paginate.size.allDropDownOptionLabel": "すべて",
     "common.ui.dualRangeControl.mustSetBothErrorMessage": "下と上の値の両方を設定する必要があります",
     "common.ui.dualRangeControl.outsideOfRangeErrorMessage": "値は {min} と {max} の間でなければなりません",
@@ -13176,4 +13175,4 @@
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "フィールドを選択してください。",
     "xpack.watcher.watcherDescription": "アラートの作成、管理、監視によりデータへの変更を検知します。"
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index ce1c713adc4bc..3210c619d3e52 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -77,7 +77,6 @@
   },
   "messages": {
     "common.ui.aggResponse.allDocsTitle": "所有文档",
-    "common.ui.aggTypes.rangesFormatMessage": "{gte} {from} 且 {lt} {to}",
     "common.ui.directives.paginate.size.allDropDownOptionLabel": "全部",
     "common.ui.dualRangeControl.mustSetBothErrorMessage": "下限值和上限值都须设置",
     "common.ui.dualRangeControl.outsideOfRangeErrorMessage": "值必须是在 {min} 到 {max} 的范围内",
@@ -13175,4 +13174,4 @@
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "此字段必填。",
     "xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。"
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
index 87280169c0960..5dcff8712a28d 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
@@ -94,7 +94,7 @@ export default function slackTest({ getService }: FtrProviderContext) {
           name: 'A slack action',
           actionTypeId: '.slack',
           secrets: {
-            webhookUrl: 'http://slack.mynonexistent.com',
+            webhookUrl: 'http://slack.mynonexistent.com/other/stuff/in/the/path',
           },
         })
         .expect(400)
@@ -103,7 +103,29 @@ export default function slackTest({ getService }: FtrProviderContext) {
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'error validating action type secrets: error configuring slack action: target url "http://slack.mynonexistent.com" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+              'error validating action type secrets: error configuring slack action: target hostname "slack.mynonexistent.com" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+          });
+        });
+    });
+
+    it('should respond with a 400 Bad Request when creating a slack action with a webhookUrl with no hostname', async () => {
+      await supertest
+        .post('/api/action')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'A slack action',
+          actionTypeId: '.slack',
+          secrets: {
+            webhookUrl: 'fee-fi-fo-fum',
+          },
+        })
+        .expect(400)
+        .then((resp: any) => {
+          expect(resp.body).to.eql({
+            statusCode: 400,
+            error: 'Bad Request',
+            message:
+              'error validating action type secrets: error configuring slack action: unable to parse host name from webhookUrl',
           });
         });
     });
diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
index 066042896c122..b24c537d25085 100644
--- a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
+++ b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
@@ -20,7 +20,8 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const appsMenu = getService('appsMenu');
 
-  describe('visualize', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/45244
+  describe.skip('visualize', () => {
     before(async () => {
       await esArchiver.loadIfNeeded('logstash_functional');
     });
diff --git a/yarn.lock b/yarn.lock
index cac39dfd4c352..33cb366e72f00 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3996,6 +3996,11 @@
     "@svgr/plugin-svgo" "^4.2.0"
     loader-utils "^1.2.3"
 
+"@testim/chrome-version@^1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@testim/chrome-version/-/chrome-version-1.0.7.tgz#0cd915785ec4190f08a3a6acc9b61fc38fb5f1a9"
+  integrity sha512-8UT/J+xqCYfn3fKtOznAibsHpiuDshCb0fwgWxRazTT19Igp9ovoXMPhXyLD6m3CKQGTMHgqoxaFfMWaL40Rnw==
+
 "@testing-library/dom@^6.3.0":
   version "6.10.1"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-6.10.1.tgz#da5bf5065d3f9e484aef4cc495f4e1a5bea6df2e"
@@ -7114,6 +7119,13 @@ axios@^0.19.0:
     follow-redirects "1.5.10"
     is-buffer "^2.0.2"
 
+axios@^0.19.2:
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
+  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+  dependencies:
+    follow-redirects "1.5.10"
+
 axobject-query@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
@@ -9049,15 +9061,16 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-chromedriver@79.0.0:
-  version "79.0.0"
-  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-79.0.0.tgz#1660ac29924dfcd847911025593d6b6746aeea35"
-  integrity sha512-DO29C7ntJfzu6q1vuoWwCON8E9x5xzopt7Q41A7Dr7hBKcdNpGw1l9DTt9b+l1qviOWiJLGsD+jHw21ptEHubA==
+chromedriver@^80.0.1:
+  version "80.0.1"
+  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-80.0.1.tgz#35c1642e2d864b9e8262f291003e455b0e422917"
+  integrity sha512-VfRtZUpBUIjeypS+xM40+VD9g4Drv7L2VibG/4+0zX3mMx4KayN6gfKETycPfO6JwQXTLSxEr58fRcrsa8r5xQ==
   dependencies:
-    del "^4.1.1"
+    "@testim/chrome-version" "^1.0.7"
+    axios "^0.19.2"
+    del "^5.1.0"
     extract-zip "^1.6.7"
-    mkdirp "^0.5.1"
-    request "^2.88.0"
+    mkdirp "^1.0.3"
     tcp-port-used "^1.0.1"
 
 ci-info@^1.0.0:
@@ -20795,6 +20808,11 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
   dependencies:
     minimist "0.0.8"
 
+mkdirp@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea"
+  integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==
+
 mocha-junit-reporter@^1.23.1:
   version "1.23.1"
   resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.23.1.tgz#ba11519c0b967f404e4123dd69bc4ba022ab0f12"