diff --git a/docs/developer/architecture/code-exploration.asciidoc b/docs/developer/architecture/code-exploration.asciidoc
index bb7222020180c..d9502e4cb47ee 100644
--- a/docs/developer/architecture/code-exploration.asciidoc
+++ b/docs/developer/architecture/code-exploration.asciidoc
@@ -86,9 +86,9 @@ Contains the Discover application and the saved search embeddable.
 Embeddables are re-usable widgets that can be rendered in any environment or plugin. Developers can embed them directly in their plugin. End users can dynamically add them to any embeddable containers.
 
 
-- {kib-repo}blob/{branch}/src/plugins/es_ui_shared[esUiShared]
+- {kib-repo}blob/{branch}/src/plugins/es_ui_shared/README.md[esUiShared]
 
-WARNING: Missing README.
+This plugin contains reusable code in the form of self-contained modules (or libraries). Each of these modules exports a set of functionality relevant to the domain of the module.
 
 
 - {kib-repo}blob/{branch}/src/plugins/expressions/README.md[expressions]
diff --git a/docs/development/plugins/kibana_utils/public/state_sync/kibana-plugin-plugins-kibana_utils-public-state_sync.createkbnurlstatestorage.md b/docs/development/plugins/kibana_utils/public/state_sync/kibana-plugin-plugins-kibana_utils-public-state_sync.createkbnurlstatestorage.md
index 22f70ce22b574..478ba2d409acd 100644
--- a/docs/development/plugins/kibana_utils/public/state_sync/kibana-plugin-plugins-kibana_utils-public-state_sync.createkbnurlstatestorage.md
+++ b/docs/development/plugins/kibana_utils/public/state_sync/kibana-plugin-plugins-kibana_utils-public-state_sync.createkbnurlstatestorage.md
@@ -9,8 +9,10 @@ Creates [IKbnUrlStateStorage](./kibana-plugin-plugins-kibana_utils-public-state_
 <b>Signature:</b>
 
 ```typescript
-createKbnUrlStateStorage: ({ useHash, history }?: {
+createKbnUrlStateStorage: ({ useHash, history, onGetError, onSetError, }?: {
     useHash: boolean;
     history?: History<any> | undefined;
+    onGetError?: ((error: Error) => void) | undefined;
+    onSetError?: ((error: Error) => void) | undefined;
 }) => IKbnUrlStateStorage
 ```
diff --git a/docs/drilldowns/explore-underlying-data.asciidoc b/docs/drilldowns/explore-underlying-data.asciidoc
index e0f940f73e96e..c2bba599730d8 100644
--- a/docs/drilldowns/explore-underlying-data.asciidoc
+++ b/docs/drilldowns/explore-underlying-data.asciidoc
@@ -33,9 +33,9 @@ applies the filters and time range created by the events that triggered the acti
 [role="screenshot"]
 image::images/explore_data_in_chart.png[Explore underlying data from chart]
 
-You can disable this action by adding the following line to your `kibana.yml` config.
+To enable this action add the following line to your `kibana.yml` config.
 
 ["source","yml"]
 -----------
-xpack.discoverEnhanced.actions.exploreDataInChart.enabled: false
+xpack.discoverEnhanced.actions.exploreDataInChart.enabled: true
 -----------
diff --git a/docs/glossary.asciidoc b/docs/glossary.asciidoc
index 07c0bfcf35cb7..51470513198b9 100644
--- a/docs/glossary.asciidoc
+++ b/docs/glossary.asciidoc
@@ -214,6 +214,13 @@ syslog, Apache, and other webserver logs. See
 [[k_glos]]
 == K
 
+[[glossary-kibana-privileges]] {kib} privileges ::
+// tag::kibana-privileges-def[]
+Enable administrators to grant users read-only, read-write, or no access to 
+individual features within <<glossary-space,spaces>> in {kib}. See
+{kibana-ref}/kibana-privileges.html[{kib} privileges].
+// end::kibana-privileges-def[]
+
 [[glossary-kql]] {kib} Query Language (KQL) ::
 // tag::kql-def[]
 The default language for querying in {kib}. KQL provides
diff --git a/package.json b/package.json
index aaa7ae7ee4684..fc3af14ecae09 100644
--- a/package.json
+++ b/package.json
@@ -117,9 +117,9 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.10.2",
-    "@babel/plugin-transform-modules-commonjs": "^7.10.1",
-    "@babel/register": "^7.10.1",
+    "@babel/core": "^7.11.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.10.4",
+    "@babel/register": "^7.10.5",
     "@elastic/apm-rum": "^5.2.0",
     "@elastic/charts": "19.8.1",
     "@elastic/datemath": "5.0.3",
@@ -159,7 +159,6 @@
     "bluebird": "3.5.5",
     "boom": "^7.2.0",
     "brace": "0.11.1",
-    "browserslist-useragent": "^3.0.2",
     "cache-loader": "^4.1.0",
     "chalk": "^2.4.2",
     "check-disk-space": "^2.1.0",
@@ -290,8 +289,8 @@
     "yauzl": "2.10.0"
   },
   "devDependencies": {
-    "@babel/parser": "^7.10.2",
-    "@babel/types": "^7.10.2",
+    "@babel/parser": "^7.11.2",
+    "@babel/types": "^7.11.0",
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",
     "@elastic/github-checks-reporter": "0.0.20b3",
@@ -319,7 +318,6 @@
     "@types/babel__core": "^7.1.2",
     "@types/bluebird": "^3.1.1",
     "@types/boom": "^7.2.0",
-    "@types/browserslist-useragent": "^3.0.0",
     "@types/chance": "^1.0.0",
     "@types/cheerio": "^0.22.10",
     "@types/chromedriver": "^81.0.0",
diff --git a/packages/elastic-datemath/package.json b/packages/elastic-datemath/package.json
index 15040a6243ff2..ad4190f981439 100644
--- a/packages/elastic-datemath/package.json
+++ b/packages/elastic-datemath/package.json
@@ -11,8 +11,8 @@
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.1",
-    "@babel/preset-env": "^7.10.2",
+    "@babel/cli": "^7.10.5",
+    "@babel/preset-env": "^7.11.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "moment": "^2.24.0"
   },
diff --git a/packages/kbn-analytics/package.json b/packages/kbn-analytics/package.json
index bd3f5832b7140..873252ceb0a1a 100644
--- a/packages/kbn-analytics/package.json
+++ b/packages/kbn-analytics/package.json
@@ -14,7 +14,7 @@
     "kbn:watch": "node scripts/build --source-maps --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.1",
+    "@babel/cli": "^7.10.5",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/babel-preset": "1.0.0",
     "typescript": "3.9.5"
diff --git a/packages/kbn-babel-preset/package.json b/packages/kbn-babel-preset/package.json
index 83530beffd2b2..db1f2161b6e38 100644
--- a/packages/kbn-babel-preset/package.json
+++ b/packages/kbn-babel-preset/package.json
@@ -4,14 +4,14 @@
   "version": "1.0.0",
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.10.1",
-    "@babel/plugin-proposal-export-namespace-from": "^7.10.1",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
-    "@babel/plugin-proposal-optional-chaining": "^7.10.1",
-    "@babel/plugin-proposal-private-methods": "^7.10.1",
-    "@babel/preset-env": "^7.10.2",
-    "@babel/preset-react": "^7.10.1",
-    "@babel/preset-typescript": "^7.10.1",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
+    "@babel/plugin-proposal-optional-chaining": "^7.11.0",
+    "@babel/plugin-proposal-private-methods": "^7.10.4",
+    "@babel/preset-env": "^7.11.0",
+    "@babel/preset-react": "^7.10.4",
+    "@babel/preset-typescript": "^7.10.4",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-plugin-filter-imports": "^3.0.0",
     "babel-plugin-styled-components": "^1.10.7",
diff --git a/packages/kbn-i18n/package.json b/packages/kbn-i18n/package.json
index c5da144688c3c..0f830acb284a0 100644
--- a/packages/kbn-i18n/package.json
+++ b/packages/kbn-i18n/package.json
@@ -12,8 +12,8 @@
     "kbn:watch": "node scripts/build --watch --source-maps"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.1",
-    "@babel/core": "^7.10.2",
+    "@babel/cli": "^7.10.5",
+    "@babel/core": "^7.11.1",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@types/intl-relativeformat": "^2.1.0",
diff --git a/packages/kbn-interpreter/package.json b/packages/kbn-interpreter/package.json
index c6bb06e68b9c0..aef63229ebe96 100644
--- a/packages/kbn-interpreter/package.json
+++ b/packages/kbn-interpreter/package.json
@@ -9,16 +9,16 @@
     "kbn:watch": "node scripts/build --dev --watch"
   },
   "dependencies": {
-    "@babel/runtime": "^7.10.2",
+    "@babel/runtime": "^7.11.2",
     "@kbn/i18n": "1.0.0",
     "lodash": "^4.17.15",
     "uuid": "3.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.1",
-    "@babel/core": "^7.10.2",
-    "@babel/plugin-transform-modules-commonjs": "^7.10.1",
-    "@babel/plugin-transform-runtime": "^7.10.1",
+    "@babel/cli": "^7.10.5",
+    "@babel/core": "^7.11.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.10.4",
+    "@babel/plugin-transform-runtime": "^7.11.0",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "babel-loader": "^8.0.6",
diff --git a/packages/kbn-optimizer/README.md b/packages/kbn-optimizer/README.md
index 5d5c5e3b6eb74..13be836f0ea88 100644
--- a/packages/kbn-optimizer/README.md
+++ b/packages/kbn-optimizer/README.md
@@ -10,9 +10,9 @@ The [Webpack config][WebpackConfig] is designed to provide the majority of what
 
 Source maps are enabled except when building the distributable. They show the code actually being executed by the browser to strike a balance between debuggability and performance. They are not configurable at this time but will be configurable once we have a developer configuration solution that doesn't rely on the server (see [#55656](https://github.com/elastic/kibana/issues/55656)).
 
-### IE Support
+### Browser Support
 
-To make front-end code easier to debug the optimizer uses the `BROWSERSLIST_ENV=dev` environment variable (by default) to build JS and CSS that is compatible with modern browsers. In order to support older browsers like IE in development you will need to specify the `BROWSERSLIST_ENV=production` environment variable or build a distributable for testing.
+To make front-end code easier to debug the optimizer uses the `BROWSERSLIST_ENV=dev` environment variable (by default) to build JS and CSS that is compatible with modern browsers. In order to support all browsers that we support with the distributable you will need to specify the `BROWSERSLIST_ENV=production` environment variable or build a distributable for testing.
 
 ## Running the optimizer
 
diff --git a/packages/kbn-optimizer/package.json b/packages/kbn-optimizer/package.json
index e6eb5de31abd8..84e5c79e2e358 100644
--- a/packages/kbn-optimizer/package.json
+++ b/packages/kbn-optimizer/package.json
@@ -10,7 +10,7 @@
     "kbn:watch": "yarn build --watch"
   },
   "dependencies": {
-    "@babel/cli": "^7.10.1",
+    "@babel/cli": "^7.10.5",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/ui-shared-deps": "1.0.0",
diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json
index f370265876df3..45582ad2af97a 100644
--- a/packages/kbn-plugin-helpers/package.json
+++ b/packages/kbn-plugin-helpers/package.json
@@ -12,7 +12,7 @@
     "plugin-helpers": "bin/plugin-helpers.js"
   },
   "dependencies": {
-    "@babel/core": "^7.10.2",
+    "@babel/core": "^7.11.1",
     "argv-split": "^2.0.1",
     "commander": "^3.0.0",
     "del": "^5.1.0",
diff --git a/packages/kbn-pm/package.json b/packages/kbn-pm/package.json
index 188db0a8321a2..3e40bf40222e6 100644
--- a/packages/kbn-pm/package.json
+++ b/packages/kbn-pm/package.json
@@ -10,11 +10,11 @@
     "prettier": "prettier --write './src/**/*.ts'"
   },
   "devDependencies": {
-    "@babel/core": "^7.10.2",
-    "@babel/plugin-proposal-class-properties": "^7.10.1",
-    "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
-    "@babel/preset-env": "^7.10.2",
-    "@babel/preset-typescript": "^7.10.1",
+    "@babel/core": "^7.11.1",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
+    "@babel/preset-env": "^7.11.0",
+    "@babel/preset-typescript": "^7.10.4",
     "@types/cmd-shim": "^2.0.0",
     "@types/cpy": "^5.1.0",
     "@types/dedent": "^0.7.0",
diff --git a/packages/kbn-test/package.json b/packages/kbn-test/package.json
index 38e4668fc1e42..9482ea83cc257 100644
--- a/packages/kbn-test/package.json
+++ b/packages/kbn-test/package.json
@@ -10,7 +10,7 @@
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.1",
+    "@babel/cli": "^7.10.5",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@types/joi": "^13.4.2",
diff --git a/packages/kbn-ui-framework/package.json b/packages/kbn-ui-framework/package.json
index 7933ce06d6847..a095d9ac2a77f 100644
--- a/packages/kbn-ui-framework/package.json
+++ b/packages/kbn-ui-framework/package.json
@@ -30,7 +30,7 @@
     "enzyme-adapter-react-16": "^1.9.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.10.2",
+    "@babel/core": "^7.11.1",
     "@elastic/eui": "0.0.55",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/optimizer": "1.0.0",
diff --git a/rfcs/text/0012_encryption_key_rotation.md b/rfcs/text/0012_encryption_key_rotation.md
new file mode 100644
index 0000000000000..d984d1157a0a1
--- /dev/null
+++ b/rfcs/text/0012_encryption_key_rotation.md
@@ -0,0 +1,119 @@
+- Start Date: 2020-07-22
+- RFC PR: [#72828](https://github.com/elastic/kibana/pull/72828)
+- Kibana Issue: (leave this empty)
+
+# Summary
+
+This RFC proposes a way of the encryption key (`xpack.encryptedSavedObjects.encryptionKey`) rotation that would allow administrators to seamlessly change existing encryption key without any data loss and manual intervention.
+
+# Basic example
+
+When administrators decide to rotate encryption key they will have to generate a new one and move the old key(s) to the `keyRotation` section in the `kibana.yml`:
+
+```yaml
+xpack.encryptedSavedObjects:
+  encryptionKey: "NEW-encryption-key"
+  keyRotation:
+    decryptionOnlyKeys: ["OLD-encryption-key-1", "OLD-encryption-key-2"]
+```
+
+Before old decryption-only key is disposed administrators may want to call a dedicated and _protected_ API endpoint that will go through all registered Saved Objects with encrypted attributes and try to re-encrypt them with the primary encryption key:
+
+```http request
+POST https://localhost:5601/api/encrypted_saved_objects/rotate_key?conflicts=abort
+Content-Type: application/json
+Kbn-Xsrf: true
+```
+
+# Motivation
+
+Today when encryption key changes we can no longer decrypt Saved Objects attributes that were previously encrypted with the `EncryptedSavedObjects` plugin. We handle this case in two different ways depending on whether consumers explicitly requested decryption or not:
+
+* If consumers explicitly request decryption via  `getDecryptedAsInternalUser()` we abort operation and throw exception.
+* If consumers fetch Saved Objects with encrypted attributes that should be automatically decrypted (the ones with `dangerouslyExposeValue: true` marker) via standard Saved Objects APIs we don't abort operation, but rather strip all encrypted attributes from the response and record decryption error in the `error` Saved Object field.
+* If Kibana tries to migrate encrypted Saved Objects at the start up time we abort operation and throw exception. 
+
+In both of these cases we throw or record error with the specific type to allow consumers to gracefully handle this scenario and either drop Saved Objects with unrecoverable encrypted attributes or facilitate the process of re-entering and re-encryption of the new values.
+
+This approach works reasonably well in some scenarios, but it may become very troublesome if we have to deal with lots of Saved Objects. Moreover, we'd like to recommend our users to periodically rotate encryption keys even if they aren't compromised. Hence, we need to provide a way of seamless migration of the existing encrypted Saved Objects to a new encryption key.
+
+There are two main scenarios we'd like to cover in this RFC:
+
+## Encryption key is not available
+
+Administrators may lose existing encryption key or explicitly decide to not use it if it was compromised and users can no longer trust encrypted content that may have been tampered with. In this scenario encrypted portion of the existing Saved Objects is considered lost, and the only way to recover from this state is a manual intervention described previously. That means `EncryptedSavedObjects` plugin consumers __should__ continue supporting this scenario even after we implement a proper encryption key rotation mechanism described in this RFC.
+
+## Encryption key is available, but needs to be rotated
+
+In this scenario a new encryption key (primary encryption key) will be generated, and we will use it to encrypt new or updated Saved Objects. We will still need to know the old encryption key to decrypt existing attributes, but we will no longer use this key to encrypt any of the new or existing Saved Objects. It's also should be possible to have multiple old decryption-only keys.
+
+The old old decryption-only keys should be eventually disposed and users should have a way to make sure all existing Saved Objects are re-encrypted with the new primary encryption key.
+
+__NOTE:__ users can get into a state when different Saved Objects are encrypted with different encryption keys even if they didn't intend to rotate the encryption key. We anticipate that it can happen during initial Elastic Stack HA setup, when by mistake or intentionally different Kibana instances were using different encryption keys. Key rotation mechanism can help to fix this issue without a data loss.
+
+# Detailed design
+
+The core idea is that when the encryption key needs to be rotated then a new key is generated and becomes a primary one, and the old one moves to the `keyRotation` section:
+
+```yaml
+xpack.encryptedSavedObjects:
+  encryptionKey: "NEW-encryption-key"
+  keyRotation:
+    decryptionOnlyKeys: ["OLD-encryption-key"]
+```
+
+As the name implies, the key from the `decryptionOnlyKeys` is only used to decrypt content that we cannot decrypt with the primary encryption key. It's allowed to have multiple decryption-only keys at the same time. When user creates a new Saved Object or updates the existing one then its content is always encrypted with the primary encryption key. Config schema won't allow having the same key in `encryptionKey` and `decryptionOnlyKeys`.
+
+Having multiple decryption keys at the same time brings one problem though: we need to figure out which key to use to decrypt specific Saved Object. If our encryption keys could have a unique ID that we would store together with the encrypted data (we cannot use encryption key hash for that for obvious reasons) we could know for sure which key to use, but we don't have such functionality right now and it may not be the easiest one to manage through `yml` configuration anyway. 
+
+Instead, this RFC proposes to try available existing decryption keys one by one to decrypt Saved Object and always start from the primary one. This way we won't incur any penalty while decrypting Saved Objects that are already encrypted with the primary encryption key, but there will still be some cost when we have to perform multiple decryption attempts. See the [`Drawbacks`](#drawbacks) section for the details.
+
+Technically just having `decryptionOnlyKeys` would be enough to cover the majority of the use cases, but the old decryption-only keys should be eventually disposed. At this point administrators would like to make sure _all_ Saved Objects are encrypted with the new primary encryption key. Another reason to re-encrypt all existing Saved Objects with the new key at once is to preventively reduce the performance impact of the multiple decryption attempts.
+
+We'd like to make this process as simple as possible while meeting the following requirements:
+
+* It should not be required to restart Kibana to perform this type of migration since Saved Objects encrypted with the another encryption key can theoretically appear at any point in time.
+* It should be possible to integrate this operation into other operational flows our users may have and any user-friendly key management UIs we may introduce in this future.
+* Any possible failures that may happen during this operation shouldn't make Kibana nonfunctional.
+* Ordinary users should not be able to trigger this migration since it may consume a considerable amount of computing resources.
+
+We think that the best option we have right now is a dedicated API endpoint that would trigger this migration:
+
+```http request
+POST https://localhost:5601/api/encrypted_saved_objects/rotate_key?conflicts=abort
+Content-Type: application/json
+Kbn-Xsrf: true
+```
+
+This will be a protected endpoint and only user with enough privileges will be able to use it.
+
+Under the hood we'll scroll over all Saved Objects that are registered with `EncryptedSavedObjects` plugin and re-encrypt attributes only for those of them that can only be decrypted with any of the old decryption-only keys. Saved Objects that can be decrypted with the primary encryption key will be ignored. We'll also ignore the ones that cannot be decrypted with any of the available decryption keys at all, and presumably return their IDs in the response.
+
+As for any other encryption or decryption operation we'll record relevant bits in the audit logs.
+
+# Benefits
+
+* The concept of decryption-only keys is easy to grasp and allows Kibana to function even if it has a mix of Saved Objects encrypted with different encryption keys.
+* Support of the key rotation out of the box decreases the chances of the data loss and makes `EncryptedSavedObjects` story more secure and approachable overall.
+
+# Drawbacks
+
+* Multiple decryption attempts affect performance. See [the performance test results](https://github.com/elastic/kibana/pull/72420#issue-453400211) for more details, but making two decryption attempts is basically twice as slow as with a single attempt. Although it's only relevant for the encrypted Saved Objects migration performed at the start up time and batch operations that trigger automatic decryption (only for the Saved Objects registered with `dangerouslyExposeValue: true` marker that nobody is using in Kibana right now), we may have more use cases in the future.
+* Historically we supported Kibana features with either configuration or dedicated UI, but in this case we want to introduce an API endpoint that _should be_ used directly. We may have a key management UI in the future though.
+
+# Alternatives
+
+We cannot think of any better alternative for `decryptionOnlyKeys` at the moment, but instead of API endpoint for the batch re-encryption we could potentially use another `kibana.yml` config option. For example `keyRotation.mode: onWrite | onStart | both`, but it feels a bit hacky and cannot be really integrated with anything else.
+
+# Adoption strategy
+
+Adoption strategy is pretty straightforward since the feature is an enhancement and doesn't bring any BWC concerns.
+
+# How we teach this
+
+Key rotation is a well-known paradigm. We'll update `README.md` of the `EncryptedSavedObjects` plugin and create a dedicated section in the public Kibana documentation.
+
+# Unresolved questions
+
+* Is it reasonable to have this feature in Basic?
+* Are there any other use-cases that are not covered by the proposal?
diff --git a/src/core/server/http/base_path_proxy_server.ts b/src/core/server/http/base_path_proxy_server.ts
index eccc9d013176c..acb83962bd457 100644
--- a/src/core/server/http/base_path_proxy_server.ts
+++ b/src/core/server/http/base_path_proxy_server.ts
@@ -22,10 +22,9 @@ import { Agent as HttpsAgent, ServerOptions as TlsOptions } from 'https';
 
 import apm from 'elastic-apm-node';
 import { ByteSizeValue } from '@kbn/config-schema';
-import { Server, Request, ResponseToolkit } from 'hapi';
+import { Server, Request } from 'hapi';
 import HapiProxy from 'h2o2';
 import { sampleSize } from 'lodash';
-import BrowserslistUserAgent from 'browserslist-useragent';
 import * as Rx from 'rxjs';
 import { take } from 'rxjs/operators';
 
@@ -41,34 +40,6 @@ export interface BasePathProxyServerOptions {
   delayUntil: () => Rx.Observable<void>;
 }
 
-// Before we proxy request to a target port we may want to wait until some
-// condition is met (e.g. until target listener is ready).
-const checkForBrowserCompat = (log: Logger) => async (request: Request, h: ResponseToolkit) => {
-  if (!request.headers['user-agent'] || process.env.BROWSERSLIST_ENV === 'production') {
-    return h.continue;
-  }
-
-  const matches = BrowserslistUserAgent.matchesUA(request.headers['user-agent'], {
-    env: 'dev',
-    allowHigherVersions: true,
-    ignoreMinor: true,
-    ignorePath: true,
-  });
-
-  if (!matches) {
-    log.warn(`
-      Request with user-agent [${request.headers['user-agent']}]
-      seems like it is coming from a browser that is not supported by the dev browserlist.
-
-      Please run Kibana with the environment variable BROWSERSLIST_ENV=production to enable
-      support for all production browsers (like IE).
-
-    `);
-  }
-
-  return h.continue;
-};
-
 export class BasePathProxyServer {
   private server?: Server;
   private httpsAgent?: HttpsAgent;
@@ -155,9 +126,6 @@ export class BasePathProxyServer {
       },
       method: 'GET',
       path: '/',
-      options: {
-        pre: [checkForBrowserCompat(this.log)],
-      },
     });
 
     this.server.route({
@@ -175,7 +143,6 @@ export class BasePathProxyServer {
       method: '*',
       options: {
         pre: [
-          checkForBrowserCompat(this.log),
           // Before we proxy request to a target port we may want to wait until some
           // condition is met (e.g. until target listener is ready).
           async (request, responseToolkit) => {
@@ -210,7 +177,6 @@ export class BasePathProxyServer {
       method: '*',
       options: {
         pre: [
-          checkForBrowserCompat(this.log),
           // Before we proxy request to a target port we may want to wait until some
           // condition is met (e.g. until target listener is ready).
           async (request, responseToolkit) => {
diff --git a/src/plugins/dashboard/public/application/legacy_app.js b/src/plugins/dashboard/public/application/legacy_app.js
index 8b8fdcb7a76ac..abe04fb8bd7e3 100644
--- a/src/plugins/dashboard/public/application/legacy_app.js
+++ b/src/plugins/dashboard/public/application/legacy_app.js
@@ -30,6 +30,7 @@ import {
   createKbnUrlStateStorage,
   redirectWhenMissing,
   SavedObjectNotFound,
+  withNotifyOnErrors,
 } from '../../../kibana_utils/public';
 import { DashboardListing, EMPTY_FILTER } from './listing/dashboard_listing';
 import { addHelpMenuToAppChrome } from './help_menu/help_menu_util';
@@ -65,6 +66,7 @@ export function initDashboardApp(app, deps) {
     createKbnUrlStateStorage({
       history,
       useHash: deps.uiSettings.get('state:storeInSessionStorage'),
+      ...withNotifyOnErrors(deps.core.notifications.toasts),
     })
   );
 
diff --git a/src/plugins/discover/public/application/angular/context.js b/src/plugins/discover/public/application/angular/context.js
index a6f591eebb52d..6223090aa9f97 100644
--- a/src/plugins/discover/public/application/angular/context.js
+++ b/src/plugins/discover/public/application/angular/context.js
@@ -83,6 +83,7 @@ function ContextAppRouteController($routeParams, $scope, $route) {
     timeFieldName: indexPattern.timeFieldName,
     storeInSessionStorage: getServices().uiSettings.get('state:storeInSessionStorage'),
     history: getServices().history(),
+    toasts: getServices().core.notifications.toasts,
   });
   this.state = { ...appState.getState() };
   this.anchorId = $routeParams.id;
diff --git a/src/plugins/discover/public/application/angular/context_state.ts b/src/plugins/discover/public/application/angular/context_state.ts
index 7a92a6ace125b..5b05d8729c41d 100644
--- a/src/plugins/discover/public/application/angular/context_state.ts
+++ b/src/plugins/discover/public/application/angular/context_state.ts
@@ -18,11 +18,13 @@
  */
 import _ from 'lodash';
 import { History } from 'history';
+import { NotificationsStart } from 'kibana/public';
 import {
   createStateContainer,
   createKbnUrlStateStorage,
   syncStates,
   BaseStateContainer,
+  withNotifyOnErrors,
 } from '../../../../kibana_utils/public';
 import { esFilters, FilterManager, Filter, Query } from '../../../../data/public';
 
@@ -74,6 +76,13 @@ interface GetStateParams {
    * History instance to use
    */
   history: History;
+
+  /**
+   * Core's notifications.toasts service
+   * In case it is passed in,
+   * kbnUrlStateStorage will use it notifying about inner errors
+   */
+  toasts?: NotificationsStart['toasts'];
 }
 
 interface GetStateReturn {
@@ -123,10 +132,12 @@ export function getState({
   timeFieldName,
   storeInSessionStorage = false,
   history,
+  toasts,
 }: GetStateParams): GetStateReturn {
   const stateStorage = createKbnUrlStateStorage({
     useHash: storeInSessionStorage,
     history,
+    ...(toasts && withNotifyOnErrors(toasts)),
   });
 
   const globalStateInitial = stateStorage.get(GLOBAL_STATE_URL_KEY) as GlobalState;
diff --git a/src/plugins/discover/public/application/angular/discover.js b/src/plugins/discover/public/application/angular/discover.js
index 4a27f261a6220..22da3e877054a 100644
--- a/src/plugins/discover/public/application/angular/discover.js
+++ b/src/plugins/discover/public/application/angular/discover.js
@@ -220,6 +220,7 @@ function discoverController($element, $route, $scope, $timeout, $window, Promise
     defaultAppState: getStateDefaults(),
     storeInSessionStorage: config.get('state:storeInSessionStorage'),
     history,
+    toasts: core.notifications.toasts,
   });
   if (appStateContainer.getState().index !== $scope.indexPattern.id) {
     //used index pattern is different than the given by url/state which is invalid
diff --git a/src/plugins/discover/public/application/angular/discover_state.ts b/src/plugins/discover/public/application/angular/discover_state.ts
index 46500d9fdf85e..ff8fb9f80a723 100644
--- a/src/plugins/discover/public/application/angular/discover_state.ts
+++ b/src/plugins/discover/public/application/angular/discover_state.ts
@@ -18,12 +18,14 @@
  */
 import { isEqual } from 'lodash';
 import { History } from 'history';
+import { NotificationsStart } from 'kibana/public';
 import {
   createStateContainer,
   createKbnUrlStateStorage,
   syncState,
   ReduxLikeStateContainer,
   IKbnUrlStateStorage,
+  withNotifyOnErrors,
 } from '../../../../kibana_utils/public';
 import { esFilters, Filter, Query } from '../../../../data/public';
 import { migrateLegacyQuery } from '../../../../kibana_legacy/public';
@@ -68,6 +70,13 @@ interface GetStateParams {
    * Browser history
    */
   history: History;
+
+  /**
+   * Core's notifications.toasts service
+   * In case it is passed in,
+   * kbnUrlStateStorage will use it notifying about inner errors
+   */
+  toasts?: NotificationsStart['toasts'];
 }
 
 export interface GetStateReturn {
@@ -122,10 +131,12 @@ export function getState({
   defaultAppState = {},
   storeInSessionStorage = false,
   history,
+  toasts,
 }: GetStateParams): GetStateReturn {
   const stateStorage = createKbnUrlStateStorage({
     useHash: storeInSessionStorage,
     history,
+    ...(toasts && withNotifyOnErrors(toasts)),
   });
 
   const appStateFromUrl = stateStorage.get(APP_STATE_URL_KEY) as AppState;
diff --git a/src/plugins/es_ui_shared/README.md b/src/plugins/es_ui_shared/README.md
new file mode 100644
index 0000000000000..5a9091e2dd1eb
--- /dev/null
+++ b/src/plugins/es_ui_shared/README.md
@@ -0,0 +1,32 @@
+## ES UI shared modules
+
+This plugin contains reusable code in the form of self-contained modules (or libraries). Each of these modules exports a set of functionality relevant to the domain of the module.
+
+**Please note**: Modules in ES UI shared are intended for use by the ES UI Management Team (elastic/es-ui@) only. Please reach out to us if there is something you would like to contribute or use in these modules.
+
+## Files and folders overview
+
+- `./public` | `./server`. Folders for grouping server or public code according to the Kibana plugin pattern.
+- `./__packages_do_not_import__` is where actual functionality is kept. This enables modules more control over what functionality is directly exported and prevents parts of modules to be depended on externally in unintended ways.
+- `./public/index.ts` | `./server/index.ts` These files export modules (simple JavaScript objects). For example, `Monaco` is the name of a module. In this way, modules namespace all of their exports and do not have to be concerned about name collisions from other modules.
+
+## Conventions for adding code
+
+When adding new functionality, look at the folders in `./__packages_do_not_import__` and consider whether your functionality falls into any of those modules.
+
+If it does not, you should create a module and expose it to public or server code (or both) following the conventions described above.
+
+### Example
+
+If I wanted to add functionality for calculating a Fibonacci sequence browser-side one would do the following:
+
+1. Create a folder `./__packages_do_not_import__/math`. The name of the folder should be a snake_case version of the module name. In this case `Math` -> `math`. Another case, `IndexManagement` -> `index_management`.
+2. Write your function in `./__packages_do_not_import__/math/calculate_fibonacci.ts`, adding any relevant tests in the same folder.
+3. Export functionality intended _for consumers_ from `./__packages_do_not_import__/math/index.ts`.
+4. Create a folder `./public/math`.
+5. Export all functionality from `./__packages_do_not_import__/math` in `./public/math/index.ts`.
+6. In `./public/index.ts` import `./public/math` using `import * as Math from './public/math;`. The name (`Math`) given here is really important and will be what consumers depend on.
+7. Add the `Math` module to the list of exported modules in `./public/index.ts`, e.g. `export { <...other modules>, Math }`
+8. Use `Math` in your public side code elsewhere!
+
+This example assumes no other appropriate home for such a function exists.
diff --git a/src/plugins/kibana_utils/docs/state_sync/README.md b/src/plugins/kibana_utils/docs/state_sync/README.md
index acfe6dcf76fe9..c84bf7f236330 100644
--- a/src/plugins/kibana_utils/docs/state_sync/README.md
+++ b/src/plugins/kibana_utils/docs/state_sync/README.md
@@ -58,3 +58,4 @@ To run them, start kibana with `--run-examples` flag.
 - [On-the-fly state migrations](./on_fly_state_migrations.md).
 - [syncStates helper](./sync_states.md).
 - [Helpers for Data plugin (syncing TimeRange, RefreshInterval and Filters)](./data_plugin_helpers.md).
+- [Error handling](./error_handling.md)
diff --git a/src/plugins/kibana_utils/docs/state_sync/error_handling.md b/src/plugins/kibana_utils/docs/state_sync/error_handling.md
new file mode 100644
index 0000000000000..b12e1040af260
--- /dev/null
+++ b/src/plugins/kibana_utils/docs/state_sync/error_handling.md
@@ -0,0 +1,6 @@
+# Error handling
+
+State syncing util doesn't have specific api for handling errors.
+It expects that errors are handled on storage level.
+
+see [KbnUrlStateStorage](./storages/kbn_url_storage.md#) error handling section for details.
diff --git a/src/plugins/kibana_utils/docs/state_sync/storages/kbn_url_storage.md b/src/plugins/kibana_utils/docs/state_sync/storages/kbn_url_storage.md
index 3a31f5a326edb..ec27895eed666 100644
--- a/src/plugins/kibana_utils/docs/state_sync/storages/kbn_url_storage.md
+++ b/src/plugins/kibana_utils/docs/state_sync/storages/kbn_url_storage.md
@@ -65,7 +65,7 @@ To prevent bugs caused by missing history updates, make sure your app uses one i
 For example, if you use `react-router`:
 
 ```tsx
-const App = props => {
+const App = (props) => {
   useEffect(() => {
     const stateStorage = createKbnUrlStateStorage({
       useHash: props.uiSettings.get('state:storeInSessionStorage'),
@@ -160,3 +160,58 @@ const { start, stop } = syncStates([
 
 <Router history={history} />;
 ```
+
+### Error handling
+
+Errors could occur both during `kbnUrlStateStorage.get()` and `kbnUrlStateStorage.set()`
+
+#### Handling kbnUrlStateStorage.get() errors
+
+Possible error scenarios during `kbnUrlStateStorage.get()`:
+
+1. Rison in URL is malformed. Parsing exception.
+2. useHash is enabled and current hash is missing in `sessionStorage`
+
+In all the cases error is handled internally and `kbnUrlStateStorage.get()` returns `null`, just like if there is no state in the URL anymore
+
+You can pass callback to get notified about errors. Use it, for example, for notifying users
+
+```ts
+const kbnUrlStateStorage = createKbnUrlStateStorage({
+  history,
+  onGetError: (error) => {
+    alert(error.message);
+  },
+});
+```
+
+#### Handling kbnUrlStateStorage.set() errors
+
+Possible errors during `kbnUrlStateStorage.set()`:
+
+1. `useHash` is enabled and can't store state in `sessionStorage` (overflow or no access)
+
+In all the cases error is handled internally and URL update is skipped
+
+You can pass callback to get notified about errors. Use it, for example, for notifying users:
+
+```ts
+const kbnUrlStateStorage = createKbnUrlStateStorage({
+  history,
+  onSetError: (error) => {
+    alert(error.message);
+  },
+});
+```
+
+#### Helper to integrate with core.notifications.toasts
+
+The most common scenario is to notify users about issues with state syncing using toast service from core
+There is a convenient helper for this:
+
+```ts
+const kbnUrlStateStorage = createKbnUrlStateStorage({
+  history,
+  ...withNotifyOnErrors(core.notifications.toasts),
+});
+```
diff --git a/src/plugins/kibana_utils/public/index.ts b/src/plugins/kibana_utils/public/index.ts
index e2d6ae647abb1..d1c9eec0e9906 100644
--- a/src/plugins/kibana_utils/public/index.ts
+++ b/src/plugins/kibana_utils/public/index.ts
@@ -57,6 +57,7 @@ export {
   getStateFromKbnUrl,
   getStatesFromKbnUrl,
   setStateToKbnUrl,
+  withNotifyOnErrors,
 } from './state_management/url';
 export {
   syncState,
diff --git a/src/plugins/kibana_utils/public/state_management/url/errors.ts b/src/plugins/kibana_utils/public/state_management/url/errors.ts
new file mode 100644
index 0000000000000..b8b6523e8070c
--- /dev/null
+++ b/src/plugins/kibana_utils/public/state_management/url/errors.ts
@@ -0,0 +1,62 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+import { NotificationsStart } from 'kibana/public';
+
+export const restoreUrlErrorTitle = i18n.translate(
+  'kibana_utils.stateManagement.url.restoreUrlErrorTitle',
+  {
+    defaultMessage: `Error restoring state from URL`,
+  }
+);
+
+export const saveStateInUrlErrorTitle = i18n.translate(
+  'kibana_utils.stateManagement.url.saveStateInUrlErrorTitle',
+  {
+    defaultMessage: `Error saving state in URL`,
+  }
+);
+
+/**
+ * Helper for configuring {@link IKbnUrlStateStorage} to notify about inner errors
+ *
+ * @example
+ * ```ts
+ * const kbnUrlStateStorage = createKbnUrlStateStorage({
+ *  history,
+ *  ...withNotifyOnErrors(core.notifications.toast))
+ * }
+ * ```
+ * @param toast - toastApi from core.notifications.toasts
+ */
+export const withNotifyOnErrors = (toasts: NotificationsStart['toasts']) => {
+  return {
+    onGetError: (error: Error) => {
+      toasts.addError(error, {
+        title: restoreUrlErrorTitle,
+      });
+    },
+    onSetError: (error: Error) => {
+      toasts.addError(error, {
+        title: saveStateInUrlErrorTitle,
+      });
+    },
+  };
+};
diff --git a/src/plugins/kibana_utils/public/state_management/url/index.ts b/src/plugins/kibana_utils/public/state_management/url/index.ts
index e28d183c6560a..66fecd723e3ba 100644
--- a/src/plugins/kibana_utils/public/state_management/url/index.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/index.ts
@@ -27,3 +27,4 @@ export {
 } from './kbn_url_storage';
 export { createKbnUrlTracker } from './kbn_url_tracker';
 export { createUrlTracker } from './url_tracker';
+export { withNotifyOnErrors, saveStateInUrlErrorTitle, restoreUrlErrorTitle } from './errors';
diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.ts
index d9149095a2fa2..fefd5f668c6b3 100644
--- a/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.ts
@@ -103,7 +103,7 @@ export function setStateToKbnUrl<State>(
 export interface IKbnUrlControls {
   /**
    * Listen for url changes
-   * @param cb - get's called when url has been changed
+   * @param cb - called when url has been changed
    */
   listen: (cb: () => void) => () => void;
 
@@ -142,12 +142,12 @@ export interface IKbnUrlControls {
    */
   cancel: () => void;
 }
-export type UrlUpdaterFnType = (currentUrl: string) => string;
+export type UrlUpdaterFnType = (currentUrl: string) => string | undefined;
 
 export const createKbnUrlControls = (
   history: History = createBrowserHistory()
 ): IKbnUrlControls => {
-  const updateQueue: Array<(currentUrl: string) => string> = [];
+  const updateQueue: UrlUpdaterFnType[] = [];
 
   // if we should replace or push with next async update,
   // if any call in a queue asked to push, then we should push
@@ -188,7 +188,7 @@ export const createKbnUrlControls = (
   function getPendingUrl() {
     if (updateQueue.length === 0) return undefined;
     const resultUrl = updateQueue.reduce(
-      (url, nextUpdate) => nextUpdate(url),
+      (url, nextUpdate) => nextUpdate(url) ?? url,
       getCurrentUrl(history)
     );
 
@@ -201,7 +201,7 @@ export const createKbnUrlControls = (
         cb();
       }),
     update: (newUrl: string, replace = false) => updateUrl(newUrl, replace),
-    updateAsync: (updater: (currentUrl: string) => string, replace = false) => {
+    updateAsync: (updater: UrlUpdaterFnType, replace = false) => {
       updateQueue.push(updater);
       if (shouldReplace) {
         shouldReplace = replace;
diff --git a/src/plugins/kibana_utils/public/state_sync/public.api.md b/src/plugins/kibana_utils/public/state_sync/public.api.md
index ae8c0e8e401b8..a4dfea82cdb59 100644
--- a/src/plugins/kibana_utils/public/state_sync/public.api.md
+++ b/src/plugins/kibana_utils/public/state_sync/public.api.md
@@ -8,9 +8,11 @@ import { History } from 'history';
 import { Observable } from 'rxjs';
 
 // @public
-export const createKbnUrlStateStorage: ({ useHash, history }?: {
+export const createKbnUrlStateStorage: ({ useHash, history, onGetError, onSetError, }?: {
     useHash: boolean;
     history?: History<any> | undefined;
+    onGetError?: ((error: Error) => void) | undefined;
+    onSetError?: ((error: Error) => void) | undefined;
 }) => IKbnUrlStateStorage;
 
 // Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "kibana" does not have an export "Storage"
diff --git a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
index cc708d14ea8b5..e222af91d7729 100644
--- a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
+++ b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
@@ -16,12 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import '../../storage/hashed_item_store/mock';
+import { mockStorage } from '../../storage/hashed_item_store/mock';
 import { createKbnUrlStateStorage, IKbnUrlStateStorage } from './create_kbn_url_state_storage';
 import { History, createBrowserHistory } from 'history';
 import { takeUntil, toArray } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { ScopedHistory } from '../../../../../core/public';
+import { withNotifyOnErrors } from '../../state_management/url';
+import { coreMock } from '../../../../../core/public/mocks';
 
 describe('KbnUrlStateStorage', () => {
   describe('useHash: false', () => {
@@ -93,6 +95,37 @@ describe('KbnUrlStateStorage', () => {
 
       expect(await result).toEqual([{ test: 'test', ok: 1 }, { test: 'test', ok: 2 }, null]);
     });
+
+    it("shouldn't throw in case of parsing error", async () => {
+      const key = '_s';
+      history.replace(`/#?${key}=(ok:2,test:`); // malformed rison
+      expect(() => urlStateStorage.get(key)).not.toThrow();
+      expect(urlStateStorage.get(key)).toBeNull();
+    });
+
+    it('should notify about errors', () => {
+      const cb = jest.fn();
+      urlStateStorage = createKbnUrlStateStorage({ useHash: false, history, onGetError: cb });
+      const key = '_s';
+      history.replace(`/#?${key}=(ok:2,test:`); // malformed rison
+      expect(() => urlStateStorage.get(key)).not.toThrow();
+      expect(cb).toBeCalledWith(expect.any(Error));
+    });
+
+    describe('withNotifyOnErrors integration', () => {
+      test('toast is shown', () => {
+        const toasts = coreMock.createStart().notifications.toasts;
+        urlStateStorage = createKbnUrlStateStorage({
+          useHash: true,
+          history,
+          ...withNotifyOnErrors(toasts),
+        });
+        const key = '_s';
+        history.replace(`/#?${key}=(ok:2,test:`); // malformed rison
+        expect(() => urlStateStorage.get(key)).not.toThrow();
+        expect(toasts.addError).toBeCalled();
+      });
+    });
   });
 
   describe('useHash: true', () => {
@@ -128,6 +161,44 @@ describe('KbnUrlStateStorage', () => {
 
       expect(await result).toEqual([{ test: 'test', ok: 1 }, { test: 'test', ok: 2 }, null]);
     });
+
+    describe('hashStorage overflow exception', () => {
+      let oldLimit: number;
+      beforeAll(() => {
+        oldLimit = mockStorage.getStubbedSizeLimit();
+        mockStorage.clear();
+        mockStorage.setStubbedSizeLimit(0);
+      });
+      afterAll(() => {
+        mockStorage.setStubbedSizeLimit(oldLimit);
+      });
+
+      it("shouldn't throw in case of error", async () => {
+        expect(() => urlStateStorage.set('_s', { test: 'test' })).not.toThrow();
+        await expect(urlStateStorage.set('_s', { test: 'test' })).resolves; // not rejects
+        expect(getCurrentUrl()).toBe('/'); // url wasn't updated with hash
+      });
+
+      it('should notify about errors', async () => {
+        const cb = jest.fn();
+        urlStateStorage = createKbnUrlStateStorage({ useHash: true, history, onSetError: cb });
+        await expect(urlStateStorage.set('_s', { test: 'test' })).resolves; // not rejects
+        expect(cb).toBeCalledWith(expect.any(Error));
+      });
+
+      describe('withNotifyOnErrors integration', () => {
+        test('toast is shown', async () => {
+          const toasts = coreMock.createStart().notifications.toasts;
+          urlStateStorage = createKbnUrlStateStorage({
+            useHash: true,
+            history,
+            ...withNotifyOnErrors(toasts),
+          });
+          await expect(urlStateStorage.set('_s', { test: 'test' })).resolves; // not rejects
+          expect(toasts.addError).toBeCalled();
+        });
+      });
+    });
   });
 
   describe('ScopedHistory integration', () => {
diff --git a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts
index 0c74e1eb9f421..460720b98e30f 100644
--- a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts
+++ b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Observable } from 'rxjs';
-import { map, share } from 'rxjs/operators';
+import { Observable, of } from 'rxjs';
+import { catchError, map, share } from 'rxjs/operators';
 import { History } from 'history';
 import { IStateStorage } from './types';
 import {
@@ -68,7 +68,19 @@ export interface IKbnUrlStateStorage extends IStateStorage {
  * @public
  */
 export const createKbnUrlStateStorage = (
-  { useHash = false, history }: { useHash: boolean; history?: History } = { useHash: false }
+  {
+    useHash = false,
+    history,
+    onGetError,
+    onSetError,
+  }: {
+    useHash: boolean;
+    history?: History;
+    onGetError?: (error: Error) => void;
+    onSetError?: (error: Error) => void;
+  } = {
+    useHash: false,
+  }
 ): IKbnUrlStateStorage => {
   const url = createKbnUrlControls(history);
   return {
@@ -78,15 +90,23 @@ export const createKbnUrlStateStorage = (
       { replace = false }: { replace: boolean } = { replace: false }
     ) => {
       // syncState() utils doesn't wait for this promise
-      return url.updateAsync(
-        (currentUrl) => setStateToKbnUrl(key, state, { useHash }, currentUrl),
-        replace
-      );
+      return url.updateAsync((currentUrl) => {
+        try {
+          return setStateToKbnUrl(key, state, { useHash }, currentUrl);
+        } catch (error) {
+          if (onSetError) onSetError(error);
+        }
+      }, replace);
     },
     get: (key) => {
       // if there is a pending url update, then state will be extracted from that pending url,
       // otherwise current url will be used to retrieve state from
-      return getStateFromKbnUrl(key, url.getPendingUrl());
+      try {
+        return getStateFromKbnUrl(key, url.getPendingUrl());
+      } catch (e) {
+        if (onGetError) onGetError(e);
+        return null;
+      }
     },
     change$: <State>(key: string) =>
       new Observable((observer) => {
@@ -99,6 +119,10 @@ export const createKbnUrlStateStorage = (
         };
       }).pipe(
         map(() => getStateFromKbnUrl<State>(key)),
+        catchError((error) => {
+          if (onGetError) onGetError(error);
+          return of(null);
+        }),
         share()
       ),
     flush: ({ replace = false }: { replace?: boolean } = {}) => {
diff --git a/src/plugins/timelion/public/app.js b/src/plugins/timelion/public/app.js
index 0294e71084f98..614a7539de44c 100644
--- a/src/plugins/timelion/public/app.js
+++ b/src/plugins/timelion/public/app.js
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 
 import { createHashHistory } from 'history';
 
-import { createKbnUrlStateStorage } from '../../kibana_utils/public';
+import { createKbnUrlStateStorage, withNotifyOnErrors } from '../../kibana_utils/public';
 import { syncQueryStateWithUrl } from '../../data/public';
 
 import { getSavedSheetBreadcrumbs, getCreateBreadcrumbs } from './breadcrumbs';
@@ -63,6 +63,7 @@ export function initTimelionApp(app, deps) {
     createKbnUrlStateStorage({
       history,
       useHash: deps.core.uiSettings.get('state:storeInSessionStorage'),
+      ...withNotifyOnErrors(deps.core.notifications.toasts),
     })
   );
   app.config(watchMultiDecorator);
diff --git a/src/plugins/vis_type_timeseries/common/vis_schema.ts b/src/plugins/vis_type_timeseries/common/vis_schema.ts
index a462e488c6732..c1730e6a15435 100644
--- a/src/plugins/vis_type_timeseries/common/vis_schema.ts
+++ b/src/plugins/vis_type_timeseries/common/vis_schema.ts
@@ -119,6 +119,10 @@ export const metricsItems = schema.object({
   type: stringRequired,
   value: stringOptionalNullable,
   values: schema.maybe(schema.nullable(schema.arrayOf(schema.nullable(schema.string())))),
+  size: stringOptionalNullable,
+  agg_with: stringOptionalNullable,
+  order: stringOptionalNullable,
+  order_by: stringOptionalNullable,
 });
 
 const splitFiltersItems = schema.object({
diff --git a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
index 392168a530087..da9ba66a914dd 100644
--- a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
+++ b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
@@ -114,7 +114,7 @@ export const getTopNavConfig = (
             application.navigateToApp(originatingApp);
           }
         } else {
-          if (setOriginatingApp && originatingApp && savedVis.copyOnSave) {
+          if (setOriginatingApp && originatingApp && newlyCreated) {
             setOriginatingApp(undefined);
           }
           chrome.docTitle.change(savedVis.lastSavedTitle);
diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
index fd9a67599414f..3299319e613a0 100644
--- a/src/plugins/visualize/public/plugin.ts
+++ b/src/plugins/visualize/public/plugin.ts
@@ -31,7 +31,12 @@ import {
   ScopedHistory,
 } from 'kibana/public';
 
-import { Storage, createKbnUrlTracker, createKbnUrlStateStorage } from '../../kibana_utils/public';
+import {
+  Storage,
+  createKbnUrlTracker,
+  createKbnUrlStateStorage,
+  withNotifyOnErrors,
+} from '../../kibana_utils/public';
 import { DataPublicPluginStart, DataPublicPluginSetup, esFilters } from '../../data/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../navigation/public';
 import { SharePluginStart } from '../../share/public';
@@ -150,6 +155,7 @@ export class VisualizePlugin
           kbnUrlStateStorage: createKbnUrlStateStorage({
             history,
             useHash: coreStart.uiSettings.get('state:storeInSessionStorage'),
+            ...withNotifyOnErrors(coreStart.notifications.toasts),
           }),
           kibanaLegacy: pluginsStart.kibanaLegacy,
           pluginInitializerContext: this.initializerContext,
diff --git a/test/functional/apps/dashboard/edit_embeddable_redirects.js b/test/functional/apps/dashboard/edit_embeddable_redirects.js
index 6d3d43890a962..fcc504ea24f31 100644
--- a/test/functional/apps/dashboard/edit_embeddable_redirects.js
+++ b/test/functional/apps/dashboard/edit_embeddable_redirects.js
@@ -21,8 +21,10 @@ import expect from '@kbn/expect';
 export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'settings', 'common']);
   const esArchiver = getService('esArchiver');
+  const testSubjects = getService('testSubjects');
   const kibanaServer = getService('kibanaServer');
   const dashboardPanelActions = getService('dashboardPanelActions');
+  const dashboardVisualizations = getService('dashboardVisualizations');
 
   describe('edit embeddable redirects', () => {
     before(async () => {
@@ -81,6 +83,23 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.header.waitUntilLoadingHasFinished();
       await dashboardPanelActions.openContextMenu();
       await dashboardPanelActions.clickEdit();
+      await PageObjects.visualize.linkedToOriginatingApp();
+      await PageObjects.visualize.saveVisualizationExpectSuccess(newTitle, {
+        saveAsNew: true,
+        redirectToOrigin: false,
+      });
+      await PageObjects.visualize.notLinkedToOriginatingApp();
+      await PageObjects.common.navigateToApp('dashboard');
+    });
+
+    it('loses originatingApp connection after first save when redirectToOrigin is false', async () => {
+      const newTitle = 'test create panel originatingApp';
+      await PageObjects.dashboard.loadSavedDashboard('few panels');
+      await PageObjects.dashboard.switchToEditMode();
+      await testSubjects.exists('dashboardAddNewPanelButton');
+      await testSubjects.click('dashboardAddNewPanelButton');
+      await dashboardVisualizations.ensureNewVisualizationDialogIsShowing();
+      await PageObjects.visualize.clickMarkdownWidget();
       await PageObjects.visualize.saveVisualizationExpectSuccess(newTitle, {
         saveAsNew: true,
         redirectToOrigin: false,
diff --git a/test/functional/apps/discover/_shared_links.js b/test/functional/apps/discover/_shared_links.js
index 5c6a70450a0aa..94409a94e9257 100644
--- a/test/functional/apps/discover/_shared_links.js
+++ b/test/functional/apps/discover/_shared_links.js
@@ -26,6 +26,7 @@ export default function ({ getService, getPageObjects }) {
   const kibanaServer = getService('kibanaServer');
   const PageObjects = getPageObjects(['common', 'discover', 'share', 'timePicker']);
   const browser = getService('browser');
+  const toasts = getService('toasts');
 
   describe('shared links', function describeIndexTests() {
     let baseUrl;
@@ -132,28 +133,47 @@ export default function ({ getService, getPageObjects }) {
         await teardown();
       });
 
-      describe('permalink', function () {
-        it('should allow for copying the snapshot URL as a short URL and should open it', async function () {
-          const re = new RegExp(baseUrl + '/goto/[0-9a-f]{32}$');
-          await PageObjects.share.checkShortenUrl();
-          let actualUrl;
-          await retry.try(async () => {
-            actualUrl = await PageObjects.share.getSharedUrl();
-            expect(actualUrl).to.match(re);
-          });
+      it('should allow for copying the snapshot URL as a short URL and should open it', async function () {
+        const re = new RegExp(baseUrl + '/goto/[0-9a-f]{32}$');
+        await PageObjects.share.checkShortenUrl();
+        let actualUrl;
+        await retry.try(async () => {
+          actualUrl = await PageObjects.share.getSharedUrl();
+          expect(actualUrl).to.match(re);
+        });
 
-          const actualTime = await PageObjects.timePicker.getTimeConfig();
-
-          await browser.clearSessionStorage();
-          await browser.get(actualUrl, false);
-          await retry.waitFor('shortUrl resolves and opens', async () => {
-            const resolvedUrl = await browser.getCurrentUrl();
-            expect(resolvedUrl).to.match(/discover/);
-            const resolvedTime = await PageObjects.timePicker.getTimeConfig();
-            expect(resolvedTime.start).to.equal(actualTime.start);
-            expect(resolvedTime.end).to.equal(actualTime.end);
-            return true;
-          });
+        const actualTime = await PageObjects.timePicker.getTimeConfig();
+
+        await browser.clearSessionStorage();
+        await browser.get(actualUrl, false);
+        await retry.waitFor('shortUrl resolves and opens', async () => {
+          const resolvedUrl = await browser.getCurrentUrl();
+          expect(resolvedUrl).to.match(/discover/);
+          const resolvedTime = await PageObjects.timePicker.getTimeConfig();
+          expect(resolvedTime.start).to.equal(actualTime.start);
+          expect(resolvedTime.end).to.equal(actualTime.end);
+          return true;
+        });
+      });
+
+      it("sharing hashed url shouldn't crash the app", async () => {
+        const currentUrl = await browser.getCurrentUrl();
+        const timeBeforeReload = await PageObjects.timePicker.getTimeConfig();
+        await browser.clearSessionStorage();
+        await browser.get(currentUrl, false);
+        await retry.waitFor('discover to open', async () => {
+          const resolvedUrl = await browser.getCurrentUrl();
+          expect(resolvedUrl).to.match(/discover/);
+          const { message } = await toasts.getErrorToast();
+          expect(message).to.contain(
+            'Unable to completely restore the URL, be sure to use the share functionality.'
+          );
+          await toasts.dismissAllToasts();
+          const timeAfterReload = await PageObjects.timePicker.getTimeConfig();
+          expect(timeBeforeReload.start).not.to.be(timeAfterReload.start);
+          expect(timeBeforeReload.end).not.to.be(timeAfterReload.end);
+          await PageObjects.timePicker.setDefaultAbsoluteRange();
+          return true;
         });
       });
     });
diff --git a/test/functional/services/toasts.ts b/test/functional/services/toasts.ts
index 92f1f726fa039..a70e4ba464ae8 100644
--- a/test/functional/services/toasts.ts
+++ b/test/functional/services/toasts.ts
@@ -53,6 +53,16 @@ export function ToastsProvider({ getService }: FtrProviderContext) {
       await dismissButton.click();
     }
 
+    public async dismissAllToasts() {
+      const list = await this.getGlobalToastList();
+      const toasts = await list.findAllByCssSelector(`.euiToast`);
+      for (const toast of toasts) {
+        await toast.moveMouseTo();
+        const dismissButton = await testSubjects.findDescendant('toastCloseButton', toast);
+        await dismissButton.click();
+      }
+    }
+
     private async getToastElement(index: number) {
       const list = await this.getGlobalToastList();
       return await list.findByCssSelector(`.euiToast:nth-child(${index})`);
diff --git a/x-pack/package.json b/x-pack/package.json
index dcba01a771fd5..8fbb94c97c143 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -199,9 +199,9 @@
     "yargs": "4.8.1"
   },
   "dependencies": {
-    "@babel/core": "^7.10.2",
-    "@babel/register": "^7.10.1",
-    "@babel/runtime": "^7.10.2",
+    "@babel/core": "^7.11.1",
+    "@babel/register": "^7.10.5",
+    "@babel/runtime": "^7.11.2",
     "@elastic/apm-rum-react": "^1.1.2",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.9.3",
diff --git a/x-pack/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx b/x-pack/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx
index b0a8d1e990e75..1bb58919b7fa6 100644
--- a/x-pack/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx
+++ b/x-pack/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx
@@ -6,8 +6,8 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-// @ts-expect-error untyped local
-import { ExportApp } from '../export_app';
+import { ExportApp } from '../export_app.component';
+import { CanvasWorkpad } from '../../../../../types';
 
 jest.mock('style-it', () => ({
   it: (css: string, Component: any) => Component,
@@ -23,7 +23,7 @@ jest.mock('../../../../components/link', () => ({
 
 describe('<ExportApp />', () => {
   test('renders as expected', () => {
-    const sampleWorkpad = {
+    const sampleWorkpad = ({
       id: 'my-workpad-abcd',
       css: '',
       pages: [
@@ -34,7 +34,7 @@ describe('<ExportApp />', () => {
           elements: [3, 4, 5, 6],
         },
       ],
-    };
+    } as any) as CanvasWorkpad;
 
     const page1 = mount(
       <ExportApp workpad={sampleWorkpad} selectedPageIndex={0} initializeWorkpad={() => {}} />
diff --git a/x-pack/plugins/canvas/public/apps/export/export/export_app.component.tsx b/x-pack/plugins/canvas/public/apps/export/export/export_app.component.tsx
new file mode 100644
index 0000000000000..03121e749d0dc
--- /dev/null
+++ b/x-pack/plugins/canvas/public/apps/export/export/export_app.component.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useEffect } from 'react';
+import PropTypes from 'prop-types';
+// @ts-expect-error untyped library
+import Style from 'style-it';
+// @ts-expect-error untyped local
+import { WorkpadPage } from '../../../components/workpad_page';
+import { Link } from '../../../components/link';
+import { CanvasWorkpad } from '../../../../types';
+
+interface Props {
+  workpad: CanvasWorkpad;
+  selectedPageIndex: number;
+  initializeWorkpad: () => void;
+}
+
+export const ExportApp: FC<Props> = ({ workpad, selectedPageIndex, initializeWorkpad }) => {
+  const { id, pages, height, width } = workpad;
+  const activePage = pages[selectedPageIndex];
+  const pageElementCount = activePage.elements.length;
+
+  useEffect(() => initializeWorkpad());
+
+  return (
+    <div className="canvasExport" data-shared-page={selectedPageIndex + 1}>
+      <div className="canvasExport__stage">
+        <div className="canvasLayout__stageHeader">
+          <Link name="loadWorkpad" params={{ id }}>
+            Edit Workpad
+          </Link>
+        </div>
+        {Style.it(
+          workpad.css,
+          <div className="canvasExport__stageContent" data-shared-items-count={pageElementCount}>
+            <WorkpadPage
+              isSelected
+              key={activePage.id}
+              pageId={activePage.id}
+              height={height}
+              width={width}
+              registerLayout={() => {}}
+              unregisterLayout={() => {}}
+            />
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
+
+ExportApp.propTypes = {
+  workpad: PropTypes.shape({
+    id: PropTypes.string.isRequired,
+    pages: PropTypes.array.isRequired,
+  }).isRequired,
+  selectedPageIndex: PropTypes.number.isRequired,
+  initializeWorkpad: PropTypes.func.isRequired,
+};
diff --git a/x-pack/plugins/canvas/public/apps/export/export/export_app.js b/x-pack/plugins/canvas/public/apps/export/export/export_app.js
deleted file mode 100644
index 1d02d85cae0b3..0000000000000
--- a/x-pack/plugins/canvas/public/apps/export/export/export_app.js
+++ /dev/null
@@ -1,59 +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 React from 'react';
-import PropTypes from 'prop-types';
-import Style from 'style-it';
-import { WorkpadPage } from '../../../components/workpad_page';
-import { Link } from '../../../components/link';
-
-export class ExportApp extends React.PureComponent {
-  static propTypes = {
-    workpad: PropTypes.shape({
-      id: PropTypes.string.isRequired,
-      pages: PropTypes.array.isRequired,
-    }).isRequired,
-    selectedPageIndex: PropTypes.number.isRequired,
-    initializeWorkpad: PropTypes.func.isRequired,
-  };
-
-  componentDidMount() {
-    this.props.initializeWorkpad();
-  }
-
-  render() {
-    const { workpad, selectedPageIndex } = this.props;
-    const { pages, height, width } = workpad;
-    const activePage = pages[selectedPageIndex];
-    const pageElementCount = activePage.elements.length;
-
-    return (
-      <div className="canvasExport" data-shared-page={selectedPageIndex + 1}>
-        <div className="canvasExport__stage">
-          <div className="canvasLayout__stageHeader">
-            <Link name="loadWorkpad" params={{ id: this.props.workpad.id }}>
-              Edit Workpad
-            </Link>
-          </div>
-          {Style.it(
-            workpad.css,
-            <div className="canvasExport__stageContent" data-shared-items-count={pageElementCount}>
-              <WorkpadPage
-                isSelected
-                key={activePage.id}
-                pageId={activePage.id}
-                height={height}
-                width={width}
-                registerLayout={() => {}}
-                unregisterLayout={() => {}}
-              />
-            </div>
-          )}
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/x-pack/plugins/canvas/public/apps/export/export/export_app.ts b/x-pack/plugins/canvas/public/apps/export/export/export_app.ts
new file mode 100644
index 0000000000000..b47d1950ec2b7
--- /dev/null
+++ b/x-pack/plugins/canvas/public/apps/export/export/export_app.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 { connect } from 'react-redux';
+import { initializeWorkpad } from '../../../state/actions/workpad';
+import { getWorkpad, getSelectedPageIndex } from '../../../state/selectors/workpad';
+import { ExportApp as Component } from './export_app.component';
+import { State } from '../../../../types';
+
+export const ExportApp = connect(
+  (state: State) => ({
+    workpad: getWorkpad(state),
+    selectedPageIndex: getSelectedPageIndex(state),
+  }),
+  (dispatch) => ({
+    initializeWorkpad: () => dispatch(initializeWorkpad()),
+  })
+)(Component);
diff --git a/x-pack/plugins/canvas/public/apps/export/export/index.js b/x-pack/plugins/canvas/public/apps/export/export/index.js
deleted file mode 100644
index 95c46d9e1c8ae..0000000000000
--- a/x-pack/plugins/canvas/public/apps/export/export/index.js
+++ /dev/null
@@ -1,30 +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 { connect } from 'react-redux';
-import { compose, branch, renderComponent } from 'recompose';
-import { initializeWorkpad } from '../../../state/actions/workpad';
-import { getWorkpad, getSelectedPageIndex } from '../../../state/selectors/workpad';
-import { LoadWorkpad } from './load_workpad';
-import { ExportApp as Component } from './export_app';
-
-const mapStateToProps = (state) => ({
-  workpad: getWorkpad(state),
-  selectedPageIndex: getSelectedPageIndex(state),
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  initializeWorkpad() {
-    dispatch(initializeWorkpad());
-  },
-});
-
-const branches = [branch(({ workpad }) => workpad == null, renderComponent(LoadWorkpad))];
-
-export const ExportApp = compose(
-  connect(mapStateToProps, mapDispatchToProps),
-  ...branches
-)(Component);
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/load_workpad.js b/x-pack/plugins/canvas/public/apps/export/export/index.ts
similarity index 67%
rename from x-pack/plugins/canvas/public/apps/workpad/workpad_app/load_workpad.js
rename to x-pack/plugins/canvas/public/apps/export/export/index.ts
index 388bf00723f82..81939d550a7ab 100644
--- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/load_workpad.js
+++ b/x-pack/plugins/canvas/public/apps/export/export/index.ts
@@ -4,6 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-
-export const LoadWorkpad = () => <div>Load a workpad...</div>;
+export { ExportApp } from './export_app';
+export { ExportApp as ExportAppComponent } from './export_app.component';
diff --git a/x-pack/plugins/canvas/public/apps/export/index.js b/x-pack/plugins/canvas/public/apps/export/index.ts
similarity index 100%
rename from x-pack/plugins/canvas/public/apps/export/index.js
rename to x-pack/plugins/canvas/public/apps/export/index.ts
diff --git a/x-pack/plugins/canvas/public/apps/export/routes.js b/x-pack/plugins/canvas/public/apps/export/routes.ts
similarity index 79%
rename from x-pack/plugins/canvas/public/apps/export/routes.js
rename to x-pack/plugins/canvas/public/apps/export/routes.ts
index 33e375115aa19..0b4f74149fb4f 100644
--- a/x-pack/plugins/canvas/public/apps/export/routes.js
+++ b/x-pack/plugins/canvas/public/apps/export/routes.ts
@@ -4,10 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Dispatch } from 'redux';
+// @ts-expect-error Untyped local
 import * as workpadService from '../../lib/workpad_service';
 import { setWorkpad } from '../../state/actions/workpad';
+// @ts-expect-error Untyped local
 import { fetchAllRenderables } from '../../state/actions/elements';
+// @ts-expect-error Untyped local
 import { setPage } from '../../state/actions/pages';
+// @ts-expect-error Untyped local
 import { setAssets } from '../../state/actions/assets';
 import { ExportApp } from './export';
 
@@ -18,7 +23,13 @@ export const routes = [
       {
         name: 'exportWorkpad',
         path: '/pdf/:id/page/:page',
-        action: (dispatch) => async ({ params, router }) => {
+        action: (dispatch: Dispatch) => async ({
+          params,
+          // @ts-expect-error Fix when Router is typed.
+          router,
+        }: {
+          params: { id: string; page: string };
+        }) => {
           // load workpad if given a new id via url param
           const fetchedWorkpad = await workpadService.get(params.id);
           const pageNumber = parseInt(params.page, 10);
diff --git a/x-pack/plugins/canvas/public/apps/home/home_app/home_app.js b/x-pack/plugins/canvas/public/apps/home/home_app/home_app.component.tsx
similarity index 79%
rename from x-pack/plugins/canvas/public/apps/home/home_app/home_app.js
rename to x-pack/plugins/canvas/public/apps/home/home_app/home_app.component.tsx
index bfa4abbf7c56d..3c2e989cc8e51 100644
--- a/x-pack/plugins/canvas/public/apps/home/home_app/home_app.js
+++ b/x-pack/plugins/canvas/public/apps/home/home_app/home_app.component.tsx
@@ -4,12 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { FC } from 'react';
 import { EuiPage, EuiPageBody, EuiPageContent } from '@elastic/eui';
+// @ts-expect-error untyped local
 import { WorkpadManager } from '../../../components/workpad_manager';
+// @ts-expect-error untyped local
 import { setDocTitle } from '../../../lib/doc_title';
 
-export const HomeApp = ({ onLoad = () => {} }) => {
+interface Props {
+  onLoad: () => void;
+}
+
+export const HomeApp: FC<Props> = ({ onLoad = () => {} }) => {
   onLoad();
   setDocTitle('Canvas');
   return (
diff --git a/x-pack/plugins/canvas/public/apps/home/home_app/index.js b/x-pack/plugins/canvas/public/apps/home/home_app/home_app.ts
similarity index 69%
rename from x-pack/plugins/canvas/public/apps/home/home_app/index.js
rename to x-pack/plugins/canvas/public/apps/home/home_app/home_app.ts
index f78ee1f8a18af..ff9d1c1cc63ac 100644
--- a/x-pack/plugins/canvas/public/apps/home/home_app/index.js
+++ b/x-pack/plugins/canvas/public/apps/home/home_app/home_app.ts
@@ -6,12 +6,10 @@
 
 import { connect } from 'react-redux';
 import { resetWorkpad } from '../../../state/actions/workpad';
-import { HomeApp as Component } from './home_app';
+import { HomeApp as Component } from './home_app.component';
 
-const mapDispatchToProps = (dispatch) => ({
+export const HomeApp = connect(null, (dispatch) => ({
   onLoad() {
     dispatch(resetWorkpad());
   },
-});
-
-export const HomeApp = connect(null, mapDispatchToProps)(Component);
+}))(Component);
diff --git a/x-pack/plugins/canvas/public/apps/export/export/load_workpad.js b/x-pack/plugins/canvas/public/apps/home/home_app/index.ts
similarity index 69%
rename from x-pack/plugins/canvas/public/apps/export/export/load_workpad.js
rename to x-pack/plugins/canvas/public/apps/home/home_app/index.ts
index 388bf00723f82..8ea92312e3e50 100644
--- a/x-pack/plugins/canvas/public/apps/export/export/load_workpad.js
+++ b/x-pack/plugins/canvas/public/apps/home/home_app/index.ts
@@ -4,6 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-
-export const LoadWorkpad = () => <div>Load a workpad...</div>;
+export { HomeApp } from './home_app';
+export { HomeApp as HomeAppComponent } from './home_app.component';
diff --git a/x-pack/plugins/canvas/public/apps/home/index.js b/x-pack/plugins/canvas/public/apps/home/index.ts
similarity index 100%
rename from x-pack/plugins/canvas/public/apps/home/index.js
rename to x-pack/plugins/canvas/public/apps/home/index.ts
diff --git a/x-pack/plugins/canvas/public/apps/home/routes.js b/x-pack/plugins/canvas/public/apps/home/routes.ts
similarity index 100%
rename from x-pack/plugins/canvas/public/apps/home/routes.js
rename to x-pack/plugins/canvas/public/apps/home/routes.ts
diff --git a/x-pack/plugins/canvas/public/apps/index.js b/x-pack/plugins/canvas/public/apps/index.ts
similarity index 88%
rename from x-pack/plugins/canvas/public/apps/index.js
rename to x-pack/plugins/canvas/public/apps/index.ts
index c014349ca18da..8b3d378e23f80 100644
--- a/x-pack/plugins/canvas/public/apps/index.js
+++ b/x-pack/plugins/canvas/public/apps/index.ts
@@ -8,6 +8,7 @@ import * as home from './home';
 import * as workpad from './workpad';
 import * as exp from './export';
 
+// @ts-expect-error Router and routes are not yet strongly typed
 export const routes = [].concat(workpad.routes, home.routes, exp.routes);
 
 export const apps = [workpad.WorkpadApp, home.HomeApp, exp.ExportApp];
diff --git a/x-pack/plugins/canvas/public/apps/workpad/index.js b/x-pack/plugins/canvas/public/apps/workpad/index.ts
similarity index 100%
rename from x-pack/plugins/canvas/public/apps/workpad/index.js
rename to x-pack/plugins/canvas/public/apps/workpad/index.ts
diff --git a/x-pack/plugins/canvas/public/apps/workpad/routes.js b/x-pack/plugins/canvas/public/apps/workpad/routes.ts
similarity index 82%
rename from x-pack/plugins/canvas/public/apps/workpad/routes.js
rename to x-pack/plugins/canvas/public/apps/workpad/routes.ts
index a330020b741ac..d83f85f717305 100644
--- a/x-pack/plugins/canvas/public/apps/workpad/routes.js
+++ b/x-pack/plugins/canvas/public/apps/workpad/routes.ts
@@ -4,17 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ErrorStrings } from '../../../i18n';
+import { Dispatch } from 'redux';
+// @ts-expect-error
 import * as workpadService from '../../lib/workpad_service';
 import { notifyService } from '../../services';
 import { getBaseBreadcrumb, getWorkpadBreadcrumb, setBreadcrumb } from '../../lib/breadcrumbs';
+// @ts-expect-error
 import { getDefaultWorkpad } from '../../state/defaults';
 import { setWorkpad } from '../../state/actions/workpad';
+// @ts-expect-error
 import { setAssets, resetAssets } from '../../state/actions/assets';
+// @ts-expect-error
 import { setPage } from '../../state/actions/pages';
 import { getWorkpad } from '../../state/selectors/workpad';
+// @ts-expect-error
 import { setZoomScale } from '../../state/actions/transient';
+import { ErrorStrings } from '../../../i18n';
 import { WorkpadApp } from './workpad_app';
+import { State } from '../../../types';
 
 const { workpadRoutes: strings } = ErrorStrings;
 
@@ -25,7 +32,8 @@ export const routes = [
       {
         name: 'createWorkpad',
         path: '/create',
-        action: (dispatch) => async ({ router }) => {
+        // @ts-expect-error Fix when Router is typed.
+        action: (dispatch: Dispatch) => async ({ router }) => {
           const newWorkpad = getDefaultWorkpad();
           try {
             await workpadService.create(newWorkpad);
@@ -46,7 +54,13 @@ export const routes = [
       {
         name: 'loadWorkpad',
         path: '/:id(/page/:page)',
-        action: (dispatch, getState) => async ({ params, router }) => {
+        action: (dispatch: Dispatch, getState: () => State) => async ({
+          params,
+          // @ts-expect-error Fix when Router is typed.
+          router,
+        }: {
+          params: { id: string; page?: string };
+        }) => {
           // load workpad if given a new id via url param
           const state = getState();
           const currentWorkpad = getWorkpad(state);
@@ -70,10 +84,10 @@ export const routes = [
 
           // fetch the workpad again, to get changes
           const workpad = getWorkpad(getState());
-          const pageNumber = parseInt(params.page, 10);
+          const pageNumber = params.page ? parseInt(params.page, 10) : null;
 
           // no page provided, append current page to url
-          if (isNaN(pageNumber)) {
+          if (!pageNumber || isNaN(pageNumber)) {
             return router.redirectTo('loadWorkpad', { id: workpad.id, page: workpad.page + 1 });
           }
 
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.js b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.js
deleted file mode 100644
index ac50cd3fb99b6..0000000000000
--- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.js
+++ /dev/null
@@ -1,41 +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 { connect } from 'react-redux';
-import { compose, branch, renderComponent } from 'recompose';
-import { selectToplevelNodes } from '../../../state/actions/transient';
-import { canUserWrite, getAppReady } from '../../../state/selectors/app';
-import { getWorkpad, isWriteable } from '../../../state/selectors/workpad';
-import { LoadWorkpad } from './load_workpad';
-import { WorkpadApp as Component } from './workpad_app';
-import { withElementsLoadedTelemetry } from './workpad_telemetry';
-
-export { WORKPAD_CONTAINER_ID } from './workpad_app';
-
-const mapStateToProps = (state) => {
-  const appReady = getAppReady(state);
-
-  return {
-    isWriteable: isWriteable(state) && canUserWrite(state),
-    appReady: typeof appReady === 'object' ? appReady : { ready: appReady },
-    workpad: getWorkpad(state),
-  };
-};
-
-const mapDispatchToProps = (dispatch) => ({
-  deselectElement(ev) {
-    ev && ev.stopPropagation();
-    dispatch(selectToplevelNodes([]));
-  },
-});
-
-const branches = [branch(({ workpad }) => workpad == null, renderComponent(LoadWorkpad))];
-
-export const WorkpadApp = compose(
-  connect(mapStateToProps, mapDispatchToProps),
-  ...branches,
-  withElementsLoadedTelemetry
-)(Component);
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.ts b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.ts
new file mode 100644
index 0000000000000..a00bf855ba376
--- /dev/null
+++ b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { WorkpadApp } from './workpad_app';
+export { WorkpadApp as WorkpadAppComponent } from './workpad_app.component';
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.component.tsx b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.component.tsx
new file mode 100644
index 0000000000000..791f40f0219cd
--- /dev/null
+++ b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.component.tsx
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, MouseEventHandler, useRef } from 'react';
+import PropTypes from 'prop-types';
+import { Sidebar } from '../../../components/sidebar';
+import { Toolbar } from '../../../components/toolbar';
+// @ts-expect-error Untyped local
+import { Workpad } from '../../../components/workpad';
+import { WorkpadHeader } from '../../../components/workpad_header';
+import { CANVAS_LAYOUT_STAGE_CONTENT_SELECTOR } from '../../../../common/lib/constants';
+import { CommitFn } from '../../../../types';
+
+export const WORKPAD_CONTAINER_ID = 'canvasWorkpadContainer';
+
+interface Props {
+  deselectElement?: MouseEventHandler;
+  isWriteable: boolean;
+}
+
+export const WorkpadApp: FC<Props> = ({ deselectElement, isWriteable }) => {
+  const interactivePageLayout = useRef<CommitFn | null>(null); // future versions may enable editing on multiple pages => use array then
+
+  const registerLayout = (newLayout: CommitFn) => {
+    if (interactivePageLayout.current !== newLayout) {
+      interactivePageLayout.current = newLayout;
+    }
+  };
+
+  const unregisterLayout = (oldLayout: CommitFn) => {
+    if (interactivePageLayout.current === oldLayout) {
+      interactivePageLayout.current = null;
+    }
+  };
+
+  const commit = interactivePageLayout.current || (() => {});
+
+  return (
+    <div className="canvasLayout">
+      <div className="canvasLayout__rows">
+        <div className="canvasLayout__cols">
+          <div className="canvasLayout__stage">
+            <div className="canvasLayout__stageHeader">
+              <WorkpadHeader commit={commit} />
+            </div>
+
+            <div
+              id={CANVAS_LAYOUT_STAGE_CONTENT_SELECTOR}
+              className={CANVAS_LAYOUT_STAGE_CONTENT_SELECTOR}
+              onMouseDown={deselectElement}
+            >
+              {/* NOTE: canvasWorkpadContainer is used for exporting */}
+              <div
+                id={WORKPAD_CONTAINER_ID}
+                className="canvasWorkpadContainer canvasLayout__stageContentOverflow"
+              >
+                <Workpad registerLayout={registerLayout} unregisterLayout={unregisterLayout} />
+              </div>
+            </div>
+          </div>
+
+          {isWriteable && (
+            <div className="canvasLayout__sidebar hide-for-sharing">
+              <Sidebar commit={commit} />
+            </div>
+          )}
+        </div>
+
+        <div className="canvasLayout__footer hide-for-sharing">
+          <Toolbar />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+WorkpadApp.propTypes = {
+  isWriteable: PropTypes.bool.isRequired,
+  deselectElement: PropTypes.func,
+};
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.js b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.js
deleted file mode 100644
index fc3ac9922355a..0000000000000
--- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.js
+++ /dev/null
@@ -1,81 +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 React from 'react';
-import PropTypes from 'prop-types';
-import { Sidebar } from '../../../components/sidebar';
-import { Toolbar } from '../../../components/toolbar';
-import { Workpad } from '../../../components/workpad';
-import { WorkpadHeader } from '../../../components/workpad_header';
-import { CANVAS_LAYOUT_STAGE_CONTENT_SELECTOR } from '../../../../common/lib/constants';
-
-export const WORKPAD_CONTAINER_ID = 'canvasWorkpadContainer';
-
-export class WorkpadApp extends React.PureComponent {
-  static propTypes = {
-    isWriteable: PropTypes.bool.isRequired,
-    deselectElement: PropTypes.func,
-  };
-
-  interactivePageLayout = null; // future versions may enable editing on multiple pages => use array then
-
-  registerLayout(newLayout) {
-    if (this.interactivePageLayout !== newLayout) {
-      this.interactivePageLayout = newLayout;
-    }
-  }
-
-  unregisterLayout(oldLayout) {
-    if (this.interactivePageLayout === oldLayout) {
-      this.interactivePageLayout = null;
-    }
-  }
-
-  render() {
-    const { isWriteable, deselectElement } = this.props;
-
-    return (
-      <div className="canvasLayout">
-        <div className="canvasLayout__rows">
-          <div className="canvasLayout__cols">
-            <div className="canvasLayout__stage">
-              <div className="canvasLayout__stageHeader">
-                <WorkpadHeader commit={this.interactivePageLayout || (() => {})} />
-              </div>
-
-              <div
-                id={CANVAS_LAYOUT_STAGE_CONTENT_SELECTOR}
-                className={CANVAS_LAYOUT_STAGE_CONTENT_SELECTOR}
-                onMouseDown={deselectElement}
-              >
-                {/* NOTE: canvasWorkpadContainer is used for exporting */}
-                <div
-                  id={WORKPAD_CONTAINER_ID}
-                  className="canvasWorkpadContainer canvasLayout__stageContentOverflow"
-                >
-                  <Workpad
-                    registerLayout={this.registerLayout.bind(this)}
-                    unregisterLayout={this.unregisterLayout.bind(this)}
-                  />
-                </div>
-              </div>
-            </div>
-
-            {isWriteable && (
-              <div className="canvasLayout__sidebar hide-for-sharing">
-                <Sidebar />
-              </div>
-            )}
-          </div>
-
-          <div className="canvasLayout__footer hide-for-sharing">
-            <Toolbar />
-          </div>
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.ts b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.ts
new file mode 100644
index 0000000000000..46f2efaf5e7d2
--- /dev/null
+++ b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.ts
@@ -0,0 +1,32 @@
+/*
+ * 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 { MouseEventHandler } from 'react';
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+// @ts-expect-error untyped local
+import { selectToplevelNodes } from '../../../state/actions/transient';
+import { canUserWrite } from '../../../state/selectors/app';
+import { getWorkpad, isWriteable } from '../../../state/selectors/workpad';
+import { WorkpadApp as Component } from './workpad_app.component';
+import { withElementsLoadedTelemetry } from './workpad_telemetry';
+import { State } from '../../../../types';
+
+export { WORKPAD_CONTAINER_ID } from './workpad_app.component';
+
+const mapDispatchToProps = (dispatch: Dispatch): { deselectElement: MouseEventHandler } => ({
+  deselectElement: (ev) => {
+    ev.stopPropagation();
+    dispatch(selectToplevelNodes([]));
+  },
+});
+
+export const WorkpadApp = connect(
+  (state: State) => ({
+    isWriteable: isWriteable(state) && canUserWrite(state),
+    workpad: getWorkpad(state),
+  }),
+  mapDispatchToProps
+)(withElementsLoadedTelemetry(Component));
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
index eb4b451896b46..b1e87ca67f5e5 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.component.tsx
@@ -18,22 +18,25 @@ import { EditMenu } from './edit_menu';
 import { ElementMenu } from './element_menu';
 import { ShareMenu } from './share_menu';
 import { ViewMenu } from './view_menu';
+import { CommitFn } from '../../../types';
 
 const { WorkpadHeader: strings } = ComponentStrings;
 
 export interface Props {
   isWriteable: boolean;
-  toggleWriteable: () => void;
   canUserWrite: boolean;
-  commit: (type: string, payload: any) => any;
+  commit: CommitFn;
+  onSetWriteable?: (writeable: boolean) => void;
 }
 
 export const WorkpadHeader: FunctionComponent<Props> = ({
   isWriteable,
   canUserWrite,
-  toggleWriteable,
   commit,
+  onSetWriteable = () => {},
 }) => {
+  const toggleWriteable = () => onSetWriteable(!isWriteable);
+
   const keyHandler = (action: string) => {
     if (action === 'EDITING') {
       toggleWriteable();
@@ -145,6 +148,7 @@ export const WorkpadHeader: FunctionComponent<Props> = ({
 
 WorkpadHeader.propTypes = {
   isWriteable: PropTypes.bool,
-  toggleWriteable: PropTypes.func,
+  commit: PropTypes.func.isRequired,
+  onSetWriteable: PropTypes.func,
   canUserWrite: PropTypes.bool,
 };
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.tsx b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.tsx
index 1f630040b0c36..0661aa4be4313 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.tsx
@@ -10,37 +10,16 @@ import { canUserWrite } from '../../state/selectors/app';
 import { getSelectedPage, isWriteable } from '../../state/selectors/workpad';
 import { setWriteable } from '../../state/actions/workpad';
 import { State } from '../../../types';
-import { WorkpadHeader as Component, Props as ComponentProps } from './workpad_header.component';
+import { WorkpadHeader as Component } from './workpad_header.component';
 
-interface StateProps {
-  isWriteable: boolean;
-  canUserWrite: boolean;
-  selectedPage: string;
-}
-
-interface DispatchProps {
-  setWriteable: (isWorkpadWriteable: boolean) => void;
-}
-
-const mapStateToProps = (state: State): StateProps => ({
+const mapStateToProps = (state: State) => ({
   isWriteable: isWriteable(state) && canUserWrite(state),
   canUserWrite: canUserWrite(state),
   selectedPage: getSelectedPage(state),
 });
 
 const mapDispatchToProps = (dispatch: Dispatch) => ({
-  setWriteable: (isWorkpadWriteable: boolean) => dispatch(setWriteable(isWorkpadWriteable)),
-});
-
-const mergeProps = (
-  stateProps: StateProps,
-  dispatchProps: DispatchProps,
-  ownProps: ComponentProps
-): ComponentProps => ({
-  ...stateProps,
-  ...dispatchProps,
-  ...ownProps,
-  toggleWriteable: () => dispatchProps.setWriteable(!stateProps.isWriteable),
+  onSetWriteable: (isWorkpadWriteable: boolean) => dispatch(setWriteable(isWorkpadWriteable)),
 });
 
-export const WorkpadHeader = connect(mapStateToProps, mapDispatchToProps, mergeProps)(Component);
+export const WorkpadHeader = connect(mapStateToProps, mapDispatchToProps)(Component);
diff --git a/x-pack/plugins/canvas/types/canvas.ts b/x-pack/plugins/canvas/types/canvas.ts
index cc07f498f1eec..6b3f9ad3e8043 100644
--- a/x-pack/plugins/canvas/types/canvas.ts
+++ b/x-pack/plugins/canvas/types/canvas.ts
@@ -76,3 +76,7 @@ export interface CanvasWorkpadBoundingBox {
   top: number;
   bottom: number;
 }
+
+export type LayoutState = any;
+
+export type CommitFn = (type: string, payload: any) => LayoutState;
diff --git a/x-pack/plugins/discover_enhanced/server/config.ts b/x-pack/plugins/discover_enhanced/server/config.ts
index becbdee1bfe40..3e5e29e8c7de7 100644
--- a/x-pack/plugins/discover_enhanced/server/config.ts
+++ b/x-pack/plugins/discover_enhanced/server/config.ts
@@ -10,7 +10,7 @@ import { PluginConfigDescriptor } from '../../../../src/core/server';
 export const configSchema = schema.object({
   actions: schema.object({
     exploreDataInChart: schema.object({
-      enabled: schema.boolean({ defaultValue: true }),
+      enabled: schema.boolean({ defaultValue: false }),
     }),
   }),
 });
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js b/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
index 943f663a025d8..c6da347ed8cfe 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
@@ -5,16 +5,23 @@
  */
 
 import React from 'react';
+import { act } from 'react-dom/test-utils';
 import moment from 'moment-timezone';
 import { Provider } from 'react-redux';
 // axios has a $http like interface so using it to simulate $http
 import axios from 'axios';
 import axiosXhrAdapter from 'axios/lib/adapters/xhr';
-import sinon from 'sinon';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
+import { init as initHttpRequests } from './helpers/http_requests';
+import {
+  notificationServiceMock,
+  fatalErrorsServiceMock,
+} from '../../../../../src/core/public/mocks';
+import { usageCollectionPluginMock } from '../../../../../src/plugins/usage_collection/public/mocks';
+
 import { mountWithIntl } from '../../../../test_utils/enzyme_helpers';
-import { fetchedPolicies, fetchedNodes } from '../../public/application/store/actions';
+import { fetchedPolicies } from '../../public/application/store/actions';
 import { indexLifecycleManagementStore } from '../../public/application/store';
 import { EditPolicy } from '../../public/application/sections/edit_policy';
 import { init as initHttp } from '../../public/application/services/http';
@@ -33,15 +40,17 @@ import {
   policyNameMustBeDifferentErrorMessage,
   policyNameAlreadyUsedErrorMessage,
   maximumDocumentsRequiredMessage,
-} from '../../public/application/store/selectors/lifecycle';
+} from '../../public/application/store/selectors';
 
-initHttp(axios.create({ adapter: axiosXhrAdapter }), (path) => path);
-initUiMetric({ reportUiStats: () => {} });
-initNotification({
-  addDanger: () => {},
-});
+initHttp(axios.create({ adapter: axiosXhrAdapter }));
+initUiMetric(usageCollectionPluginMock.createSetupContract());
+initNotification(
+  notificationServiceMock.createSetupContract().toasts,
+  fatalErrorsServiceMock.createSetupContract()
+);
 
 let server;
+let httpRequestsMockHelpers;
 let store;
 const policy = {
   phases: {
@@ -70,9 +79,11 @@ for (let i = 0; i < 105; i++) {
 window.scrollTo = jest.fn();
 window.TextEncoder = null;
 let component;
-const activatePhase = (rendered, phase) => {
+const activatePhase = async (rendered, phase) => {
   const testSubject = `enablePhaseSwitch-${phase}`;
-  findTestSubject(rendered, testSubject).simulate('click');
+  await act(async () => {
+    await findTestSubject(rendered, testSubject).simulate('click');
+  });
   rendered.update();
 };
 const expectedErrorMessages = (rendered, expectedErrorMessages) => {
@@ -120,16 +131,13 @@ describe('edit policy', () => {
     store = indexLifecycleManagementStore();
     component = (
       <Provider store={store}>
-        <EditPolicy getUrlForApp={() => {}} />
+        <EditPolicy history={{ push: () => {} }} getUrlForApp={() => {}} />
       </Provider>
     );
     store.dispatch(fetchedPolicies(policies));
-    server = sinon.fakeServer.create();
-    server.respondWith('/api/index_lifecycle_management/policies', [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(policies),
-    ]);
+    ({ server, httpRequestsMockHelpers } = initHttpRequests());
+
+    httpRequestsMockHelpers.setPoliciesResponse(policies);
   });
   describe('top level form', () => {
     test('should show error when trying to save empty form', () => {
@@ -242,48 +250,53 @@ describe('edit policy', () => {
     });
   });
   describe('warm phase', () => {
-    test('should show number required error when trying to save empty warm phase', () => {
+    beforeEach(() => {
+      server.respondImmediately = true;
+      httpRequestsMockHelpers.setNodesListResponse({});
+    });
+
+    test('should show number required error when trying to save empty warm phase', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       setPhaseAfter(rendered, 'warm', '');
       save(rendered);
       expectedErrorMessages(rendered, [numberRequiredMessage]);
     });
-    test('should allow 0 for phase timing', () => {
+    test('should allow 0 for phase timing', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       setPhaseAfter(rendered, 'warm', 0);
       save(rendered);
       expectedErrorMessages(rendered, []);
     });
-    test('should show positive number required error when trying to save warm phase with -1 for after', () => {
+    test('should show positive number required error when trying to save warm phase with -1 for after', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       setPhaseAfter(rendered, 'warm', -1);
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumberRequiredMessage]);
     });
-    test('should show positive number required error when trying to save warm phase with -1 for index priority', () => {
+    test('should show positive number required error when trying to save warm phase with -1 for index priority', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       setPhaseAfter(rendered, 'warm', 1);
       setPhaseIndexPriority(rendered, 'warm', -1);
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumberRequiredMessage]);
     });
-    test('should show positive number required above zero error when trying to save warm phase with 0 for shrink', () => {
+    test('should show positive number required above zero error when trying to save warm phase with 0 for shrink', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       findTestSubject(rendered, 'shrinkSwitch').simulate('click');
       rendered.update();
       setPhaseAfter(rendered, 'warm', 1);
@@ -293,11 +306,11 @@ describe('edit policy', () => {
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumbersAboveZeroErrorMessage]);
     });
-    test('should show positive number above 0 required error when trying to save warm phase with -1 for shrink', () => {
+    test('should show positive number above 0 required error when trying to save warm phase with -1 for shrink', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       setPhaseAfter(rendered, 'warm', 1);
       findTestSubject(rendered, 'shrinkSwitch').simulate('click');
       rendered.update();
@@ -307,11 +320,11 @@ describe('edit policy', () => {
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumbersAboveZeroErrorMessage]);
     });
-    test('should show positive number required above zero error when trying to save warm phase with 0 for force merge', () => {
+    test('should show positive number required above zero error when trying to save warm phase with 0 for force merge', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       setPhaseAfter(rendered, 'warm', 1);
       findTestSubject(rendered, 'forceMergeSwitch').simulate('click');
       rendered.update();
@@ -321,11 +334,11 @@ describe('edit policy', () => {
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumbersAboveZeroErrorMessage]);
     });
-    test('should show positive number above 0 required error when trying to save warm phase with -1 for force merge', () => {
+    test('should show positive number above 0 required error when trying to save warm phase with -1 for force merge', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       setPhaseAfter(rendered, 'warm', 1);
       findTestSubject(rendered, 'forceMergeSwitch').simulate('click');
       rendered.update();
@@ -335,43 +348,43 @@ describe('edit policy', () => {
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumbersAboveZeroErrorMessage]);
     });
-    test('should show spinner for node attributes input when loading', () => {
+    test('should show spinner for node attributes input when loading', async () => {
+      server.respondImmediately = false;
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       expect(rendered.find('.euiLoadingSpinner').exists()).toBeTruthy();
       expect(rendered.find('.euiCallOut--warning').exists()).toBeFalsy();
       expect(getNodeAttributeSelect(rendered, 'warm').exists()).toBeFalsy();
     });
-    test('should show warning instead of node attributes input when none exist', () => {
-      store.dispatch(fetchedNodes({}));
+    test('should show warning instead of node attributes input when none exist', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       expect(rendered.find('.euiLoadingSpinner').exists()).toBeFalsy();
       expect(rendered.find('.euiCallOut--warning').exists()).toBeTruthy();
       expect(getNodeAttributeSelect(rendered, 'warm').exists()).toBeFalsy();
     });
-    test('should show node attributes input when attributes exist', () => {
-      store.dispatch(fetchedNodes({ 'attribute:true': ['node1'] }));
+    test('should show node attributes input when attributes exist', async () => {
+      httpRequestsMockHelpers.setNodesListResponse({ 'attribute:true': ['node1'] });
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       expect(rendered.find('.euiLoadingSpinner').exists()).toBeFalsy();
       expect(rendered.find('.euiCallOut--warning').exists()).toBeFalsy();
       const nodeAttributesSelect = getNodeAttributeSelect(rendered, 'warm');
       expect(nodeAttributesSelect.exists()).toBeTruthy();
       expect(nodeAttributesSelect.find('option').length).toBe(2);
     });
-    test('should show view node attributes link when attribute selected and show flyout when clicked', () => {
-      store.dispatch(fetchedNodes({ 'attribute:true': ['node1'] }));
+    test('should show view node attributes link when attribute selected and show flyout when clicked', async () => {
+      httpRequestsMockHelpers.setNodesListResponse({ 'attribute:true': ['node1'] });
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'warm');
+      await activatePhase(rendered, 'warm');
       expect(rendered.find('.euiLoadingSpinner').exists()).toBeFalsy();
       expect(rendered.find('.euiCallOut--warning').exists()).toBeFalsy();
       const nodeAttributesSelect = getNodeAttributeSelect(rendered, 'warm');
@@ -388,61 +401,65 @@ describe('edit policy', () => {
     });
   });
   describe('cold phase', () => {
-    test('should allow 0 for phase timing', () => {
+    beforeEach(() => {
+      server.respondImmediately = true;
+      httpRequestsMockHelpers.setNodesListResponse({});
+    });
+    test('should allow 0 for phase timing', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'cold');
+      await activatePhase(rendered, 'cold');
       setPhaseAfter(rendered, 'cold', 0);
       save(rendered);
       expectedErrorMessages(rendered, []);
     });
-    test('should show positive number required error when trying to save cold phase with -1 for after', () => {
+    test('should show positive number required error when trying to save cold phase with -1 for after', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'cold');
+      await activatePhase(rendered, 'cold');
       setPhaseAfter(rendered, 'cold', -1);
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumberRequiredMessage]);
     });
-    test('should show spinner for node attributes input when loading', () => {
+    test('should show spinner for node attributes input when loading', async () => {
+      server.respondImmediately = false;
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'cold');
+      await activatePhase(rendered, 'cold');
       expect(rendered.find('.euiLoadingSpinner').exists()).toBeTruthy();
       expect(rendered.find('.euiCallOut--warning').exists()).toBeFalsy();
       expect(getNodeAttributeSelect(rendered, 'cold').exists()).toBeFalsy();
     });
-    test('should show warning instead of node attributes input when none exist', () => {
-      store.dispatch(fetchedNodes({}));
+    test('should show warning instead of node attributes input when none exist', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'cold');
+      await activatePhase(rendered, 'cold');
       expect(rendered.find('.euiLoadingSpinner').exists()).toBeFalsy();
       expect(rendered.find('.euiCallOut--warning').exists()).toBeTruthy();
       expect(getNodeAttributeSelect(rendered, 'cold').exists()).toBeFalsy();
     });
-    test('should show node attributes input when attributes exist', () => {
-      store.dispatch(fetchedNodes({ 'attribute:true': ['node1'] }));
+    test('should show node attributes input when attributes exist', async () => {
+      httpRequestsMockHelpers.setNodesListResponse({ 'attribute:true': ['node1'] });
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'cold');
+      await activatePhase(rendered, 'cold');
       expect(rendered.find('.euiLoadingSpinner').exists()).toBeFalsy();
       expect(rendered.find('.euiCallOut--warning').exists()).toBeFalsy();
       const nodeAttributesSelect = getNodeAttributeSelect(rendered, 'cold');
       expect(nodeAttributesSelect.exists()).toBeTruthy();
       expect(nodeAttributesSelect.find('option').length).toBe(2);
     });
-    test('should show view node attributes link when attribute selected and show flyout when clicked', () => {
-      store.dispatch(fetchedNodes({ 'attribute:true': ['node1'] }));
+    test('should show view node attributes link when attribute selected and show flyout when clicked', async () => {
+      httpRequestsMockHelpers.setNodesListResponse({ 'attribute:true': ['node1'] });
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'cold');
+      await activatePhase(rendered, 'cold');
       expect(rendered.find('.euiLoadingSpinner').exists()).toBeFalsy();
       expect(rendered.find('.euiCallOut--warning').exists()).toBeFalsy();
       const nodeAttributesSelect = getNodeAttributeSelect(rendered, 'cold');
@@ -457,11 +474,11 @@ describe('edit policy', () => {
       rendered.update();
       expect(rendered.find('.euiFlyout').exists()).toBeTruthy();
     });
-    test('should show positive number required error when trying to save with -1 for index priority', () => {
+    test('should show positive number required error when trying to save with -1 for index priority', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'cold');
+      await activatePhase(rendered, 'cold');
       setPhaseAfter(rendered, 'cold', 1);
       setPhaseIndexPriority(rendered, 'cold', -1);
       save(rendered);
@@ -469,20 +486,20 @@ describe('edit policy', () => {
     });
   });
   describe('delete phase', () => {
-    test('should allow 0 for phase timing', () => {
+    test('should allow 0 for phase timing', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'delete');
+      await activatePhase(rendered, 'delete');
       setPhaseAfter(rendered, 'delete', 0);
       save(rendered);
       expectedErrorMessages(rendered, []);
     });
-    test('should show positive number required error when trying to save delete phase with -1 for after', () => {
+    test('should show positive number required error when trying to save delete phase with -1 for after', async () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      activatePhase(rendered, 'delete');
+      await activatePhase(rendered, 'delete');
       setPhaseAfter(rendered, 'delete', -1);
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumberRequiredMessage]);
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/components/helpers/http_requests.ts b/x-pack/plugins/index_lifecycle_management/__jest__/components/helpers/http_requests.ts
new file mode 100644
index 0000000000000..b5c941beef181
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/components/helpers/http_requests.ts
@@ -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 sinon, { SinonFakeServer } from 'sinon';
+
+type HttpResponse = Record<string, any> | any[];
+
+const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {
+  const setPoliciesResponse = (response: HttpResponse = []) => {
+    server.respondWith('/api/index_lifecycle_management/policies', [
+      200,
+      { 'Content-Type': 'application/json' },
+      JSON.stringify(response),
+    ]);
+  };
+
+  const setNodesListResponse = (response: HttpResponse = []) => {
+    server.respondWith('/api/index_lifecycle_management/nodes/list', [
+      200,
+      { 'Content-Type': 'application/json' },
+      JSON.stringify(response),
+    ]);
+  };
+
+  return {
+    setPoliciesResponse,
+    setNodesListResponse,
+  };
+};
+
+export const init = () => {
+  const server = sinon.fakeServer.create();
+
+  // Define default response for unhandled requests.
+  // We make requests to APIs which don't impact the component under test, e.g. UI metric telemetry,
+  // and we can mock them all with a 200 instead of mocking each one individually.
+  server.respondWith([200, {}, 'DefaultSinonMockServerResponse']);
+
+  const httpRequestsMockHelpers = registerHttpRequestMockHelpers(server);
+
+  return {
+    server,
+    httpRequestsMockHelpers,
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/components/learn_more_link.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/components/learn_more_link.js
deleted file mode 100644
index 2284b9e39835c..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/components/learn_more_link.js
+++ /dev/null
@@ -1,33 +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 React from 'react';
-import { EuiLink } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import { createDocLink } from '../../services/documentation';
-
-export class LearnMoreLink extends React.PureComponent {
-  render() {
-    const { href, docPath, text } = this.props;
-    let url;
-    if (docPath) {
-      url = createDocLink(docPath);
-    } else {
-      url = href;
-    }
-    const content = text ? (
-      text
-    ) : (
-      <FormattedMessage id="xpack.indexLifecycleMgmt.learnMore" defaultMessage="Learn more" />
-    );
-    return (
-      <EuiLink href={url} target="_blank">
-        {content}
-      </EuiLink>
-    );
-  }
-}
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/components/learn_more_link.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/components/learn_more_link.tsx
new file mode 100644
index 0000000000000..623ff982438d7
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/components/learn_more_link.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { ReactNode } from 'react';
+import { EuiLink } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import { createDocLink } from '../../services/documentation';
+
+interface Props {
+  docPath: string;
+  text?: ReactNode;
+}
+
+export const LearnMoreLink: React.FunctionComponent<Props> = ({ docPath, text }) => {
+  const content = text ? (
+    text
+  ) : (
+    <FormattedMessage id="xpack.indexLifecycleMgmt.learnMore" defaultMessage="Learn more" />
+  );
+  return (
+    <EuiLink href={createDocLink(docPath)} target="_blank" external={true}>
+      {content}
+    </EuiLink>
+  );
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/index.ts
similarity index 79%
rename from x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/index.ts
index 9138c6a30cfad..4675ab46ee501 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/index.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { NodeAllocation } from './node_allocation.container';
+export { NodeAllocation } from './node_allocation';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.container.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.container.js
deleted file mode 100644
index 0ddfcbb940aa4..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.container.js
+++ /dev/null
@@ -1,20 +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 { connect } from 'react-redux';
-
-import { getNodeOptions } from '../../../../store/selectors';
-import { fetchNodes } from '../../../../store/actions';
-import { NodeAllocation as PresentationComponent } from './node_allocation';
-
-export const NodeAllocation = connect(
-  (state) => ({
-    nodeOptions: getNodeOptions(state),
-  }),
-  {
-    fetchNodes,
-  }
-)(PresentationComponent);
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.js
deleted file mode 100644
index 95c1878776688..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.js
+++ /dev/null
@@ -1,120 +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 React, { Component, Fragment } from 'react';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import { EuiSelect, EuiButtonEmpty, EuiCallOut, EuiSpacer, EuiLoadingSpinner } from '@elastic/eui';
-
-import { PHASE_NODE_ATTRS } from '../../../../constants';
-import { LearnMoreLink } from '../../../components/learn_more_link';
-import { ErrableFormRow } from '../../form_errors';
-
-const learnMoreLinks = (
-  <Fragment>
-    <EuiSpacer size="s" />
-    <EuiSpacer size="s" />
-    <LearnMoreLink
-      text={
-        <FormattedMessage
-          id="xpack.indexLifecycleMgmt.editPolicy.learnAboutShardAllocationLink"
-          defaultMessage="Learn about shard allocation"
-        />
-      }
-      docPath="shards-allocation.html"
-    />
-  </Fragment>
-);
-
-export class NodeAllocation extends Component {
-  componentDidMount() {
-    this.props.fetchNodes();
-  }
-
-  render() {
-    const {
-      phase,
-      setPhaseData,
-      isShowingErrors,
-      phaseData,
-      showNodeDetailsFlyout,
-      nodeOptions,
-      errors,
-    } = this.props;
-    if (!nodeOptions) {
-      return (
-        <Fragment>
-          <EuiLoadingSpinner size="xl" />
-          <EuiSpacer size="m" />
-        </Fragment>
-      );
-    }
-    if (!nodeOptions.length) {
-      return (
-        <Fragment>
-          <EuiCallOut
-            style={{ maxWidth: 400 }}
-            title={
-              <FormattedMessage
-                id="xpack.indexLifecycleMgmt.editPolicy.nodeAttributesMissingLabel"
-                defaultMessage="No node attributes configured in elasticsearch.yml"
-              />
-            }
-            color="warning"
-          >
-            <FormattedMessage
-              id="xpack.indexLifecycleMgmt.editPolicy.nodeAttributesMissingDescription"
-              defaultMessage="You can't control shard allocation without node attributes."
-            />
-            {learnMoreLinks}
-          </EuiCallOut>
-
-          <EuiSpacer size="xl" />
-        </Fragment>
-      );
-    }
-
-    return (
-      <Fragment>
-        <ErrableFormRow
-          id={`${phase}-${PHASE_NODE_ATTRS}`}
-          label={i18n.translate('xpack.indexLifecycleMgmt.editPolicy.nodeAllocationLabel', {
-            defaultMessage: 'Select a node attribute to control shard allocation',
-          })}
-          errorKey={PHASE_NODE_ATTRS}
-          isShowingErrors={isShowingErrors}
-          errors={errors}
-        >
-          <EuiSelect
-            id={`${phase}-${PHASE_NODE_ATTRS}`}
-            value={phaseData[PHASE_NODE_ATTRS] || ' '}
-            options={nodeOptions}
-            onChange={(e) => {
-              setPhaseData(PHASE_NODE_ATTRS, e.target.value);
-            }}
-          />
-        </ErrableFormRow>
-        {!!phaseData[PHASE_NODE_ATTRS] ? (
-          <EuiButtonEmpty
-            data-test-subj={`${phase}-viewNodeDetailsFlyoutButton`}
-            flush="left"
-            iconType="eye"
-            onClick={() => showNodeDetailsFlyout(phaseData[PHASE_NODE_ATTRS])}
-          >
-            <FormattedMessage
-              id="xpack.indexLifecycleMgmt.editPolicy.viewNodeDetailsButton"
-              defaultMessage="View a list of nodes attached to this configuration"
-            />
-          </EuiButtonEmpty>
-        ) : (
-          <div />
-        )}
-        {learnMoreLinks}
-        <EuiSpacer size="m" />
-      </Fragment>
-    );
-  }
-}
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.tsx
new file mode 100644
index 0000000000000..208f6b2aa6131
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation/node_allocation.tsx
@@ -0,0 +1,177 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Fragment } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiSelect,
+  EuiButtonEmpty,
+  EuiCallOut,
+  EuiSpacer,
+  EuiLoadingSpinner,
+  EuiButton,
+} from '@elastic/eui';
+
+import { PHASE_NODE_ATTRS } from '../../../../constants';
+import { LearnMoreLink } from '../../../components/learn_more_link';
+import { ErrableFormRow } from '../../form_errors';
+import { useLoadNodes } from '../../../../services/api';
+
+interface Props {
+  phase: string;
+  setPhaseData: (dataKey: string, value: any) => void;
+  showNodeDetailsFlyout: (nodeAttrs: any) => void;
+  errors: any;
+  phaseData: any;
+  isShowingErrors: boolean;
+}
+
+const learnMoreLink = (
+  <Fragment>
+    <EuiSpacer size="m" />
+    <LearnMoreLink
+      text={
+        <FormattedMessage
+          id="xpack.indexLifecycleMgmt.editPolicy.learnAboutShardAllocationLink"
+          defaultMessage="Learn about shard allocation"
+        />
+      }
+      docPath="modules-cluster.html#cluster-shard-allocation-settings"
+    />
+  </Fragment>
+);
+
+export const NodeAllocation: React.FunctionComponent<Props> = ({
+  phase,
+  setPhaseData,
+  showNodeDetailsFlyout,
+  errors,
+  phaseData,
+  isShowingErrors,
+}) => {
+  const { isLoading, data: nodes, error, sendRequest } = useLoadNodes();
+
+  if (isLoading) {
+    return (
+      <Fragment>
+        <EuiLoadingSpinner size="xl" />
+        <EuiSpacer size="m" />
+      </Fragment>
+    );
+  }
+
+  if (error) {
+    const { statusCode, message } = error;
+    return (
+      <Fragment>
+        <EuiCallOut
+          style={{ maxWidth: 400 }}
+          title={
+            <FormattedMessage
+              id="xpack.indexLifecycleMgmt.editPolicy.nodeAttributesLoadingFailedTitle"
+              defaultMessage="Unable to load node attributes"
+            />
+          }
+          color="danger"
+        >
+          <p>
+            {message} ({statusCode})
+          </p>
+          <EuiButton onClick={sendRequest} iconType="refresh" color="danger">
+            <FormattedMessage
+              id="xpack.indexLifecycleMgmt.editPolicy.nodeAttributesReloadButton"
+              defaultMessage="Try again"
+            />
+          </EuiButton>
+        </EuiCallOut>
+
+        <EuiSpacer size="xl" />
+      </Fragment>
+    );
+  }
+
+  let nodeOptions = Object.keys(nodes).map((attrs) => ({
+    text: `${attrs} (${nodes[attrs].length})`,
+    value: attrs,
+  }));
+
+  nodeOptions.sort((a, b) => a.value.localeCompare(b.value));
+  if (nodeOptions.length) {
+    nodeOptions = [
+      {
+        text: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.defaultNodeAllocation', {
+          defaultMessage: "Default allocation (don't use attributes)",
+        }),
+        value: '',
+      },
+      ...nodeOptions,
+    ];
+  }
+  if (!nodeOptions.length) {
+    return (
+      <Fragment>
+        <EuiCallOut
+          style={{ maxWidth: 400 }}
+          title={
+            <FormattedMessage
+              id="xpack.indexLifecycleMgmt.editPolicy.nodeAttributesMissingLabel"
+              defaultMessage="No node attributes configured in elasticsearch.yml"
+            />
+          }
+          color="warning"
+        >
+          <FormattedMessage
+            id="xpack.indexLifecycleMgmt.editPolicy.nodeAttributesMissingDescription"
+            defaultMessage="You can't control shard allocation without node attributes."
+          />
+          {learnMoreLink}
+        </EuiCallOut>
+
+        <EuiSpacer size="xl" />
+      </Fragment>
+    );
+  }
+
+  return (
+    <Fragment>
+      <ErrableFormRow
+        id={`${phase}-${PHASE_NODE_ATTRS}`}
+        label={i18n.translate('xpack.indexLifecycleMgmt.editPolicy.nodeAllocationLabel', {
+          defaultMessage: 'Select a node attribute to control shard allocation',
+        })}
+        errorKey={PHASE_NODE_ATTRS}
+        isShowingErrors={isShowingErrors}
+        errors={errors}
+      >
+        <EuiSelect
+          id={`${phase}-${PHASE_NODE_ATTRS}`}
+          value={phaseData[PHASE_NODE_ATTRS] || ' '}
+          options={nodeOptions}
+          onChange={(e) => {
+            setPhaseData(PHASE_NODE_ATTRS, e.target.value);
+          }}
+        />
+      </ErrableFormRow>
+      {!!phaseData[PHASE_NODE_ATTRS] ? (
+        <EuiButtonEmpty
+          style={{ maxWidth: 400 }}
+          data-test-subj={`${phase}-viewNodeDetailsFlyoutButton`}
+          flush="left"
+          iconType="eye"
+          onClick={() => showNodeDetailsFlyout(phaseData[PHASE_NODE_ATTRS])}
+        >
+          <FormattedMessage
+            id="xpack.indexLifecycleMgmt.editPolicy.viewNodeDetailsButton"
+            defaultMessage="View a list of nodes attached to this configuration"
+          />
+        </EuiButtonEmpty>
+      ) : null}
+      {learnMoreLink}
+      <EuiSpacer size="m" />
+    </Fragment>
+  );
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form_errors.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form_errors.tsx
similarity index 57%
rename from x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form_errors.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form_errors.tsx
index 28ebad209ad96..a3278b6c231b9 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form_errors.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form_errors.tsx
@@ -4,10 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { cloneElement, Children, Fragment } from 'react';
-import { EuiFormRow } from '@elastic/eui';
+import React, { cloneElement, Children, Fragment, ReactElement } from 'react';
+import { EuiFormRow, EuiFormRowProps } from '@elastic/eui';
 
-export const ErrableFormRow = ({ errorKey, isShowingErrors, errors, children, ...rest }) => {
+type Props = EuiFormRowProps & {
+  errorKey: string;
+  isShowingErrors: boolean;
+  errors: Record<string, string[]>;
+};
+
+export const ErrableFormRow: React.FunctionComponent<Props> = ({
+  errorKey,
+  isShowingErrors,
+  errors,
+  children,
+  ...rest
+}) => {
   return (
     <EuiFormRow
       isInvalid={isShowingErrors && errors[errorKey].length > 0}
@@ -16,7 +28,7 @@ export const ErrableFormRow = ({ errorKey, isShowingErrors, errors, children, ..
     >
       <Fragment>
         {Children.map(children, (child) =>
-          cloneElement(child, {
+          cloneElement(child as ReactElement, {
             isInvalid: isShowingErrors && errors[errorKey].length > 0,
           })
         )}
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
index 30c341baa6194..8838caa960b0c 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
@@ -21,9 +21,13 @@ interface GenericObject {
   [key: string]: any;
 }
 
-export async function loadNodes() {
-  return await sendGet(`nodes/list`);
-}
+export const useLoadNodes = () => {
+  return useRequest({
+    path: `nodes/list`,
+    method: 'get',
+    initialData: [],
+  });
+};
 
 export async function loadNodeDetails(selectedNodeAttrs: string) {
   return await sendGet(`nodes/${selectedNodeAttrs}/details`);
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
index 0b5f39a52c13f..fb1a651b5f550 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/http.ts
@@ -8,7 +8,6 @@ import { HttpSetup } from 'src/core/public';
 import {
   UseRequestConfig,
   useRequest as _useRequest,
-  Error,
 } from '../../../../../../src/plugins/es_ui_shared/public';
 
 interface GenericObject {
@@ -43,6 +42,8 @@ export function sendDelete(path: string) {
   return _httpClient.delete(getFullPath(path));
 }
 
-export const useRequest = (config: UseRequestConfig) => {
-  return _useRequest<any, Error>(_httpClient, { ...config, path: getFullPath(config.path) });
+export const useRequest = <T = any, E = { statusCode: number; error: string; message: string }>(
+  config: UseRequestConfig
+) => {
+  return _useRequest<T, E>(_httpClient, { ...config, path: getFullPath(config.path) });
 };
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/nodes.js b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/nodes.js
index f2520abc7a441..0b4026f019210 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/nodes.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/nodes.js
@@ -6,30 +6,12 @@
 import { i18n } from '@kbn/i18n';
 import { createAction } from 'redux-actions';
 import { showApiError } from '../../services/api_errors';
-import { loadNodes, loadNodeDetails } from '../../services/api';
+import { loadNodeDetails } from '../../services/api';
 import { SET_SELECTED_NODE_ATTRS } from '../../constants';
 
 export const setSelectedNodeAttrs = createAction(SET_SELECTED_NODE_ATTRS);
 export const setSelectedPrimaryShardCount = createAction('SET_SELECTED_PRIMARY_SHARED_COUNT');
 export const setSelectedReplicaCount = createAction('SET_SELECTED_REPLICA_COUNT');
-export const fetchedNodes = createAction('FETCHED_NODES');
-let fetchingNodes = false;
-export const fetchNodes = () => async (dispatch) => {
-  try {
-    if (!fetchingNodes) {
-      fetchingNodes = true;
-      const nodes = await loadNodes();
-      dispatch(fetchedNodes(nodes));
-    }
-  } catch (err) {
-    const title = i18n.translate('xpack.indexLifecycleMgmt.editPolicy.nodeInfoErrorMessage', {
-      defaultMessage: 'Error loading node attribute information',
-    });
-    showApiError(err, title);
-  } finally {
-    fetchingNodes = false;
-  }
-};
 
 export const fetchedNodeDetails = createAction(
   'FETCHED_NODE_DETAILS',
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/nodes.js b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/nodes.js
index 443b257b6fb7e..06d173e9901f8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/nodes.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/nodes.js
@@ -6,7 +6,6 @@
 
 import { handleActions } from 'redux-actions';
 import {
-  fetchedNodes,
   setSelectedNodeAttrs,
   setSelectedPrimaryShardCount,
   setSelectedReplicaCount,
@@ -24,13 +23,6 @@ const defaultState = {
 
 export const nodes = handleActions(
   {
-    [fetchedNodes](state, { payload: nodes }) {
-      return {
-        ...state,
-        isLoading: false,
-        nodes,
-      };
-    },
     [fetchedNodeDetails](state, { payload }) {
       const { selectedNodeAttrs, details } = payload;
       return {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/nodes.js b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/nodes.js
index 63d849217f59e..561681bf7d93d 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/nodes.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/nodes.js
@@ -4,28 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { createSelector } from 'reselect';
-
 export const getNodes = (state) => state.nodes.nodes;
 
-export const getNodeOptions = createSelector([(state) => getNodes(state)], (nodes) => {
-  if (!nodes) {
-    return null;
-  }
-
-  const options = Object.keys(nodes).map((attrs) => ({
-    text: `${attrs} (${nodes[attrs].length})`,
-    value: attrs,
-  }));
-
-  options.sort((a, b) => a.value.localeCompare(b.value));
-  if (options.length) {
-    return [{ text: "Default allocation (don't use attributes)", value: '' }, ...options];
-  } else {
-    return options;
-  }
-});
-
 export const getSelectedPrimaryShardCount = (state) => state.nodes.selectedPrimaryShardCount;
 
 export const getSelectedReplicaCount = (state) =>
diff --git a/x-pack/plugins/infra/public/apps/common_providers.tsx b/x-pack/plugins/infra/public/apps/common_providers.tsx
index 9e4917856d8b2..fc82f4bf6cb00 100644
--- a/x-pack/plugins/infra/public/apps/common_providers.tsx
+++ b/x-pack/plugins/infra/public/apps/common_providers.tsx
@@ -4,19 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import { CoreStart } from 'kibana/public';
 import { ApolloClient } from 'apollo-client';
-import {
-  useUiSetting$,
-  KibanaContextProvider,
-} from '../../../../../src/plugins/kibana_react/public';
-import { TriggersActionsProvider } from '../utils/triggers_actions_context';
-import { InfraClientStartDeps } from '../types';
+import { CoreStart } from 'kibana/public';
+import React, { useMemo } from 'react';
+import { useUiSetting$ } from '../../../../../src/plugins/kibana_react/public';
+import { EuiThemeProvider } from '../../../observability/public';
 import { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions_ui/public';
+import { createKibanaContextForPlugin } from '../hooks/use_kibana';
+import { InfraClientStartDeps } from '../types';
 import { ApolloClientContext } from '../utils/apollo_context';
-import { EuiThemeProvider } from '../../../observability/public';
 import { NavigationWarningPromptProvider } from '../utils/navigation_warning_prompt';
+import { TriggersActionsProvider } from '../utils/triggers_actions_context';
 
 export const CommonInfraProviders: React.FC<{
   apolloClient: ApolloClient<{}>;
@@ -39,9 +37,14 @@ export const CoreProviders: React.FC<{
   core: CoreStart;
   plugins: InfraClientStartDeps;
 }> = ({ children, core, plugins }) => {
+  const { Provider: KibanaContextProviderForPlugin } = useMemo(
+    () => createKibanaContextForPlugin(core, plugins),
+    [core, plugins]
+  );
+
   return (
-    <KibanaContextProvider services={{ ...core, ...plugins }}>
+    <KibanaContextProviderForPlugin services={{ ...core, ...plugins }}>
       <core.i18n.Context>{children}</core.i18n.Context>
-    </KibanaContextProvider>
+    </KibanaContextProviderForPlugin>
   );
 };
diff --git a/x-pack/plugins/infra/public/components/loading_page.tsx b/x-pack/plugins/infra/public/components/loading_page.tsx
index 9d37fed45b583..c410f37e7bf6b 100644
--- a/x-pack/plugins/infra/public/components/loading_page.tsx
+++ b/x-pack/plugins/infra/public/components/loading_page.tsx
@@ -11,12 +11,12 @@ import {
   EuiPageBody,
   EuiPageContent,
 } from '@elastic/eui';
-import React from 'react';
+import React, { ReactNode } from 'react';
 
 import { FlexPage } from './page';
 
 interface LoadingPageProps {
-  message?: string | JSX.Element;
+  message?: ReactNode;
 }
 
 export const LoadingPage = ({ message }: LoadingPageProps) => (
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana.ts b/x-pack/plugins/infra/public/hooks/use_kibana.ts
new file mode 100644
index 0000000000000..24511014d1a06
--- /dev/null
+++ b/x-pack/plugins/infra/public/hooks/use_kibana.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreStart } from '../../../../../src/core/public';
+import {
+  createKibanaReactContext,
+  KibanaReactContextValue,
+  useKibana,
+} from '../../../../../src/plugins/kibana_react/public';
+import { InfraClientStartDeps } from '../types';
+
+export type PluginKibanaContextValue = CoreStart & InfraClientStartDeps;
+
+export const createKibanaContextForPlugin = (core: CoreStart, pluginsStart: InfraClientStartDeps) =>
+  createKibanaReactContext<PluginKibanaContextValue>({
+    ...core,
+    ...pluginsStart,
+  });
+
+export const useKibanaContextForPlugin = useKibana as () => KibanaReactContextValue<
+  PluginKibanaContextValue
+>;
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_space.ts b/x-pack/plugins/infra/public/hooks/use_kibana_space.ts
new file mode 100644
index 0000000000000..1c06263008961
--- /dev/null
+++ b/x-pack/plugins/infra/public/hooks/use_kibana_space.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 { useAsync } from 'react-use';
+import { useKibanaContextForPlugin } from '../hooks/use_kibana';
+import type { Space } from '../../../spaces/public';
+
+export type ActiveSpace =
+  | { isLoading: true; error: undefined; space: undefined }
+  | { isLoading: false; error: Error; space: undefined }
+  | { isLoading: false; error: undefined; space: Space };
+
+export const useActiveKibanaSpace = (): ActiveSpace => {
+  const kibana = useKibanaContextForPlugin();
+
+  const asyncActiveSpace = useAsync(kibana.services.spaces.getActiveSpace);
+
+  if (asyncActiveSpace.loading) {
+    return {
+      isLoading: true,
+      error: undefined,
+      space: undefined,
+    };
+  } else if (asyncActiveSpace.error) {
+    return {
+      isLoading: false,
+      error: asyncActiveSpace.error,
+      space: undefined,
+    };
+  } else {
+    return {
+      isLoading: false,
+      error: undefined,
+      space: asyncActiveSpace.value!,
+    };
+  }
+};
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx
index 48ad156714ccf..723d833799e29 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx
@@ -7,18 +7,25 @@
 import React from 'react';
 import { LogEntryCategoriesModuleProvider } from '../../../containers/logs/log_analysis/modules/log_entry_categories';
 import { useLogSourceContext } from '../../../containers/logs/log_source';
-import { useKibanaSpaceId } from '../../../utils/use_kibana_space_id';
+import { useActiveKibanaSpace } from '../../../hooks/use_kibana_space';
 
 export const LogEntryCategoriesPageProviders: React.FunctionComponent = ({ children }) => {
-  const { sourceId, sourceConfiguration } = useLogSourceContext();
-  const spaceId = useKibanaSpaceId();
+  const { sourceConfiguration, sourceId } = useLogSourceContext();
+  const { space } = useActiveKibanaSpace();
+
+  // This is a rather crude way of guarding the dependent providers against
+  // arguments that are only made available asynchronously. Ideally, we'd use
+  // React concurrent mode and Suspense in order to handle that more gracefully.
+  if (sourceConfiguration?.configuration.logAlias == null || space == null) {
+    return null;
+  }
 
   return (
     <LogEntryCategoriesModuleProvider
-      indexPattern={sourceConfiguration?.configuration.logAlias ?? ''}
+      indexPattern={sourceConfiguration.configuration.logAlias}
       sourceId={sourceId}
-      spaceId={spaceId}
-      timestampField={sourceConfiguration?.configuration.fields.timestamp ?? ''}
+      spaceId={space.id}
+      timestampField={sourceConfiguration.configuration.fields.timestamp}
     >
       {children}
     </LogEntryCategoriesModuleProvider>
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx
index ac11260d2075d..e986fa37c2b2c 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx
@@ -9,23 +9,30 @@ import { LogAnalysisSetupFlyoutStateProvider } from '../../../components/logging
 import { LogEntryCategoriesModuleProvider } from '../../../containers/logs/log_analysis/modules/log_entry_categories';
 import { LogEntryRateModuleProvider } from '../../../containers/logs/log_analysis/modules/log_entry_rate';
 import { useLogSourceContext } from '../../../containers/logs/log_source';
-import { useKibanaSpaceId } from '../../../utils/use_kibana_space_id';
+import { useActiveKibanaSpace } from '../../../hooks/use_kibana_space';
 
 export const LogEntryRatePageProviders: React.FunctionComponent = ({ children }) => {
   const { sourceId, sourceConfiguration } = useLogSourceContext();
-  const spaceId = useKibanaSpaceId();
+  const { space } = useActiveKibanaSpace();
+
+  // This is a rather crude way of guarding the dependent providers against
+  // arguments that are only made available asynchronously. Ideally, we'd use
+  // React concurrent mode and Suspense in order to handle that more gracefully.
+  if (sourceConfiguration?.configuration.logAlias == null || space == null) {
+    return null;
+  }
 
   return (
     <LogEntryRateModuleProvider
       indexPattern={sourceConfiguration?.configuration.logAlias ?? ''}
       sourceId={sourceId}
-      spaceId={spaceId}
+      spaceId={space.id}
       timestampField={sourceConfiguration?.configuration.fields.timestamp ?? ''}
     >
       <LogEntryCategoriesModuleProvider
         indexPattern={sourceConfiguration?.configuration.logAlias ?? ''}
         sourceId={sourceId}
-        spaceId={spaceId}
+        spaceId={space.id}
         timestampField={sourceConfiguration?.configuration.fields.timestamp ?? ''}
       >
         <LogAnalysisSetupFlyoutStateProvider>{children}</LogAnalysisSetupFlyoutStateProvider>
diff --git a/x-pack/plugins/infra/public/types.ts b/x-pack/plugins/infra/public/types.ts
index 357f07265ac6e..a1494a023201f 100644
--- a/x-pack/plugins/infra/public/types.ts
+++ b/x-pack/plugins/infra/public/types.ts
@@ -4,16 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CoreSetup, CoreStart, Plugin as PluginClass } from 'kibana/public';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
-import {
+import type { CoreSetup, CoreStart, Plugin as PluginClass } from 'kibana/public';
+import type { DataPublicPluginStart } from '../../../../src/plugins/data/public';
+import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
+import type {
   UsageCollectionSetup,
   UsageCollectionStart,
 } from '../../../../src/plugins/usage_collection/public';
-import { TriggersAndActionsUIPublicPluginSetup } from '../../../plugins/triggers_actions_ui/public';
-import { DataEnhancedSetup, DataEnhancedStart } from '../../data_enhanced/public';
-import { ObservabilityPluginSetup, ObservabilityPluginStart } from '../../observability/public';
+import type { TriggersAndActionsUIPublicPluginSetup } from '../../../plugins/triggers_actions_ui/public';
+import type { DataEnhancedSetup, DataEnhancedStart } from '../../data_enhanced/public';
+import type {
+  ObservabilityPluginSetup,
+  ObservabilityPluginStart,
+} from '../../observability/public';
+import type { SpacesPluginStart } from '../../spaces/public';
 
 // Our own setup and start contract values
 export type InfraClientSetupExports = void;
@@ -31,6 +35,7 @@ export interface InfraClientStartDeps {
   data: DataPublicPluginStart;
   dataEnhanced: DataEnhancedStart;
   observability: ObservabilityPluginStart;
+  spaces: SpacesPluginStart;
   triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
   usageCollection: UsageCollectionStart;
 }
diff --git a/x-pack/plugins/infra/public/utils/use_kibana_space_id.ts b/x-pack/plugins/infra/public/utils/use_kibana_space_id.ts
deleted file mode 100644
index 86597f52928d5..0000000000000
--- a/x-pack/plugins/infra/public/utils/use_kibana_space_id.ts
+++ /dev/null
@@ -1,31 +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 { fold } from 'fp-ts/lib/Either';
-import { pipe } from 'fp-ts/lib/pipeable';
-import * as rt from 'io-ts';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-
-export const useKibanaSpaceId = (): string => {
-  const kibana = useKibana();
-  // NOTE: The injectedMetadata service will be deprecated at some point. We should migrate
-  // this to the client side Spaces plugin when it becomes available.
-  const activeSpace = kibana.services.injectedMetadata?.getInjectedVar('activeSpace');
-
-  return pipe(
-    activeSpaceRT.decode(activeSpace),
-    fold(
-      () => 'default',
-      (decodedActiveSpace) => decodedActiveSpace.space.id
-    )
-  );
-};
-
-const activeSpaceRT = rt.type({
-  space: rt.type({
-    id: rt.string,
-  }),
-});
diff --git a/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts b/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
index 1fb6fead454ef..e2e6393738d1f 100644
--- a/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
+++ b/x-pack/plugins/ingest_manager/common/services/config_to_yaml.ts
@@ -10,6 +10,7 @@ const CONFIG_KEYS_ORDER = [
   'id',
   'name',
   'revision',
+  'dataset',
   'type',
   'outputs',
   'agent',
diff --git a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts b/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
index a4d87f54b0915..d6c09f058ab85 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.test.ts
@@ -39,7 +39,7 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
       {
         id: 'test-logs-foo',
         enabled: true,
-        dataset: { name: 'foo', type: 'logs' },
+        data_stream: { dataset: 'foo', type: 'logs' },
         vars: {
           fooVar: { value: 'foo-value' },
           fooVar2: { value: [1, 2] },
@@ -52,7 +52,7 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
       {
         id: 'test-logs-bar',
         enabled: true,
-        dataset: { name: 'bar', type: 'logs' },
+        data_stream: { dataset: 'bar', type: 'logs' },
         vars: {
           barVar: { value: 'bar-value' },
           barVar2: { value: [1, 2] },
@@ -118,7 +118,7 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
         id: 'some-uuid',
         name: 'mock-package-config',
         type: 'test-logs',
-        dataset: { namespace: 'default' },
+        data_stream: { namespace: 'default' },
         use_output: 'default',
         meta: {
           package: {
@@ -129,13 +129,13 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
         streams: [
           {
             id: 'test-logs-foo',
-            dataset: { name: 'foo', type: 'logs' },
+            data_stream: { dataset: 'foo', type: 'logs' },
             fooKey: 'fooValue1',
             fooKey2: ['fooValue2'],
           },
           {
             id: 'test-logs-bar',
-            dataset: { name: 'bar', type: 'logs' },
+            data_stream: { dataset: 'bar', type: 'logs' },
           },
         ],
       },
@@ -160,12 +160,12 @@ describe('Ingest Manager - storedPackageConfigsToAgentInputs', () => {
         id: 'some-uuid',
         name: 'mock-package-config',
         type: 'test-logs',
-        dataset: { namespace: 'default' },
+        data_stream: { namespace: 'default' },
         use_output: 'default',
         streams: [
           {
             id: 'test-logs-foo',
-            dataset: { name: 'foo', type: 'logs' },
+            data_stream: { dataset: 'foo', type: 'logs' },
             fooKey: 'fooValue1',
             fooKey2: ['fooValue2'],
           },
diff --git a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts b/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts
index 64ba6b8a52b57..b94fc39e0567c 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_configs_to_agent_inputs.ts
@@ -24,7 +24,7 @@ export const storedPackageConfigsToAgentInputs = (
         id: packageConfig.id || packageConfig.name,
         name: packageConfig.name,
         type: input.type,
-        dataset: {
+        data_stream: {
           namespace: packageConfig.namespace || 'default',
         },
         use_output: DEFAULT_OUTPUT.name,
@@ -37,7 +37,7 @@ export const storedPackageConfigsToAgentInputs = (
           .map((stream) => {
             const fullStream: FullAgentConfigInputStream = {
               id: stream.id,
-              dataset: stream.dataset,
+              data_stream: stream.data_stream,
               ...stream.compiled_stream,
               ...Object.entries(stream.config || {}).reduce((acc, [key, { value }]) => {
                 acc[key] = value;
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
index e0cd32df1535e..1f4cd43247be1 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
@@ -83,14 +83,16 @@ describe('Ingest Manager - packageToConfig', () => {
         {
           type: 'foo',
           enabled: true,
-          streams: [{ id: 'foo-foo', enabled: true, dataset: { name: 'foo', type: 'logs' } }],
+          streams: [
+            { id: 'foo-foo', enabled: true, data_stream: { dataset: 'foo', type: 'logs' } },
+          ],
         },
         {
           type: 'bar',
           enabled: true,
           streams: [
-            { id: 'bar-bar', enabled: true, dataset: { name: 'bar', type: 'logs' } },
-            { id: 'bar-bar2', enabled: true, dataset: { name: 'bar2', type: 'logs' } },
+            { id: 'bar-bar', enabled: true, data_stream: { dataset: 'bar', type: 'logs' } },
+            { id: 'bar-bar2', enabled: true, data_stream: { dataset: 'bar2', type: 'logs' } },
           ],
         },
       ]);
@@ -141,7 +143,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'foo-foo',
               enabled: true,
-              dataset: { name: 'foo', type: 'logs' },
+              data_stream: { dataset: 'foo', type: 'logs' },
               vars: { 'var-name': { value: 'foo-var-value' } },
             },
           ],
@@ -153,13 +155,13 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'bar-bar',
               enabled: true,
-              dataset: { name: 'bar', type: 'logs' },
+              data_stream: { dataset: 'bar', type: 'logs' },
               vars: { 'var-name': { type: 'text', value: 'bar-var-value' } },
             },
             {
               id: 'bar-bar2',
               enabled: true,
-              dataset: { name: 'bar2', type: 'logs' },
+              data_stream: { dataset: 'bar2', type: 'logs' },
               vars: { 'var-name': { type: 'yaml', value: 'bar2-var-value' } },
             },
           ],
@@ -257,7 +259,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'foo-foo',
               enabled: true,
-              dataset: { name: 'foo', type: 'logs' },
+              data_stream: { dataset: 'foo', type: 'logs' },
               vars: {
                 'var-name': { value: 'foo-var-value' },
               },
@@ -275,7 +277,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'bar-bar',
               enabled: true,
-              dataset: { name: 'bar', type: 'logs' },
+              data_stream: { dataset: 'bar', type: 'logs' },
               vars: {
                 'var-name': { value: 'bar-var-value' },
               },
@@ -283,7 +285,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'bar-bar2',
               enabled: true,
-              dataset: { name: 'bar2', type: 'logs' },
+              data_stream: { dataset: 'bar2', type: 'logs' },
               vars: {
                 'var-name': { value: 'bar2-var-value' },
               },
@@ -297,7 +299,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'with-disabled-streams-disabled',
               enabled: false,
-              dataset: { name: 'disabled', type: 'logs' },
+              data_stream: { dataset: 'disabled', type: 'logs' },
               vars: {
                 'var-name': { value: [] },
               },
@@ -305,7 +307,7 @@ describe('Ingest Manager - packageToConfig', () => {
             {
               id: 'with-disabled-streams-disabled2',
               enabled: false,
-              dataset: { name: 'disabled2', type: 'logs' },
+              data_stream: { dataset: 'disabled2', type: 'logs' },
             },
           ],
         },
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
index 5957267c7304c..184b44cb9e530 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
@@ -19,17 +19,17 @@ import {
 const getStreamsForInputType = (
   inputType: string,
   packageInfo: PackageInfo
-): Array<RegistryStream & { dataset: { type: string; name: string } }> => {
-  const streams: Array<RegistryStream & { dataset: { type: string; name: string } }> = [];
+): Array<RegistryStream & { data_stream: { type: string; dataset: string } }> => {
+  const streams: Array<RegistryStream & { data_stream: { type: string; dataset: string } }> = [];
 
   (packageInfo.datasets || []).forEach((dataset) => {
     (dataset.streams || []).forEach((stream) => {
       if (stream.input === inputType) {
         streams.push({
           ...stream,
-          dataset: {
+          data_stream: {
             type: dataset.type,
-            name: dataset.name,
+            dataset: dataset.name,
           },
         });
       }
@@ -76,12 +76,9 @@ export const packageToPackageConfigInputs = (packageInfo: PackageInfo): PackageC
         packageInfo
       ).map((packageStream) => {
         const stream: PackageConfigInputStream = {
-          id: `${packageInput.type}-${packageStream.dataset.name}`,
+          id: `${packageInput.type}-${packageStream.data_stream.dataset}`,
           enabled: packageStream.enabled === false ? false : true,
-          dataset: {
-            name: packageStream.dataset.name,
-            type: packageStream.dataset.type,
-          },
+          data_stream: packageStream.data_stream,
         };
         if (packageStream.vars && packageStream.vars.length) {
           stream.vars = packageStream.vars.reduce(varsReducer, {});
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
index 00ba51fc1843a..cdaea1cc5f9a4 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
@@ -32,8 +32,8 @@ export type AgentConfigSOAttributes = Omit<AgentConfig, 'id'>;
 
 export interface FullAgentConfigInputStream {
   id: string;
-  dataset: {
-    name: string;
+  data_stream: {
+    dataset: string;
     type: string;
   };
   [key: string]: any;
@@ -43,7 +43,7 @@ export interface FullAgentConfigInput {
   id: string;
   name: string;
   type: string;
-  dataset: { namespace: string };
+  data_stream: { namespace: string };
   use_output: string;
   meta?: {
     package?: Pick<PackageConfigPackage, 'name' | 'version'>;
diff --git a/x-pack/plugins/ingest_manager/common/types/models/package_config.ts b/x-pack/plugins/ingest_manager/common/types/models/package_config.ts
index 0ff56e6d05d37..635afbd47850e 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/package_config.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/package_config.ts
@@ -20,8 +20,8 @@ export type PackageConfigConfigRecord = Record<string, PackageConfigConfigRecord
 export interface NewPackageConfigInputStream {
   id: string;
   enabled: boolean;
-  dataset: {
-    name: string;
+  data_stream: {
+    dataset: string;
     type: string;
   };
   vars?: PackageConfigConfigRecord;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx
index af26afdbf74d7..438a17b7ccf35 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/components/package_config_input_panel.tsx
@@ -39,7 +39,7 @@ const ShortenedHorizontalRule = styled(EuiHorizontalRule)`
 
 const shouldShowStreamsByDefault = (
   packageInput: RegistryInput,
-  packageInputStreams: Array<RegistryStream & { dataset: { name: string } }>,
+  packageInputStreams: Array<RegistryStream & { data_stream: { dataset: string } }>,
   packageConfigInput: PackageConfigInput
 ): boolean => {
   return (
@@ -52,7 +52,7 @@ const shouldShowStreamsByDefault = (
             hasInvalidButRequiredVar(
               stream.vars,
               packageConfigInput.streams.find(
-                (pkgStream) => stream.dataset.name === pkgStream.dataset.name
+                (pkgStream) => stream.data_stream.dataset === pkgStream.data_stream.dataset
               )?.vars
             )
         )
@@ -62,7 +62,7 @@ const shouldShowStreamsByDefault = (
 
 export const PackageConfigInputPanel: React.FunctionComponent<{
   packageInput: RegistryInput;
-  packageInputStreams: Array<RegistryStream & { dataset: { name: string } }>;
+  packageInputStreams: Array<RegistryStream & { data_stream: { dataset: string } }>;
   packageConfigInput: PackageConfigInput;
   updatePackageConfigInput: (updatedInput: Partial<PackageConfigInput>) => void;
   inputValidationResults: PackageConfigInputValidationResults;
@@ -90,7 +90,7 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
         return {
           packageInputStream,
           packageConfigInputStream: packageConfigInput.streams.find(
-            (stream) => stream.dataset.name === packageInputStream.dataset.name
+            (stream) => stream.data_stream.dataset === packageInputStream.data_stream.dataset
           ),
         };
       })
@@ -201,7 +201,8 @@ export const PackageConfigInputPanel: React.FunctionComponent<{
                     updatedStream: Partial<PackageConfigInputStream>
                   ) => {
                     const indexOfUpdatedStream = packageConfigInput.streams.findIndex(
-                      (stream) => stream.dataset.name === packageInputStream.dataset.name
+                      (stream) =>
+                        stream.data_stream.dataset === packageInputStream.data_stream.dataset
                     );
                     const newStreams = [...packageConfigInput.streams];
                     newStreams[indexOfUpdatedStream] = {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts
index bd9d216ca969a..0514ad574a8cd 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts
@@ -134,7 +134,7 @@ export const validatePackageConfig = (
         if (stream.vars) {
           const streamVarsByName = (
             (
-              registryStreamsByDataset[stream.dataset.name].find(
+              registryStreamsByDataset[stream.data_stream.dataset].find(
                 (registryStream) => registryStream.input === input.type
               ) || {}
             ).vars || []
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
index 41d46f03dca23..47874525b8a5a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/services/validate_package_config.ts.test.ts
@@ -159,7 +159,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
         streams: [
           {
             id: 'foo-foo',
-            dataset: { name: 'foo', type: 'logs' },
+            data_stream: { dataset: 'foo', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: 'test_yaml: value', type: 'yaml' } },
           },
@@ -175,13 +175,13 @@ describe('Ingest Manager - validatePackageConfig()', () => {
         streams: [
           {
             id: 'bar-bar',
-            dataset: { name: 'bar', type: 'logs' },
+            data_stream: { dataset: 'bar', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: 'test_yaml: value', type: 'yaml' } },
           },
           {
             id: 'bar-bar2',
-            dataset: { name: 'bar2', type: 'logs' },
+            data_stream: { dataset: 'bar2', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: undefined, type: 'text' } },
           },
@@ -198,13 +198,13 @@ describe('Ingest Manager - validatePackageConfig()', () => {
         streams: [
           {
             id: 'with-disabled-streams-disabled',
-            dataset: { name: 'disabled', type: 'logs' },
+            data_stream: { dataset: 'disabled', type: 'logs' },
             enabled: false,
             vars: { 'var-name': { value: undefined, type: 'text' } },
           },
           {
             id: 'with-disabled-streams-disabled-without-vars',
-            dataset: { name: 'disabled2', type: 'logs' },
+            data_stream: { dataset: 'disabled2', type: 'logs' },
             enabled: false,
           },
         ],
@@ -218,7 +218,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
         streams: [
           {
             id: 'with-no-stream-vars-bar',
-            dataset: { name: 'bar', type: 'logs' },
+            data_stream: { dataset: 'bar', type: 'logs' },
             enabled: true,
           },
         ],
@@ -241,7 +241,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
         streams: [
           {
             id: 'foo-foo',
-            dataset: { name: 'foo', type: 'logs' },
+            data_stream: { dataset: 'foo', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: 'invalidyaml: test\n foo bar:', type: 'yaml' } },
           },
@@ -257,13 +257,13 @@ describe('Ingest Manager - validatePackageConfig()', () => {
         streams: [
           {
             id: 'bar-bar',
-            dataset: { name: 'bar', type: 'logs' },
+            data_stream: { dataset: 'bar', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: '    \n\n', type: 'yaml' } },
           },
           {
             id: 'bar-bar2',
-            dataset: { name: 'bar2', type: 'logs' },
+            data_stream: { dataset: 'bar2', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: undefined, type: 'text' } },
           },
@@ -280,7 +280,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
         streams: [
           {
             id: 'with-disabled-streams-disabled',
-            dataset: { name: 'disabled', type: 'logs' },
+            data_stream: { dataset: 'disabled', type: 'logs' },
             enabled: false,
             vars: {
               'var-name': {
@@ -291,7 +291,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
           },
           {
             id: 'with-disabled-streams-disabled-without-vars',
-            dataset: { name: 'disabled2', type: 'logs' },
+            data_stream: { dataset: 'disabled2', type: 'logs' },
             enabled: false,
           },
         ],
@@ -305,7 +305,7 @@ describe('Ingest Manager - validatePackageConfig()', () => {
         streams: [
           {
             id: 'with-no-stream-vars-bar',
-            dataset: { name: 'bar', type: 'logs' },
+            data_stream: { dataset: 'bar', type: 'logs' },
             enabled: true,
           },
         ],
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
index 380a03e15695b..a41d4d72db34c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_configure_package.tsx
@@ -14,16 +14,16 @@ import { CreatePackageConfigFrom } from './types';
 const findStreamsForInputType = (
   inputType: string,
   packageInfo: PackageInfo
-): Array<RegistryStream & { dataset: { name: string } }> => {
-  const streams: Array<RegistryStream & { dataset: { name: string } }> = [];
+): Array<RegistryStream & { data_stream: { dataset: string } }> => {
+  const streams: Array<RegistryStream & { data_stream: { dataset: string } }> = [];
 
   (packageInfo.datasets || []).forEach((dataset) => {
     (dataset.streams || []).forEach((stream) => {
       if (stream.input === inputType) {
         streams.push({
           ...stream,
-          dataset: {
-            name: dataset.name,
+          data_stream: {
+            dataset: dataset.name,
           },
         });
       }
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
index aa2b73194067a..eca2711363c85 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -211,9 +211,9 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
               properties: {
                 id: { type: 'keyword' },
                 enabled: { type: 'boolean' },
-                dataset: {
+                data_stream: {
                   properties: {
-                    name: { type: 'keyword' },
+                    dataset: { type: 'keyword' },
                     type: { type: 'keyword' },
                   },
                 },
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ilm/install.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ilm/install.ts
index 9590167657d98..c5253e4902cab 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ilm/install.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ilm/install.ts
@@ -16,7 +16,6 @@ export async function installILMPolicy(paths: string[], callCluster: CallESAsCur
       const { file } = Registry.pathParts(path);
       const name = file.substr(0, file.lastIndexOf('.'));
       try {
-        if (await policyExists(name, callCluster)) return;
         await callCluster('transport.request', {
           method: 'PUT',
           path: '/_ilm/policy/' + name,
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.test.ts b/x-pack/plugins/ingest_manager/server/services/package_config.test.ts
index e86e2608e252d..28aa0d773d75b 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_config.test.ts
@@ -65,7 +65,7 @@ describe('Package config service', () => {
             streams: [
               {
                 id: 'dataset01',
-                dataset: { name: 'package.dataset1', type: 'logs' },
+                data_stream: { dataset: 'package.dataset1', type: 'logs' },
                 enabled: true,
                 vars: {
                   paths: {
@@ -85,7 +85,7 @@ describe('Package config service', () => {
           streams: [
             {
               id: 'dataset01',
-              dataset: { name: 'package.dataset1', type: 'logs' },
+              data_stream: { dataset: 'package.dataset1', type: 'logs' },
               enabled: true,
               vars: {
                 paths: {
@@ -131,7 +131,7 @@ describe('Package config service', () => {
             streams: [
               {
                 id: 'dataset01',
-                dataset: { name: 'package.dataset1', type: 'logs' },
+                data_stream: { dataset: 'package.dataset1', type: 'logs' },
                 enabled: true,
               },
             ],
@@ -151,7 +151,7 @@ describe('Package config service', () => {
           streams: [
             {
               id: 'dataset01',
-              dataset: { name: 'package.dataset1', type: 'logs' },
+              data_stream: { dataset: 'package.dataset1', type: 'logs' },
               enabled: true,
               compiled_stream: {
                 metricset: ['dataset1'],
diff --git a/x-pack/plugins/ingest_manager/server/services/package_config.ts b/x-pack/plugins/ingest_manager/server/services/package_config.ts
index a369aa5c41cd4..665c08316588c 100644
--- a/x-pack/plugins/ingest_manager/server/services/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/services/package_config.ts
@@ -379,14 +379,14 @@ async function _assignPackageStreamToStream(
   if (!stream.enabled) {
     return { ...stream, compiled_stream: undefined };
   }
-  const datasetPath = getDataset(stream.dataset.name);
+  const datasetPath = getDataset(stream.data_stream.dataset);
   const packageDatasets = pkgInfo.datasets;
   if (!packageDatasets) {
     throw new Error('Stream template not found, no datasets');
   }
 
   const packageDataset = packageDatasets.find(
-    (pkgDataset) => pkgDataset.name === stream.dataset.name
+    (pkgDataset) => pkgDataset.name === stream.data_stream.dataset
   );
   if (!packageDataset) {
     throw new Error(`Stream template not found, unable to find dataset ${datasetPath}`);
diff --git a/x-pack/plugins/ingest_manager/server/types/models/package_config.ts b/x-pack/plugins/ingest_manager/server/types/models/package_config.ts
index 0823ccd85a32b..9b7ffb4f78175 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/package_config.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/package_config.ts
@@ -45,7 +45,7 @@ const PackageConfigBaseSchema = {
         schema.object({
           id: schema.string(),
           enabled: schema.boolean(),
-          dataset: schema.object({ name: schema.string(), type: schema.string() }),
+          data_stream: schema.object({ dataset: schema.string(), type: schema.string() }),
           vars: schema.maybe(ConfigRecordSchema),
           config: schema.maybe(
             schema.recordOf(
diff --git a/x-pack/plugins/lens/layout.png b/x-pack/plugins/lens/layout.png
new file mode 100644
index 0000000000000..170324a2ba393
Binary files /dev/null and b/x-pack/plugins/lens/layout.png differ
diff --git a/x-pack/plugins/lens/public/app_plugin/app.tsx b/x-pack/plugins/lens/public/app_plugin/app.tsx
index 4a8694862642b..ffab84a51a229 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.tsx
@@ -19,6 +19,7 @@ import {
 import {
   createKbnUrlStateStorage,
   IStorageWrapper,
+  withNotifyOnErrors,
 } from '../../../../../src/plugins/kibana_utils/public';
 import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
 import {
@@ -152,6 +153,7 @@ export function App({
     const kbnUrlStateStorage = createKbnUrlStateStorage({
       history,
       useHash: core.uiSettings.get('state:storeInSessionStorage'),
+      ...withNotifyOnErrors(core.notifications.toasts),
     });
     const { stop: stopSyncingQueryServiceStateWithUrl } = syncQueryStateWithUrl(
       data.query,
@@ -166,6 +168,7 @@ export function App({
   }, [
     data.query.filterManager,
     data.query.timefilter.timefilter,
+    core.notifications.toasts,
     core.uiSettings,
     data.query,
     history,
@@ -333,9 +336,7 @@ export function App({
           ...s,
           isSaveModalVisible: false,
           originatingApp:
-            saveProps.newCopyOnSave && !saveProps.returnToOrigin
-              ? undefined
-              : currentOriginatingApp,
+            newlyCreated && !saveProps.returnToOrigin ? undefined : currentOriginatingApp,
           persistedDoc: newDoc,
           lastKnownDoc: newDoc,
         }));
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx
index 5e2fe9d7bbc14..a62db353e2baf 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/change_indexpattern.tsx
@@ -57,7 +57,7 @@ export function ChangeIndexPattern({
         panelPaddingSize="s"
         ownFocus
       >
-        <div style={{ width: 320 }}>
+        <div style={{ width: 320 }} data-test-subj="lnsChangeIndexPatternPopup">
           <EuiPopoverTitle>
             {i18n.translate('xpack.lens.indexPattern.changeIndexPatternTitle', {
               defaultMessage: 'Change index pattern',
diff --git a/x-pack/plugins/lens/public/pie_visualization/pie_visualization.tsx b/x-pack/plugins/lens/public/pie_visualization/pie_visualization.tsx
index 369ab28293fbc..5a68516db6aa3 100644
--- a/x-pack/plugins/lens/public/pie_visualization/pie_visualization.tsx
+++ b/x-pack/plugins/lens/public/pie_visualization/pie_visualization.tsx
@@ -122,6 +122,7 @@ export const pieVisualization: Visualization<PieVisualizationState, PieVisualiza
             supportsMoreColumns: sortedColumns.length < MAX_TREEMAP_BUCKETS,
             filterOperations: bucketedOperations,
             required: true,
+            dataTestSubj: 'lnsPie_groupByDimensionPanel',
           },
           {
             groupId: 'metric',
@@ -133,6 +134,7 @@ export const pieVisualization: Visualization<PieVisualizationState, PieVisualiza
             supportsMoreColumns: !layer.metric,
             filterOperations: numberMetricOperations,
             required: true,
+            dataTestSubj: 'lnsPie_sizeByDimensionPanel',
           },
         ],
       };
@@ -150,6 +152,7 @@ export const pieVisualization: Visualization<PieVisualizationState, PieVisualiza
           supportsMoreColumns: sortedColumns.length < MAX_PIE_BUCKETS,
           filterOperations: bucketedOperations,
           required: true,
+          dataTestSubj: 'lnsPie_sliceByDimensionPanel',
         },
         {
           groupId: 'metric',
@@ -161,6 +164,7 @@ export const pieVisualization: Visualization<PieVisualizationState, PieVisualiza
           supportsMoreColumns: !layer.metric,
           filterOperations: numberMetricOperations,
           required: true,
+          dataTestSubj: 'lnsPie_sizeByDimensionPanel',
         },
       ],
     };
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.test.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.test.tsx
index 981ce1cca5958..375eaf736cc95 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.test.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.test.tsx
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { mountWithIntl as mount, shallowWithIntl as shallow } from 'test_utils/enzyme_helpers';
-import { EuiButtonGroupProps, EuiSuperSelect } from '@elastic/eui';
+import { EuiButtonGroupProps, EuiSuperSelect, EuiButtonGroup } from '@elastic/eui';
 import { LayerContextMenu, XyToolbar } from './xy_config_panel';
 import { FramePublicAPI } from '../types';
 import { State } from './types';
@@ -52,7 +52,7 @@ describe('XY Config panels', () => {
       );
 
       const options = component
-        .find('[data-test-subj="lnsXY_seriesType"]')
+        .find(EuiButtonGroup)
         .first()
         .prop('options') as EuiButtonGroupProps['options'];
 
@@ -79,7 +79,7 @@ describe('XY Config panels', () => {
       );
 
       const options = component
-        .find('[data-test-subj="lnsXY_seriesType"]')
+        .find(EuiButtonGroup)
         .first()
         .prop('options') as EuiButtonGroupProps['options'];
 
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx
index 6d5bc7808a678..e4bc6de5cc68a 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx
@@ -95,13 +95,13 @@ export function LayerContextMenu(props: VisualizationLayerWidgetProps<State>) {
         })}
         name="chartType"
         className="eui-displayInlineBlock"
-        data-test-subj="lnsXY_seriesType"
         options={visualizationTypes
           .filter((t) => isHorizontalSeries(t.id as SeriesType) === horizontalOnly)
           .map((t) => ({
             id: t.id,
             label: t.label,
             iconType: t.icon || 'empty',
+            'data-test-subj': `lnsXY_seriesType-${t.id}`,
           }))}
         idSelected={layer.seriesType}
         onChange={(seriesType) => {
diff --git a/x-pack/plugins/lens/readme.md b/x-pack/plugins/lens/readme.md
index 70d7f16b0f7fc..e69ba9ec9506d 100644
--- a/x-pack/plugins/lens/readme.md
+++ b/x-pack/plugins/lens/readme.md
@@ -12,3 +12,31 @@ Run all tests from the `x-pack` root directory
 - API Functional tests:
   - Run `node scripts/functional_tests_server`
   - Run `node ../scripts/functional_test_runner.js --config ./test/api_integration/config.ts --grep=Lens`
+
+
+## UI Terminology
+
+Lens has a lot of UI elements – to make it easier to refer to them in issues or bugs, this is a hopefully complete list:
+
+* **Top nav** Navigation menu on top of the app (contains Save button)
+  * **Query bar** Input to enter KQL or Lucene query below the top nav
+  * **Filter bar** Row of filter pills below the query bar
+  * **Time picker** Global time range configurator right to the query bar
+* **Data panel** Panel to the left showing the field list
+  * **Field list** List of fields separated by available and empty fields in the data panel
+  * **Index pattern chooser** Select element switching between index patterns
+  * **Field filter** Search and dropdown to filter down the field list
+  * **Field information popover** Popover showing data distribution; opening when clicking a field in the field list
+* **Config panel** Panel to the right showing configuration of the current chart, separated by layers
+  * **Layer panel** One of multiple panels in the config panel, holding configuration for separate layers
+    * **Dimension trigger** Chart dimension like "X axis", "Break down by" or "Slice by" in the config panel
+    * **Dimension popover** Popover shown when clicking a dimension trigger
+    * **Layer settings popover** Popover shown when clicking the button in the top left of a layer panel
+* **Workspace panel** Center panel containing the chart preview, title and toolbar
+  * **Chart preview** Full-sized rendered chart in the center of the screen
+  * **Toolbar** Bar on top of the chart preview, containing the chart switcher to the left with chart specific settings right to it
+    * **Chart switch** Select to change the chart type in the top left above the chart preview
+    * **Chart settings popover** Popover shown when clicking the "Settings" button above the chart preview
+* **Suggestion panel** Panel to the bottom showing previews for suggestions on how to change the current chart
+
+![Layout](./layout.png "Layout")
diff --git a/x-pack/plugins/lists/common/schemas/types/comment.test.ts b/x-pack/plugins/lists/common/schemas/types/comment.test.ts
index 081bb9b4bae54..9b6f0e76bdd54 100644
--- a/x-pack/plugins/lists/common/schemas/types/comment.test.ts
+++ b/x-pack/plugins/lists/common/schemas/types/comment.test.ts
@@ -60,7 +60,6 @@ describe('Comment', () => {
 
       expect(getPaths(left(message.errors))).toEqual([
         'Invalid value "undefined" supplied to "({| comment: NonEmptyString, created_at: string, created_by: string, id: NonEmptyString |} & Partial<{| updated_at: string, updated_by: string |}>)"',
-        'Invalid value "undefined" supplied to "({| comment: NonEmptyString, created_at: string, created_by: string, id: NonEmptyString |} & Partial<{| updated_at: string, updated_by: string |}>)"',
       ]);
       expect(message.schema).toEqual({});
     });
@@ -200,7 +199,6 @@ describe('Comment', () => {
 
       expect(getPaths(left(message.errors))).toEqual([
         'Invalid value "1" supplied to "Array<({| comment: NonEmptyString, created_at: string, created_by: string, id: NonEmptyString |} & Partial<{| updated_at: string, updated_by: string |}>)>"',
-        'Invalid value "1" supplied to "Array<({| comment: NonEmptyString, created_at: string, created_by: string, id: NonEmptyString |} & Partial<{| updated_at: string, updated_by: string |}>)>"',
       ]);
       expect(message.schema).toEqual({});
     });
@@ -232,7 +230,6 @@ describe('Comment', () => {
 
       expect(getPaths(left(message.errors))).toEqual([
         'Invalid value "1" supplied to "Array<({| comment: NonEmptyString, created_at: string, created_by: string, id: NonEmptyString |} & Partial<{| updated_at: string, updated_by: string |}>)>"',
-        'Invalid value "1" supplied to "Array<({| comment: NonEmptyString, created_at: string, created_by: string, id: NonEmptyString |} & Partial<{| updated_at: string, updated_by: string |}>)>"',
       ]);
       expect(message.schema).toEqual({});
     });
diff --git a/x-pack/plugins/lists/common/schemas/types/default_comments_array.test.ts b/x-pack/plugins/lists/common/schemas/types/default_comments_array.test.ts
index ee2dc0cf2a478..0f5ed2ee4a98b 100644
--- a/x-pack/plugins/lists/common/schemas/types/default_comments_array.test.ts
+++ b/x-pack/plugins/lists/common/schemas/types/default_comments_array.test.ts
@@ -39,7 +39,6 @@ describe('default_comments_array', () => {
 
     expect(getPaths(left(message.errors))).toEqual([
       'Invalid value "1" supplied to "Array<({| comment: NonEmptyString, created_at: string, created_by: string, id: NonEmptyString |} & Partial<{| updated_at: string, updated_by: string |}>)>"',
-      'Invalid value "1" supplied to "Array<({| comment: NonEmptyString, created_at: string, created_by: string, id: NonEmptyString |} & Partial<{| updated_at: string, updated_by: string |}>)>"',
     ]);
     expect(message.schema).toEqual({});
   });
@@ -51,7 +50,6 @@ describe('default_comments_array', () => {
 
     expect(getPaths(left(message.errors))).toEqual([
       'Invalid value "some string" supplied to "Array<({| comment: NonEmptyString, created_at: string, created_by: string, id: NonEmptyString |} & Partial<{| updated_at: string, updated_by: string |}>)>"',
-      'Invalid value "some string" supplied to "Array<({| comment: NonEmptyString, created_at: string, created_by: string, id: NonEmptyString |} & Partial<{| updated_at: string, updated_by: string |}>)>"',
     ]);
     expect(message.schema).toEqual({});
   });
diff --git a/x-pack/plugins/lists/common/schemas/types/default_update_comments_array.test.ts b/x-pack/plugins/lists/common/schemas/types/default_update_comments_array.test.ts
index 25c84af8c9ee3..a0f6a2b2a6eaa 100644
--- a/x-pack/plugins/lists/common/schemas/types/default_update_comments_array.test.ts
+++ b/x-pack/plugins/lists/common/schemas/types/default_update_comments_array.test.ts
@@ -39,7 +39,6 @@ describe('default_update_comments_array', () => {
 
     expect(getPaths(left(message.errors))).toEqual([
       'Invalid value "1" supplied to "Array<({| comment: NonEmptyString |} & Partial<{| id: NonEmptyString |}>)>"',
-      'Invalid value "1" supplied to "Array<({| comment: NonEmptyString |} & Partial<{| id: NonEmptyString |}>)>"',
     ]);
     expect(message.schema).toEqual({});
   });
@@ -51,7 +50,6 @@ describe('default_update_comments_array', () => {
 
     expect(getPaths(left(message.errors))).toEqual([
       'Invalid value "some string" supplied to "Array<({| comment: NonEmptyString |} & Partial<{| id: NonEmptyString |}>)>"',
-      'Invalid value "some string" supplied to "Array<({| comment: NonEmptyString |} & Partial<{| id: NonEmptyString |}>)>"',
     ]);
     expect(message.schema).toEqual({});
   });
diff --git a/x-pack/plugins/lists/common/schemas/types/entries.test.ts b/x-pack/plugins/lists/common/schemas/types/entries.test.ts
index f5c022c7a394f..0537b0b9c6c6a 100644
--- a/x-pack/plugins/lists/common/schemas/types/entries.test.ts
+++ b/x-pack/plugins/lists/common/schemas/types/entries.test.ts
@@ -61,17 +61,10 @@ describe('Entries', () => {
       const message = pipe(decoded, foldLeftRight);
 
       expect(getPaths(left(message.errors))).toEqual([
-        'Invalid value "undefined" supplied to "operator"',
-        'Invalid value "nested" supplied to "type"',
-        'Invalid value "undefined" supplied to "value"',
         'Invalid value "undefined" supplied to "operator"',
         'Invalid value "nested" supplied to "type"',
         'Invalid value "undefined" supplied to "value"',
         'Invalid value "undefined" supplied to "list"',
-        'Invalid value "undefined" supplied to "operator"',
-        'Invalid value "nested" supplied to "type"',
-        'Invalid value "undefined" supplied to "operator"',
-        'Invalid value "nested" supplied to "type"',
       ]);
       expect(message.schema).toEqual({});
     });
diff --git a/x-pack/plugins/lists/common/schemas/types/non_empty_entries_array.test.ts b/x-pack/plugins/lists/common/schemas/types/non_empty_entries_array.test.ts
index 42d476a9fefb2..d81509d080056 100644
--- a/x-pack/plugins/lists/common/schemas/types/non_empty_entries_array.test.ts
+++ b/x-pack/plugins/lists/common/schemas/types/non_empty_entries_array.test.ts
@@ -125,10 +125,6 @@ describe('non_empty_entries_array', () => {
 
     expect(getPaths(left(message.errors))).toEqual([
       'Invalid value "1" supplied to "NonEmptyEntriesArray"',
-      'Invalid value "1" supplied to "NonEmptyEntriesArray"',
-      'Invalid value "1" supplied to "NonEmptyEntriesArray"',
-      'Invalid value "1" supplied to "NonEmptyEntriesArray"',
-      'Invalid value "1" supplied to "NonEmptyEntriesArray"',
     ]);
     expect(message.schema).toEqual({});
   });
diff --git a/x-pack/plugins/lists/common/schemas/types/non_empty_nested_entries_array.test.ts b/x-pack/plugins/lists/common/schemas/types/non_empty_nested_entries_array.test.ts
index 7dbc3465610c0..2e54590368959 100644
--- a/x-pack/plugins/lists/common/schemas/types/non_empty_nested_entries_array.test.ts
+++ b/x-pack/plugins/lists/common/schemas/types/non_empty_nested_entries_array.test.ts
@@ -86,19 +86,6 @@ describe('non_empty_nested_entries_array', () => {
       'Invalid value "undefined" supplied to "operator"',
       'Invalid value "nested" supplied to "type"',
       'Invalid value "undefined" supplied to "value"',
-      'Invalid value "undefined" supplied to "operator"',
-      'Invalid value "nested" supplied to "type"',
-      'Invalid value "undefined" supplied to "value"',
-      'Invalid value "undefined" supplied to "operator"',
-      'Invalid value "nested" supplied to "type"',
-      'Invalid value "undefined" supplied to "operator"',
-      'Invalid value "nested" supplied to "type"',
-      'Invalid value "undefined" supplied to "value"',
-      'Invalid value "undefined" supplied to "operator"',
-      'Invalid value "nested" supplied to "type"',
-      'Invalid value "undefined" supplied to "value"',
-      'Invalid value "undefined" supplied to "operator"',
-      'Invalid value "nested" supplied to "type"',
     ]);
     expect(message.schema).toEqual({});
   });
@@ -123,8 +110,6 @@ describe('non_empty_nested_entries_array', () => {
 
     expect(getPaths(left(message.errors))).toEqual([
       'Invalid value "1" supplied to "NonEmptyNestedEntriesArray"',
-      'Invalid value "1" supplied to "NonEmptyNestedEntriesArray"',
-      'Invalid value "1" supplied to "NonEmptyNestedEntriesArray"',
     ]);
     expect(message.schema).toEqual({});
   });
diff --git a/x-pack/plugins/lists/common/schemas/types/update_comment.test.ts b/x-pack/plugins/lists/common/schemas/types/update_comment.test.ts
index ac4d0304cbb8e..ba07421fe60f4 100644
--- a/x-pack/plugins/lists/common/schemas/types/update_comment.test.ts
+++ b/x-pack/plugins/lists/common/schemas/types/update_comment.test.ts
@@ -110,7 +110,6 @@ describe('CommentsUpdate', () => {
 
       expect(getPaths(left(message.errors))).toEqual([
         'Invalid value "1" supplied to "Array<({| comment: NonEmptyString |} & Partial<{| id: NonEmptyString |}>)>"',
-        'Invalid value "1" supplied to "Array<({| comment: NonEmptyString |} & Partial<{| id: NonEmptyString |}>)>"',
       ]);
       expect(message.schema).toEqual({});
     });
@@ -142,7 +141,6 @@ describe('CommentsUpdate', () => {
 
       expect(getPaths(left(message.errors))).toEqual([
         'Invalid value "1" supplied to "Array<({| comment: NonEmptyString |} & Partial<{| id: NonEmptyString |}>)>"',
-        'Invalid value "1" supplied to "Array<({| comment: NonEmptyString |} & Partial<{| id: NonEmptyString |}>)>"',
       ]);
       expect(message.schema).toEqual({});
     });
diff --git a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
index 388712e1ebcca..8a5b7cf9186a8 100644
--- a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
@@ -82,7 +82,7 @@ exports[`TOCEntryActionsPopover is rendered 1`] = `
               "data-test-subj": "layerVisibilityToggleButton",
               "icon": <EuiIcon
                 size="m"
-                type="eye"
+                type="eyeClosed"
               />,
               "name": "Hide layer",
               "onClick": [Function],
@@ -210,7 +210,7 @@ exports[`TOCEntryActionsPopover should disable fit to data when supportsFitToBou
               "data-test-subj": "layerVisibilityToggleButton",
               "icon": <EuiIcon
                 size="m"
-                type="eye"
+                type="eyeClosed"
               />,
               "name": "Hide layer",
               "onClick": [Function],
@@ -256,7 +256,7 @@ exports[`TOCEntryActionsPopover should disable fit to data when supportsFitToBou
 </EuiPopover>
 `;
 
-exports[`TOCEntryActionsPopover should not show edit actions in read only mode 1`] = `
+exports[`TOCEntryActionsPopover should have "show layer" action when layer is not visible 1`] = `
 <EuiPopover
   anchorClassName="mapLayTocActions__popoverAnchor"
   anchorPosition="leftUp"
@@ -340,6 +340,134 @@ exports[`TOCEntryActionsPopover should not show edit actions in read only mode 1
                 size="m"
                 type="eye"
               />,
+              "name": "Show layer",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "editLayerButton",
+              "disabled": false,
+              "icon": <EuiIcon
+                size="m"
+                type="pencil"
+              />,
+              "name": "Edit layer",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "cloneLayerButton",
+              "icon": <EuiIcon
+                size="m"
+                type="copy"
+              />,
+              "name": "Clone layer",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "removeLayerButton",
+              "icon": <EuiIcon
+                size="m"
+                type="trash"
+              />,
+              "name": "Remove layer",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+          ],
+          "title": "Layer actions",
+        },
+      ]
+    }
+  />
+</EuiPopover>
+`;
+
+exports[`TOCEntryActionsPopover should not show edit actions in read only mode 1`] = `
+<EuiPopover
+  anchorClassName="mapLayTocActions__popoverAnchor"
+  anchorPosition="leftUp"
+  button={
+    <EuiToolTip
+      anchorClassName="mapLayTocActions__tooltipAnchor"
+      content={
+        <React.Fragment>
+          simulated tooltip content at zoom: 0
+          <div>
+            <span>
+              mockFootnoteIcon
+            </span>
+             
+            simulated footnote at isUsingSearch: true
+          </div>
+        </React.Fragment>
+      }
+      delay="regular"
+      position="top"
+      title="layer 1"
+    >
+      <EuiButtonEmpty
+        className="mapTocEntry__layerName eui-textLeft"
+        color="text"
+        data-test-subj="layerTocActionsPanelToggleButtonlayer1"
+        flush="left"
+        onClick={[Function]}
+        size="xs"
+      >
+        <span
+          className="mapTocEntry__layerNameIcon"
+        >
+          <span>
+            mockIcon
+          </span>
+        </span>
+        layer 1
+         
+        <React.Fragment>
+          
+          <span>
+            mockFootnoteIcon
+          </span>
+        </React.Fragment>
+      </EuiButtonEmpty>
+    </EuiToolTip>
+  }
+  className="mapLayTocActions"
+  closePopover={[Function]}
+  display="inlineBlock"
+  hasArrow={true}
+  id="contextMenu"
+  isOpen={false}
+  ownFocus={false}
+  panelPaddingSize="none"
+  withTitle={true}
+>
+  <EuiContextMenu
+    data-test-subj="layerTocActionsPanellayer1"
+    initialPanelId={0}
+    panels={
+      Array [
+        Object {
+          "id": 0,
+          "items": Array [
+            Object {
+              "data-test-subj": "fitToBoundsButton",
+              "disabled": false,
+              "icon": <EuiIcon
+                size="m"
+                type="expand"
+              />,
+              "name": "Fit to data",
+              "onClick": [Function],
+              "toolTipContent": null,
+            },
+            Object {
+              "data-test-subj": "layerVisibilityToggleButton",
+              "icon": <EuiIcon
+                size="m"
+                type="eyeClosed"
+              />,
               "name": "Hide layer",
               "onClick": [Function],
               "toolTipContent": null,
diff --git a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
index c7ed5ec74ac7a..95f13574105b7 100644
--- a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
@@ -6,7 +6,7 @@
 /* eslint-disable max-classes-per-file */
 
 import React from 'react';
-import { shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { shallow } from 'enzyme';
 import { AbstractLayer, ILayer } from '../../../../../../classes/layers/layer';
 import { AbstractSource, ISource } from '../../../../../../classes/sources/source';
 import { AbstractStyle, IStyle } from '../../../../../../classes/styles/style';
@@ -76,7 +76,7 @@ describe('TOCEntryActionsPopover', () => {
   });
 
   test('is rendered', async () => {
-    const component = shallowWithIntl(<TOCEntryActionsPopover {...defaultProps} />);
+    const component = shallow(<TOCEntryActionsPopover {...defaultProps} />);
 
     // Ensure all promises resolve
     await new Promise((resolve) => process.nextTick(resolve));
@@ -87,9 +87,7 @@ describe('TOCEntryActionsPopover', () => {
   });
 
   test('should not show edit actions in read only mode', async () => {
-    const component = shallowWithIntl(
-      <TOCEntryActionsPopover {...defaultProps} isReadOnly={true} />
-    );
+    const component = shallow(<TOCEntryActionsPopover {...defaultProps} isReadOnly={true} />);
 
     // Ensure all promises resolve
     await new Promise((resolve) => process.nextTick(resolve));
@@ -101,7 +99,22 @@ describe('TOCEntryActionsPopover', () => {
 
   test('should disable fit to data when supportsFitToBounds is false', async () => {
     supportsFitToBounds = false;
-    const component = shallowWithIntl(<TOCEntryActionsPopover {...defaultProps} />);
+    const component = shallow(<TOCEntryActionsPopover {...defaultProps} />);
+
+    // Ensure all promises resolve
+    await new Promise((resolve) => process.nextTick(resolve));
+    // Ensure the state changes are reflected
+    component.update();
+
+    expect(component).toMatchSnapshot();
+  });
+
+  test('should have "show layer" action when layer is not visible', async () => {
+    const layer = new LayerMock();
+    layer.isVisible = () => {
+      return false;
+    };
+    const component = shallow(<TOCEntryActionsPopover {...defaultProps} layer={layer} />);
 
     // Ensure all promises resolve
     await new Promise((resolve) => process.nextTick(resolve));
diff --git a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
index 5baac0a474ffa..a1b9026fc57da 100644
--- a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
+++ b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
@@ -158,7 +158,7 @@ export class TOCEntryActionsPopover extends Component<Props, State> {
           : i18n.translate('xpack.maps.layerTocActions.showLayerTitle', {
               defaultMessage: 'Show layer',
             }),
-        icon: <EuiIcon type={this.props.layer.isVisible() ? 'eye' : 'eyeClosed'} size="m" />,
+        icon: <EuiIcon type={this.props.layer.isVisible() ? 'eyeClosed' : 'eye'} size="m" />,
         'data-test-subj': 'layerVisibilityToggleButton',
         toolTipContent: null,
         onClick: () => {
diff --git a/x-pack/plugins/maps/public/routing/maps_router.js b/x-pack/plugins/maps/public/routing/maps_router.js
index 30b2137399c1e..9992bd7a92ab1 100644
--- a/x-pack/plugins/maps/public/routing/maps_router.js
+++ b/x-pack/plugins/maps/public/routing/maps_router.js
@@ -7,8 +7,11 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Router, Switch, Route, Redirect } from 'react-router-dom';
-import { getCoreI18n } from '../kibana_services';
-import { createKbnUrlStateStorage } from '../../../../../src/plugins/kibana_utils/public';
+import { getCoreI18n, getToasts } from '../kibana_services';
+import {
+  createKbnUrlStateStorage,
+  withNotifyOnErrors,
+} from '../../../../../src/plugins/kibana_utils/public';
 import { getStore } from './store_operations';
 import { Provider } from 'react-redux';
 import { LoadListAndRender } from './routes/list/load_list_and_render';
@@ -19,7 +22,11 @@ export let kbnUrlStateStorage;
 
 export async function renderApp(context, { appBasePath, element, history, onAppLeave }) {
   goToSpecifiedPath = (path) => history.push(path);
-  kbnUrlStateStorage = createKbnUrlStateStorage({ useHash: false, history });
+  kbnUrlStateStorage = createKbnUrlStateStorage({
+    useHash: false,
+    history,
+    ...withNotifyOnErrors(getToasts()),
+  });
 
   render(<App history={history} appBasePath={appBasePath} onAppLeave={onAppLeave} />, element);
 
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx b/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
index 33bb78c51e013..0af6030df28b1 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
@@ -5,6 +5,7 @@
  */
 
 import React, { useEffect, useState, Fragment, FC } from 'react';
+import { Router } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { CoreStart } from 'kibana/public';
 
@@ -20,6 +21,8 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
+import { ManagementAppMountParams } from '../../../../../../../../../src/plugins/management/public/';
+
 import { checkGetManagementMlJobsResolver } from '../../../../capabilities/check_capabilities';
 import { KibanaContextProvider } from '../../../../../../../../../src/plugins/kibana_react/public';
 
@@ -30,6 +33,7 @@ import { DataFrameAnalyticsList } from '../../../../data_frame_analytics/pages/a
 import { AccessDeniedPage } from '../access_denied_page';
 
 interface Tab {
+  'data-test-subj': string;
   id: string;
   name: string;
   content: any;
@@ -38,6 +42,7 @@ interface Tab {
 function getTabs(isMlEnabledInSpace: boolean): Tab[] {
   return [
     {
+      'data-test-subj': 'mlStackManagementJobsListAnomalyDetectionTab',
       id: 'anomaly_detection_jobs',
       name: i18n.translate('xpack.ml.management.jobsList.anomalyDetectionTab', {
         defaultMessage: 'Anomaly detection',
@@ -50,6 +55,7 @@ function getTabs(isMlEnabledInSpace: boolean): Tab[] {
       ),
     },
     {
+      'data-test-subj': 'mlStackManagementJobsListAnalyticsTab',
       id: 'analytics_jobs',
       name: i18n.translate('xpack.ml.management.jobsList.analyticsTab', {
         defaultMessage: 'Analytics',
@@ -67,7 +73,10 @@ function getTabs(isMlEnabledInSpace: boolean): Tab[] {
   ];
 }
 
-export const JobsListPage: FC<{ coreStart: CoreStart }> = ({ coreStart }) => {
+export const JobsListPage: FC<{
+  coreStart: CoreStart;
+  history: ManagementAppMountParams['history'];
+}> = ({ coreStart, history }) => {
   const [initialized, setInitialized] = useState(false);
   const [accessDenied, setAccessDenied] = useState(false);
   const [isMlEnabledInSpace, setIsMlEnabledInSpace] = useState(false);
@@ -128,46 +137,51 @@ export const JobsListPage: FC<{ coreStart: CoreStart }> = ({ coreStart }) => {
   return (
     <I18nContext>
       <KibanaContextProvider services={{ ...coreStart }}>
-        <EuiPageContent id="kibanaManagementMLSection">
-          <EuiTitle size="l">
-            <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
-              <EuiFlexItem grow={false}>
-                <h1>
-                  {i18n.translate('xpack.ml.management.jobsList.jobsListTitle', {
-                    defaultMessage: 'Machine Learning Jobs',
-                  })}
-                </h1>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiButtonEmpty
-                  target="_blank"
-                  iconType="help"
-                  iconSide="left"
-                  color="primary"
-                  href={
-                    currentTabId === 'anomaly_detection_jobs'
-                      ? anomalyDetectionJobsUrl
-                      : anomalyJobsUrl
-                  }
-                >
-                  {currentTabId === 'anomaly_detection_jobs'
-                    ? anomalyDetectionDocsLabel
-                    : analyticsDocsLabel}
-                </EuiButtonEmpty>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiTitle>
-          <EuiSpacer size="s" />
-          <EuiTitle size="s">
-            <EuiText color="subdued">
-              {i18n.translate('xpack.ml.management.jobsList.jobsListTagline', {
-                defaultMessage: 'View machine learning analytics and anomaly detection jobs.',
-              })}
-            </EuiText>
-          </EuiTitle>
-          <EuiSpacer size="l" />
-          <EuiPageContentBody>{renderTabs()}</EuiPageContentBody>
-        </EuiPageContent>
+        <Router history={history}>
+          <EuiPageContent
+            id="kibanaManagementMLSection"
+            data-test-subj="mlPageStackManagementJobsList"
+          >
+            <EuiTitle size="l">
+              <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
+                <EuiFlexItem grow={false}>
+                  <h1>
+                    {i18n.translate('xpack.ml.management.jobsList.jobsListTitle', {
+                      defaultMessage: 'Machine Learning Jobs',
+                    })}
+                  </h1>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiButtonEmpty
+                    target="_blank"
+                    iconType="help"
+                    iconSide="left"
+                    color="primary"
+                    href={
+                      currentTabId === 'anomaly_detection_jobs'
+                        ? anomalyDetectionJobsUrl
+                        : anomalyJobsUrl
+                    }
+                  >
+                    {currentTabId === 'anomaly_detection_jobs'
+                      ? anomalyDetectionDocsLabel
+                      : analyticsDocsLabel}
+                  </EuiButtonEmpty>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiTitle>
+            <EuiSpacer size="s" />
+            <EuiTitle size="s">
+              <EuiText color="subdued">
+                {i18n.translate('xpack.ml.management.jobsList.jobsListTagline', {
+                  defaultMessage: 'View machine learning analytics and anomaly detection jobs.',
+                })}
+              </EuiText>
+            </EuiTitle>
+            <EuiSpacer size="l" />
+            <EuiPageContentBody>{renderTabs()}</EuiPageContentBody>
+          </EuiPageContent>
+        </Router>
       </KibanaContextProvider>
     </I18nContext>
   );
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/index.ts b/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
index 81190a412abc0..afea5a573b8b5 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
@@ -14,8 +14,12 @@ import { getJobsListBreadcrumbs } from '../breadcrumbs';
 import { setDependencyCache, clearCache } from '../../util/dependency_cache';
 import './_index.scss';
 
-const renderApp = (element: HTMLElement, coreStart: CoreStart) => {
-  ReactDOM.render(React.createElement(JobsListPage, { coreStart }), element);
+const renderApp = (
+  element: HTMLElement,
+  history: ManagementAppMountParams['history'],
+  coreStart: CoreStart
+) => {
+  ReactDOM.render(React.createElement(JobsListPage, { coreStart, history }), element);
   return () => {
     unmountComponentAtNode(element);
     clearCache();
@@ -37,5 +41,5 @@ export async function mountApp(
 
   params.setBreadcrumbs(getJobsListBreadcrumbs());
 
-  return renderApp(params.element, coreStart);
+  return renderApp(params.element, params.history, coreStart);
 }
diff --git a/x-pack/plugins/monitoring/public/angular/app_modules.ts b/x-pack/plugins/monitoring/public/angular/app_modules.ts
index f3d77b196b26e..499610045d771 100644
--- a/x-pack/plugins/monitoring/public/angular/app_modules.ts
+++ b/x-pack/plugins/monitoring/public/angular/app_modules.ts
@@ -23,7 +23,7 @@ import { GlobalState } from '../url_state';
 import { getSafeForExternalLink } from '../lib/get_safe_for_external_link';
 
 // @ts-ignore
-import { formatNumber, formatMetric } from '../lib/format_number';
+import { formatMetric, formatNumber } from '../lib/format_number';
 // @ts-ignore
 import { extractIp } from '../lib/extract_ip';
 // @ts-ignore
@@ -65,7 +65,7 @@ export const localAppModule = ({
   createLocalPrivateModule();
   createLocalStorage();
   createLocalConfigModule(core);
-  createLocalStateModule(query);
+  createLocalStateModule(query, core.notifications.toasts);
   createLocalTopNavModule(navigation);
   createHrefModule(core);
   createMonitoringAppServices();
@@ -97,7 +97,10 @@ function createMonitoringAppConfigConstants(
   keys.map(([key, value]) => (constantsModule = constantsModule.constant(key as string, value)));
 }
 
-function createLocalStateModule(query: any) {
+function createLocalStateModule(
+  query: MonitoringStartPluginDependencies['data']['query'],
+  toasts: MonitoringStartPluginDependencies['core']['notifications']['toasts']
+) {
   angular
     .module('monitoring/State', ['monitoring/Private'])
     .service('globalState', function (
@@ -106,7 +109,7 @@ function createLocalStateModule(query: any) {
       $location: ng.ILocationService
     ) {
       function GlobalStateProvider(this: any) {
-        const state = new GlobalState(query, $rootScope, $location, this);
+        const state = new GlobalState(query, toasts, $rootScope, $location, this);
         const initialState: any = state.getState();
         for (const key in initialState) {
           if (!initialState.hasOwnProperty(key)) {
diff --git a/x-pack/plugins/monitoring/public/url_state.ts b/x-pack/plugins/monitoring/public/url_state.ts
index e53497d751f9b..65e48223d7a64 100644
--- a/x-pack/plugins/monitoring/public/url_state.ts
+++ b/x-pack/plugins/monitoring/public/url_state.ts
@@ -23,6 +23,7 @@ import {
   IKbnUrlStateStorage,
   ISyncStateRef,
   syncState,
+  withNotifyOnErrors,
 } from '../../../../src/plugins/kibana_utils/public';
 
 interface Route {
@@ -71,6 +72,7 @@ export class GlobalState {
 
   constructor(
     queryService: MonitoringStartPluginDependencies['data']['query'],
+    toasts: MonitoringStartPluginDependencies['core']['notifications']['toasts'],
     rootScope: ng.IRootScopeService,
     ngLocation: ng.ILocationService,
     externalState: RawObject
@@ -78,7 +80,11 @@ export class GlobalState {
     this.timefilterRef = queryService.timefilter.timefilter;
 
     const history: History = createHashHistory();
-    this.stateStorage = createKbnUrlStateStorage({ useHash: false, history });
+    this.stateStorage = createKbnUrlStateStorage({
+      useHash: false,
+      history,
+      ...withNotifyOnErrors(toasts),
+    });
 
     const initialStateFromUrl = this.stateStorage.get(GLOBAL_STATE_KEY) as MonitoringAppState;
 
diff --git a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
index 18db738bba38e..16d42d896ca11 100644
--- a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
+++ b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
@@ -119,65 +119,67 @@ export async function getClustersFromRequest(
     // add alerts data
     if (isInCodePath(codePaths, [CODE_PATH_ALERTS])) {
       const alertsClient = req.getAlertsClient();
-      for (const cluster of clusters) {
-        const verification = verifyMonitoringLicense(req.server);
-        if (!verification.enabled) {
-          // return metadata detailing that alerts is disabled because of the monitoring cluster license
-          cluster.alerts = {
-            alertsMeta: {
-              enabled: verification.enabled,
-              message: verification.message, // NOTE: this is only defined when the alert feature is disabled
-            },
-            list: {},
-          };
-          continue;
-        }
+      if (alertsClient) {
+        for (const cluster of clusters) {
+          const verification = verifyMonitoringLicense(req.server);
+          if (!verification.enabled) {
+            // return metadata detailing that alerts is disabled because of the monitoring cluster license
+            cluster.alerts = {
+              alertsMeta: {
+                enabled: verification.enabled,
+                message: verification.message, // NOTE: this is only defined when the alert feature is disabled
+              },
+              list: {},
+            };
+            continue;
+          }
+
+          // check the license type of the production cluster for alerts feature support
+          const license = cluster.license || {};
+          const prodLicenseInfo = checkLicenseForAlerts(
+            license.type,
+            license.status === 'active',
+            'production'
+          );
+          if (prodLicenseInfo.clusterAlerts.enabled) {
+            cluster.alerts = {
+              list: await fetchStatus(
+                alertsClient,
+                req.server.plugins.monitoring.info,
+                undefined,
+                cluster.cluster_uuid,
+                start,
+                end,
+                []
+              ),
+              alertsMeta: {
+                enabled: true,
+              },
+            };
+            continue;
+          }
 
-        // check the license type of the production cluster for alerts feature support
-        const license = cluster.license || {};
-        const prodLicenseInfo = checkLicenseForAlerts(
-          license.type,
-          license.status === 'active',
-          'production'
-        );
-        if (prodLicenseInfo.clusterAlerts.enabled) {
           cluster.alerts = {
-            list: await fetchStatus(
-              alertsClient,
-              req.server.plugins.monitoring.info,
-              undefined,
-              cluster.cluster_uuid,
-              start,
-              end,
-              []
-            ),
+            list: {},
             alertsMeta: {
               enabled: true,
             },
+            clusterMeta: {
+              enabled: false,
+              message: i18n.translate(
+                'xpack.monitoring.clusterAlerts.unsupportedClusterAlertsDescription',
+                {
+                  defaultMessage:
+                    'Cluster [{clusterName}] license type [{licenseType}] does not support Cluster Alerts',
+                  values: {
+                    clusterName: cluster.cluster_name,
+                    licenseType: `${license.type}`,
+                  },
+                }
+              ),
+            },
           };
-          continue;
         }
-
-        cluster.alerts = {
-          list: {},
-          alertsMeta: {
-            enabled: true,
-          },
-          clusterMeta: {
-            enabled: false,
-            message: i18n.translate(
-              'xpack.monitoring.clusterAlerts.unsupportedClusterAlertsDescription',
-              {
-                defaultMessage:
-                  'Cluster [{clusterName}] license type [{licenseType}] does not support Cluster Alerts',
-                values: {
-                  clusterName: cluster.cluster_name,
-                  licenseType: `${license.type}`,
-                },
-              }
-            ),
-          },
-        };
       }
     }
   }
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
index ed091d4b8d7a7..3aedb6831e7ab 100644
--- a/x-pack/plugins/monitoring/server/plugin.ts
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -325,8 +325,22 @@ export class Plugin {
             getKibanaStatsCollector: () => this.legacyShimDependencies.kibanaStatsCollector,
             getUiSettingsService: () => context.core.uiSettings.client,
             getActionTypeRegistry: () => context.actions?.listTypes(),
-            getAlertsClient: () => plugins.alerts.getAlertsClientWithRequest(req),
-            getActionsClient: () => plugins.actions.getActionsClientWithRequest(req),
+            getAlertsClient: () => {
+              try {
+                return plugins.alerts.getAlertsClientWithRequest(req);
+              } catch (err) {
+                // If security is disabled, this call will throw an error unless a certain config is set for dist builds
+                return null;
+              }
+            },
+            getActionsClient: () => {
+              try {
+                return plugins.actions.getActionsClientWithRequest(req);
+              } catch (err) {
+                // If security is disabled, this call will throw an error unless a certain config is set for dist builds
+                return null;
+              }
+            },
             server: {
               config: legacyConfigWrapper,
               newPlatform: {
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_bulk_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_bulk_schema.test.ts
index 00854f1ed5526..d335cafdb7885 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_bulk_schema.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_bulk_schema.test.ts
@@ -127,7 +127,6 @@ describe('create_rules_bulk_schema', () => {
     const output = foldLeftRight(checked);
     expect(formatErrors(output.errors)).toEqual([
       'Invalid value "undefined" supplied to "risk_score"',
-      'Invalid value "undefined" supplied to "risk_score"',
     ]);
     expect(output.schema).toEqual({});
   });
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_bulk_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_bulk_schema.test.ts
index 4cb38889045fc..33a22d9a5f805 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_bulk_schema.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_bulk_schema.test.ts
@@ -123,7 +123,6 @@ describe('update_rules_bulk_schema', () => {
     const output = foldLeftRight(checked);
     expect(formatErrors(output.errors)).toEqual([
       'Invalid value "undefined" supplied to "risk_score"',
-      'Invalid value "undefined" supplied to "risk_score"',
     ]);
     expect(output.schema).toEqual({});
   });
diff --git a/x-pack/plugins/security_solution/common/endpoint/models/ecs_safety_helpers.ts b/x-pack/plugins/security_solution/common/endpoint/models/ecs_safety_helpers.ts
new file mode 100644
index 0000000000000..8b419e90a6ee9
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/endpoint/models/ecs_safety_helpers.ts
@@ -0,0 +1,61 @@
+/*
+ * 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 { ECSField } from '../types';
+
+/**
+ * Use these functions to accecss information held in `ECSField`s.
+ */
+
+/**
+ * True if the field contains `expected`. If the field contains an array, this will be true if the array contains `expected`.
+ */
+export function hasValue<T>(valueOrCollection: ECSField<T>, expected: T): boolean {
+  if (Array.isArray(valueOrCollection)) {
+    return valueOrCollection.includes(expected);
+  } else {
+    return valueOrCollection === expected;
+  }
+}
+
+/**
+ * Return first non-null value. If the field contains an array, this will return the first value that isn't null. If the field isn't an array it'll be returned unless it's null.
+ */
+export function firstNonNullValue<T>(valueOrCollection: ECSField<T>): T | undefined {
+  if (valueOrCollection === null) {
+    return undefined;
+  } else if (Array.isArray(valueOrCollection)) {
+    for (const value of valueOrCollection) {
+      if (value !== null) {
+        return value;
+      }
+    }
+  } else {
+    return valueOrCollection;
+  }
+}
+
+/*
+ * Get an array of all non-null values. If there is just 1 value, return it wrapped in an array. If there are multiple values, return the non-null ones.
+ * Use this when you want to consistently access the value(s) as an array.
+ */
+export function values<T>(valueOrCollection: ECSField<T>): T[] {
+  if (Array.isArray(valueOrCollection)) {
+    const nonNullValues: T[] = [];
+    for (const value of valueOrCollection) {
+      if (value !== null) {
+        nonNullValues.push(value);
+      }
+    }
+    return nonNullValues;
+  } else if (valueOrCollection !== null) {
+    // if there is a single non-null value, wrap it in an array and return it.
+    return [valueOrCollection];
+  } else {
+    // if the value was null, return `[]`.
+    return [];
+  }
+}
diff --git a/x-pack/plugins/security_solution/common/endpoint/models/event.ts b/x-pack/plugins/security_solution/common/endpoint/models/event.ts
index 1168b5edb6ffd..b1a8524a9f9e7 100644
--- a/x-pack/plugins/security_solution/common/endpoint/models/event.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/models/event.ts
@@ -3,8 +3,26 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { LegacyEndpointEvent, ResolverEvent } from '../types';
+import {
+  LegacyEndpointEvent,
+  ResolverEvent,
+  SafeResolverEvent,
+  SafeLegacyEndpointEvent,
+} from '../types';
+import { firstNonNullValue } from './ecs_safety_helpers';
 
+/*
+ * Determine if a `ResolverEvent` is the legacy variety. Can be used to narrow `ResolverEvent` to `LegacyEndpointEvent`.
+ */
+export function isLegacyEventSafeVersion(
+  event: SafeResolverEvent
+): event is SafeLegacyEndpointEvent {
+  return 'endgame' in event && event.endgame !== undefined;
+}
+
+/*
+ * Determine if a `ResolverEvent` is the legacy variety. Can be used to narrow `ResolverEvent` to `LegacyEndpointEvent`. See `isLegacyEventSafeVersion`
+ */
 export function isLegacyEvent(event: ResolverEvent): event is LegacyEndpointEvent {
   return (event as LegacyEndpointEvent).endgame !== undefined;
 }
@@ -31,6 +49,12 @@ export function isProcessRunning(event: ResolverEvent): boolean {
   );
 }
 
+export function timestampSafeVersion(event: SafeResolverEvent): string | undefined | number {
+  return isLegacyEventSafeVersion(event)
+    ? firstNonNullValue(event.endgame?.timestamp_utc)
+    : firstNonNullValue(event?.['@timestamp']);
+}
+
 export function eventTimestamp(event: ResolverEvent): string | undefined | number {
   if (isLegacyEvent(event)) {
     return event.endgame.timestamp_utc;
@@ -47,6 +71,14 @@ export function eventName(event: ResolverEvent): string {
   }
 }
 
+export function processNameSafeVersion(event: SafeResolverEvent): string | undefined {
+  if (isLegacyEventSafeVersion(event)) {
+    return firstNonNullValue(event.endgame.process_name);
+  } else {
+    return firstNonNullValue(event.process?.name);
+  }
+}
+
 export function eventId(event: ResolverEvent): number | undefined | string {
   if (isLegacyEvent(event)) {
     return event.endgame.serial_event_id;
@@ -54,6 +86,12 @@ export function eventId(event: ResolverEvent): number | undefined | string {
   return event.event.id;
 }
 
+export function eventIDSafeVersion(event: SafeResolverEvent): number | undefined | string {
+  return firstNonNullValue(
+    isLegacyEventSafeVersion(event) ? event.endgame?.serial_event_id : event.event?.id
+  );
+}
+
 export function entityId(event: ResolverEvent): string {
   if (isLegacyEvent(event)) {
     return event.endgame.unique_pid ? String(event.endgame.unique_pid) : '';
@@ -61,6 +99,16 @@ export function entityId(event: ResolverEvent): string {
   return event.process.entity_id;
 }
 
+export function entityIDSafeVersion(event: SafeResolverEvent): string | undefined {
+  if (isLegacyEventSafeVersion(event)) {
+    return event.endgame?.unique_pid === undefined
+      ? undefined
+      : String(firstNonNullValue(event.endgame.unique_pid));
+  } else {
+    return firstNonNullValue(event.process?.entity_id);
+  }
+}
+
 export function parentEntityId(event: ResolverEvent): string | undefined {
   if (isLegacyEvent(event)) {
     return event.endgame.unique_ppid ? String(event.endgame.unique_ppid) : undefined;
@@ -68,6 +116,13 @@ export function parentEntityId(event: ResolverEvent): string | undefined {
   return event.process.parent?.entity_id;
 }
 
+export function parentEntityIDSafeVersion(event: SafeResolverEvent): string | undefined {
+  if (isLegacyEventSafeVersion(event)) {
+    return String(firstNonNullValue(event.endgame.unique_ppid));
+  }
+  return firstNonNullValue(event.process?.parent?.entity_id);
+}
+
 export function ancestryArray(event: ResolverEvent): string[] | undefined {
   if (isLegacyEvent(event)) {
     return undefined;
diff --git a/x-pack/plugins/security_solution/common/endpoint/types.ts b/x-pack/plugins/security_solution/common/endpoint/types.ts
index 1c24e1abe5a57..ffde47825b501 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types.ts
@@ -182,6 +182,15 @@ export interface ResolverRelatedEvents {
   nextEvent: string | null;
 }
 
+/**
+ * Safe version of `ResolverRelatedEvents`
+ */
+export interface SafeResolverRelatedEvents {
+  entityID: string;
+  events: SafeResolverEvent[];
+  nextEvent: string | null;
+}
+
 /**
  * Response structure for the alerts route.
  */
@@ -508,6 +517,8 @@ export interface EndpointEvent {
   ecs: {
     version: string;
   };
+  // A legacy has `endgame` and an `EndpointEvent` (AKA ECS event) will never have it. This helps TS narrow `SafeResolverEvent`.
+  endgame?: never;
   event: {
     category: string | string[];
     type: string | string[];
@@ -559,6 +570,130 @@ export interface EndpointEvent {
 
 export type ResolverEvent = EndpointEvent | LegacyEndpointEvent;
 
+/**
+ * All mappings in Elasticsearch support arrays. They can also return null values or be missing. For example, a `keyword` mapping could return `null` or `[null]` or `[]` or `'hi'`, or `['hi', 'there']`. We need to handle these cases in order to avoid throwing an error.
+ * When dealing with an value that comes from ES, wrap the underlying type in `ECSField`. For example, if you have a `keyword` or `text` value coming from ES, cast it to `ECSField<string>`.
+ */
+export type ECSField<T> = T | null | Array<T | null>;
+
+/**
+ * A more conservative version of `ResolverEvent` that treats fields as optional and use `ECSField` to type all ECS fields.
+ * Prefer this over `ResolverEvent`.
+ */
+export type SafeResolverEvent = SafeEndpointEvent | SafeLegacyEndpointEvent;
+
+/**
+ * Safer version of ResolverEvent. Please use this going forward.
+ */
+export type SafeEndpointEvent = Partial<{
+  '@timestamp': ECSField<number>;
+  agent: Partial<{
+    id: ECSField<string>;
+    version: ECSField<string>;
+    type: ECSField<string>;
+  }>;
+  ecs: Partial<{
+    version: ECSField<string>;
+  }>;
+  event: Partial<{
+    category: ECSField<string>;
+    type: ECSField<string>;
+    id: ECSField<string>;
+    kind: ECSField<string>;
+  }>;
+  host: Partial<{
+    id: ECSField<string>;
+    hostname: ECSField<string>;
+    name: ECSField<string>;
+    ip: ECSField<string>;
+    mac: ECSField<string>;
+    architecture: ECSField<string>;
+    os: Partial<{
+      full: ECSField<string>;
+      name: ECSField<string>;
+      version: ECSField<string>;
+      platform: ECSField<string>;
+      family: ECSField<string>;
+      Ext: Partial<{
+        variant: ECSField<string>;
+      }>;
+    }>;
+  }>;
+  network: Partial<{
+    direction: ECSField<string>;
+    forwarded_ip: ECSField<string>;
+  }>;
+  dns: Partial<{
+    question: Partial<{ name: ECSField<string> }>;
+  }>;
+  process: Partial<{
+    entity_id: ECSField<string>;
+    name: ECSField<string>;
+    executable: ECSField<string>;
+    args: ECSField<string>;
+    code_signature: Partial<{
+      status: ECSField<string>;
+      subject_name: ECSField<string>;
+    }>;
+    pid: ECSField<number>;
+    hash: Partial<{
+      md5: ECSField<string>;
+    }>;
+    parent: Partial<{
+      entity_id: ECSField<string>;
+      name: ECSField<string>;
+      pid: ECSField<number>;
+    }>;
+    /*
+     * The array has a special format. The entity_ids towards the beginning of the array are closer ancestors and the
+     * values towards the end of the array are more distant ancestors (grandparents). Therefore
+     * ancestry_array[0] == process.parent.entity_id and ancestry_array[1] == process.parent.parent.entity_id
+     */
+    Ext: Partial<{
+      ancestry: ECSField<string>;
+    }>;
+  }>;
+  user: Partial<{
+    domain: ECSField<string>;
+    name: ECSField<string>;
+  }>;
+  file: Partial<{ path: ECSField<string> }>;
+  registry: Partial<{ path: ECSField<string>; key: ECSField<string> }>;
+}>;
+
+export interface SafeLegacyEndpointEvent {
+  '@timestamp'?: ECSField<number>;
+  /**
+   * 'legacy' events must have an `endgame` key.
+   */
+  endgame: Partial<{
+    pid: ECSField<number>;
+    ppid: ECSField<number>;
+    event_type_full: ECSField<string>;
+    event_subtype_full: ECSField<string>;
+    event_timestamp: ECSField<number>;
+    event_type: ECSField<number>;
+    unique_pid: ECSField<number>;
+    unique_ppid: ECSField<number>;
+    machine_id: ECSField<string>;
+    process_name: ECSField<string>;
+    process_path: ECSField<string>;
+    timestamp_utc: ECSField<string>;
+    serial_event_id: ECSField<number>;
+  }>;
+  agent: Partial<{
+    id: ECSField<string>;
+    type: ECSField<string>;
+    version: ECSField<string>;
+  }>;
+  event: Partial<{
+    action: ECSField<string>;
+    type: ECSField<string>;
+    category: ECSField<string>;
+    id: ECSField<string>;
+  }>;
+}
+
 /**
  * The response body for the resolver '/entity' index API
  */
diff --git a/x-pack/plugins/security_solution/common/format_errors.test.ts b/x-pack/plugins/security_solution/common/format_errors.test.ts
index c8cd72b72816b..06bdf67097764 100644
--- a/x-pack/plugins/security_solution/common/format_errors.test.ts
+++ b/x-pack/plugins/security_solution/common/format_errors.test.ts
@@ -41,6 +41,22 @@ describe('utils', () => {
     expect(output).toEqual(['some error 1', 'some error 2']);
   });
 
+  test('it filters out duplicate error messages', () => {
+    const validationError1: t.ValidationError = {
+      value: 'Some existing error 1',
+      context: [],
+      message: 'some error 1',
+    };
+    const validationError2: t.ValidationError = {
+      value: 'Some existing error 1',
+      context: [],
+      message: 'some error 1',
+    };
+    const errors: t.Errors = [validationError1, validationError2];
+    const output = formatErrors(errors);
+    expect(output).toEqual(['some error 1']);
+  });
+
   test('will use message before context if it is set', () => {
     const context: t.Context = ([{ key: 'some string key' }] as unknown) as t.Context;
     const validationError1: t.ValidationError = {
diff --git a/x-pack/plugins/security_solution/common/format_errors.ts b/x-pack/plugins/security_solution/common/format_errors.ts
index ba963f34f2983..4e1f5e4796152 100644
--- a/x-pack/plugins/security_solution/common/format_errors.ts
+++ b/x-pack/plugins/security_solution/common/format_errors.ts
@@ -8,7 +8,7 @@ import * as t from 'io-ts';
 import { isObject } from 'lodash/fp';
 
 export const formatErrors = (errors: t.Errors): string[] => {
-  return errors.map((error) => {
+  const err = errors.map((error) => {
     if (error.message != null) {
       return error.message;
     } else {
@@ -26,4 +26,6 @@ export const formatErrors = (errors: t.Errors): string[] => {
       return `Invalid value "${value}" supplied to "${suppliedValue}"`;
     }
   });
+
+  return [...new Set(err)];
 };
diff --git a/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts b/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts
index 8c7acfc18ece6..c4702e915c076 100644
--- a/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import deepEqual from 'fast-deep-equal';
 import { isEmpty } from 'lodash/fp';
 import { useEffect, useMemo, useState, useRef } from 'react';
 
@@ -34,7 +35,6 @@ export const useQuery = ({
     }
     return configIndex;
   }, [configIndex, indexToAdd]);
-
   const [, dispatchToaster] = useStateToaster();
   const refetch = useRef<inputsModel.Refetch>();
   const [loading, setLoading] = useState<boolean>(false);
@@ -43,20 +43,54 @@ export const useQuery = ({
   const [totalCount, setTotalCount] = useState<number>(-1);
   const apolloClient = useApolloClient();
 
+  const [matrixHistogramVariables, setMatrixHistogramVariables] = useState<
+    GetMatrixHistogramQuery.Variables
+  >({
+    filterQuery: createFilter(filterQuery),
+    sourceId: 'default',
+    timerange: {
+      interval: '12h',
+      from: startDate!,
+      to: endDate!,
+    },
+    defaultIndex,
+    inspect: isInspected,
+    stackByField,
+    histogramType,
+  });
+
+  useEffect(() => {
+    setMatrixHistogramVariables((prevVariables) => {
+      const localVariables = {
+        filterQuery: createFilter(filterQuery),
+        sourceId: 'default',
+        timerange: {
+          interval: '12h',
+          from: startDate!,
+          to: endDate!,
+        },
+        defaultIndex,
+        inspect: isInspected,
+        stackByField,
+        histogramType,
+      };
+      if (!deepEqual(prevVariables, localVariables)) {
+        return localVariables;
+      }
+      return prevVariables;
+    });
+  }, [
+    defaultIndex,
+    filterQuery,
+    histogramType,
+    indexToAdd,
+    isInspected,
+    stackByField,
+    startDate,
+    endDate,
+  ]);
+
   useEffect(() => {
-    const matrixHistogramVariables: GetMatrixHistogramQuery.Variables = {
-      filterQuery: createFilter(filterQuery),
-      sourceId: 'default',
-      timerange: {
-        interval: '12h',
-        from: startDate!,
-        to: endDate!,
-      },
-      defaultIndex,
-      inspect: isInspected,
-      stackByField,
-      histogramType,
-    };
     let isSubscribed = true;
     const abortCtrl = new AbortController();
     const abortSignal = abortCtrl.signal;
@@ -102,19 +136,7 @@ export const useQuery = ({
       isSubscribed = false;
       abortCtrl.abort();
     };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    defaultIndex,
-    errorMessage,
-    filterQuery,
-    histogramType,
-    indexToAdd,
-    isInspected,
-    stackByField,
-    startDate,
-    endDate,
-    data,
-  ]);
+  }, [apolloClient, dispatchToaster, errorMessage, matrixHistogramVariables]);
 
   return { data, loading, inspect, totalCount, refetch: refetch.current };
 };
diff --git a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
index a415ab75f13ea..ab9f12a67fe89 100644
--- a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
@@ -8,7 +8,13 @@ import { FilterStateStore } from '../../../../../../src/plugins/data/common/es_q
 import { TimelineType, TimelineStatus } from '../../../common/types/timeline';
 
 import { OpenTimelineResult } from '../../timelines/components/open_timeline/types';
-import { GetAllTimeline, SortFieldTimeline, TimelineResult, Direction } from '../../graphql/types';
+import {
+  GetAllTimeline,
+  SortFieldTimeline,
+  TimelineResult,
+  Direction,
+  DetailItem,
+} from '../../graphql/types';
 import { allTimelinesQuery } from '../../timelines/containers/all/index.gql_query';
 import { CreateTimelineProps } from '../../detections/components/alerts_table/types';
 import { TimelineModel } from '../../timelines/store/timeline/model';
@@ -2252,5 +2258,32 @@ export const defaultTimelineProps: CreateTimelineProps = {
     width: 1100,
   },
   to: '2018-11-05T19:03:25.937Z',
+  notes: null,
   ruleNote: '# this is some markdown documentation',
 };
+
+export const mockTimelineDetails: DetailItem[] = [
+  {
+    field: 'host.name',
+    values: ['apache'],
+    originalValue: 'apache',
+  },
+  {
+    field: 'user.id',
+    values: ['1'],
+    originalValue: 1,
+  },
+];
+
+export const mockTimelineDetailsApollo = {
+  data: {
+    source: {
+      TimelineDetails: {
+        data: mockTimelineDetails,
+      },
+    },
+  },
+  loading: false,
+  networkStatus: 7,
+  stale: false,
+};
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
index c2b51e29c230d..e8015f601cb18 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
@@ -3,6 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
+import { get } from 'lodash/fp';
 import sinon from 'sinon';
 import moment from 'moment';
 
@@ -12,6 +14,7 @@ import {
   defaultTimelineProps,
   apolloClient,
   mockTimelineApolloResult,
+  mockTimelineDetailsApollo,
 } from '../../../common/mock/';
 import { CreateTimeline, UpdateTimelineLoading } from './types';
 import { Ecs } from '../../../graphql/types';
@@ -37,7 +40,13 @@ describe('alert actions', () => {
     createTimeline = jest.fn() as jest.Mocked<CreateTimeline>;
     updateTimelineIsLoading = jest.fn() as jest.Mocked<UpdateTimelineLoading>;
 
-    jest.spyOn(apolloClient, 'query').mockResolvedValue(mockTimelineApolloResult);
+    jest.spyOn(apolloClient, 'query').mockImplementation((obj) => {
+      const id = get('variables.id', obj);
+      if (id != null) {
+        return Promise.resolve(mockTimelineApolloResult);
+      }
+      return Promise.resolve(mockTimelineDetailsApollo);
+    });
 
     clock = sinon.useFakeTimers(unix);
   });
@@ -71,6 +80,7 @@ describe('alert actions', () => {
         });
         const expected = {
           from: '2018-11-05T18:58:25.937Z',
+          notes: null,
           timeline: {
             columns: [
               {
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
index 7bebc9efbee15..34c0537a6d7d2 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
@@ -19,6 +19,8 @@ import {
   Ecs,
   TimelineStatus,
   TimelineType,
+  GetTimelineDetailsQuery,
+  DetailItem,
 } from '../../../graphql/types';
 import { oneTimelineQuery } from '../../../timelines/containers/one/index.gql_query';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
@@ -34,6 +36,7 @@ import {
 } from './helpers';
 import { KueryFilterQueryKind } from '../../../common/store';
 import { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider';
+import { timelineDetailsQuery } from '../../../timelines/containers/details/index.gql_query';
 
 export const getUpdateAlertsQuery = (eventIds: Readonly<string[]>) => {
   return {
@@ -153,35 +156,45 @@ export const sendAlertToTimelineAction = async ({
   if (timelineId !== '' && apolloClient != null) {
     try {
       updateTimelineIsLoading({ id: 'timeline-1', isLoading: true });
-      const responseTimeline = await apolloClient.query<
-        GetOneTimeline.Query,
-        GetOneTimeline.Variables
-      >({
-        query: oneTimelineQuery,
-        fetchPolicy: 'no-cache',
-        variables: {
-          id: timelineId,
-        },
-      });
+      const [responseTimeline, eventDataResp] = await Promise.all([
+        apolloClient.query<GetOneTimeline.Query, GetOneTimeline.Variables>({
+          query: oneTimelineQuery,
+          fetchPolicy: 'no-cache',
+          variables: {
+            id: timelineId,
+          },
+        }),
+        apolloClient.query<GetTimelineDetailsQuery.Query, GetTimelineDetailsQuery.Variables>({
+          query: timelineDetailsQuery,
+          fetchPolicy: 'no-cache',
+          variables: {
+            defaultIndex: [],
+            docValueFields: [],
+            eventId: ecsData._id,
+            indexName: ecsData._index ?? '',
+            sourceId: 'default',
+          },
+        }),
+      ]);
       const resultingTimeline: TimelineResult = getOr({}, 'data.getOneTimeline', responseTimeline);
-
+      const eventData: DetailItem[] = getOr([], 'data.source.TimelineDetails.data', eventDataResp);
       if (!isEmpty(resultingTimeline)) {
         const timelineTemplate: TimelineResult = omitTypenameInTimeline(resultingTimeline);
         openAlertInBasicTimeline = false;
-        const { timeline } = formatTimelineResultToModel(
+        const { timeline, notes } = formatTimelineResultToModel(
           timelineTemplate,
           true,
           timelineTemplate.timelineType ?? TimelineType.default
         );
         const query = replaceTemplateFieldFromQuery(
           timeline.kqlQuery?.filterQuery?.kuery?.expression ?? '',
-          ecsData,
+          eventData,
           timeline.timelineType
         );
-        const filters = replaceTemplateFieldFromMatchFilters(timeline.filters ?? [], ecsData);
+        const filters = replaceTemplateFieldFromMatchFilters(timeline.filters ?? [], eventData);
         const dataProviders = replaceTemplateFieldFromDataProviders(
           timeline.dataProviders ?? [],
-          ecsData,
+          eventData,
           timeline.timelineType
         );
 
@@ -213,10 +226,12 @@ export const sendAlertToTimelineAction = async ({
                 expression: query,
               },
             },
+            noteIds: notes?.map((n) => n.noteId) ?? [],
             show: true,
           },
           to,
           ruleNote: noteContent,
+          notes: notes ?? null,
         });
       }
     } catch {
@@ -232,6 +247,7 @@ export const sendAlertToTimelineAction = async ({
   ) {
     return createTimeline({
       from,
+      notes: null,
       timeline: {
         ...timelineDefaults,
         dataProviders: [
@@ -282,6 +298,7 @@ export const sendAlertToTimelineAction = async ({
   } else {
     return createTimeline({
       from,
+      notes: null,
       timeline: {
         ...timelineDefaults,
         dataProviders: [
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.test.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.test.ts
index 4decddd6b8886..7ac254f2e84f7 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.test.ts
@@ -3,10 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { cloneDeep } from 'lodash/fp';
 
 import { TimelineType } from '../../../../common/types/timeline';
-import { mockEcsData } from '../../../common/mock/mock_ecs';
 import { Filter } from '../../../../../../../src/plugins/data/public';
 import {
   DataProvider,
@@ -20,31 +18,40 @@ import {
   replaceTemplateFieldFromMatchFilters,
   reformatDataProviderWithNewValue,
 } from './helpers';
+import { mockTimelineDetails } from '../../../common/mock';
 
 describe('helpers', () => {
-  let mockEcsDataClone = cloneDeep(mockEcsData);
-  beforeEach(() => {
-    mockEcsDataClone = cloneDeep(mockEcsData);
-  });
   describe('getStringOrStringArray', () => {
     test('it should correctly return a string array', () => {
-      const value = getStringArray('x', {
-        x: 'The nickname of the developer we all :heart:',
-      });
+      const value = getStringArray('x', [
+        {
+          field: 'x',
+          values: ['The nickname of the developer we all :heart:'],
+          originalValue: 'The nickname of the developer we all :heart:',
+        },
+      ]);
       expect(value).toEqual(['The nickname of the developer we all :heart:']);
     });
 
     test('it should correctly return a string array with a single element', () => {
-      const value = getStringArray('x', {
-        x: ['The nickname of the developer we all :heart:'],
-      });
+      const value = getStringArray('x', [
+        {
+          field: 'x',
+          values: ['The nickname of the developer we all :heart:'],
+          originalValue: 'The nickname of the developer we all :heart:',
+        },
+      ]);
       expect(value).toEqual(['The nickname of the developer we all :heart:']);
     });
 
     test('it should correctly return a string array with two elements of strings', () => {
-      const value = getStringArray('x', {
-        x: ['The nickname of the developer we all :heart:', 'We are all made of stars'],
-      });
+      const value = getStringArray('x', [
+        {
+          field: 'x',
+          values: ['The nickname of the developer we all :heart:', 'We are all made of stars'],
+          originalValue: 'The nickname of the developer we all :heart:',
+        },
+      ]);
       expect(value).toEqual([
         'The nickname of the developer we all :heart:',
         'We are all made of stars',
@@ -52,22 +59,40 @@ describe('helpers', () => {
     });
 
     test('it should correctly return a string array with deep elements', () => {
-      const value = getStringArray('x.y.z', {
-        x: { y: { z: 'zed' } },
-      });
+      const value = getStringArray('x.y.z', [
+        {
+          field: 'x.y.z',
+          values: ['zed'],
+          originalValue: 'zed',
+        },
+      ]);
       expect(value).toEqual(['zed']);
     });
 
     test('it should correctly return a string array with a non-existent value', () => {
-      const value = getStringArray('non.existent', {
-        x: { y: { z: 'zed' } },
-      });
+      const value = getStringArray('non.existent', [
+        {
+          field: 'x.y.z',
+          values: ['zed'],
+          originalValue: 'zed',
+        },
+      ]);
       expect(value).toEqual([]);
     });
 
     test('it should trace an error if the value is not a string', () => {
       const mockConsole: Console = ({ trace: jest.fn() } as unknown) as Console;
-      const value = getStringArray('a', { a: 5 }, mockConsole);
+      const value = getStringArray(
+        'a',
+        [
+          {
+            field: 'a',
+            values: (5 as unknown) as string[],
+            originalValue: 'zed',
+          },
+        ],
+        mockConsole
+      );
       expect(value).toEqual([]);
       expect(
         mockConsole.trace
@@ -77,13 +102,23 @@ describe('helpers', () => {
         'when trying to access field:',
         'a',
         'from data object of:',
-        { a: 5 }
+        [{ field: 'a', originalValue: 'zed', values: 5 }]
       );
     });
 
     test('it should trace an error if the value is an array of mixed values', () => {
       const mockConsole: Console = ({ trace: jest.fn() } as unknown) as Console;
-      const value = getStringArray('a', { a: ['hi', 5] }, mockConsole);
+      const value = getStringArray(
+        'a',
+        [
+          {
+            field: 'a',
+            values: (['hi', 5] as unknown) as string[],
+            originalValue: 'zed',
+          },
+        ],
+        mockConsole
+      );
       expect(value).toEqual([]);
       expect(
         mockConsole.trace
@@ -93,7 +128,7 @@ describe('helpers', () => {
         'when trying to access field:',
         'a',
         'from data object of:',
-        { a: ['hi', 5] }
+        [{ field: 'a', originalValue: 'zed', values: ['hi', 5] }]
       );
     });
   });
@@ -103,7 +138,7 @@ describe('helpers', () => {
       test('given an empty query string this returns an empty query string', () => {
         const replacement = replaceTemplateFieldFromQuery(
           '',
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.default
         );
         expect(replacement).toEqual('');
@@ -112,7 +147,7 @@ describe('helpers', () => {
       test('given a query string with spaces this returns an empty query string', () => {
         const replacement = replaceTemplateFieldFromQuery(
           '    ',
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.default
         );
         expect(replacement).toEqual('');
@@ -121,17 +156,21 @@ describe('helpers', () => {
       test('it should replace a query with a template value such as apache from a mock template', () => {
         const replacement = replaceTemplateFieldFromQuery(
           'host.name: placeholdertext',
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.default
         );
         expect(replacement).toEqual('host.name: apache');
       });
 
       test('it should replace a template field with an ECS value that is not an array', () => {
-        mockEcsDataClone[0].host!.name = ('apache' as unknown) as string[]; // very unsafe cast for this test case
+        const dupTimelineDetails = [...mockTimelineDetails];
+        dupTimelineDetails[0] = {
+          ...dupTimelineDetails[0],
+          values: ('apache' as unknown) as string[],
+        }; // very unsafe cast for this test case
         const replacement = replaceTemplateFieldFromQuery(
           'host.name: *',
-          mockEcsDataClone[0],
+          dupTimelineDetails,
           TimelineType.default
         );
         expect(replacement).toEqual('host.name: *');
@@ -140,7 +179,7 @@ describe('helpers', () => {
       test('it should NOT replace a query with a template value that is not part of the template fields array', () => {
         const replacement = replaceTemplateFieldFromQuery(
           'user.id: placeholdertext',
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.default
         );
         expect(replacement).toEqual('user.id: placeholdertext');
@@ -151,7 +190,7 @@ describe('helpers', () => {
       test('given an empty query string this returns an empty query string', () => {
         const replacement = replaceTemplateFieldFromQuery(
           '',
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.template
         );
         expect(replacement).toEqual('');
@@ -160,7 +199,7 @@ describe('helpers', () => {
       test('given a query string with spaces this returns an empty query string', () => {
         const replacement = replaceTemplateFieldFromQuery(
           '    ',
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.template
         );
         expect(replacement).toEqual('');
@@ -169,17 +208,21 @@ describe('helpers', () => {
       test('it should NOT replace a query with a template value such as apache from a mock template', () => {
         const replacement = replaceTemplateFieldFromQuery(
           'host.name: placeholdertext',
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.template
         );
         expect(replacement).toEqual('host.name: placeholdertext');
       });
 
       test('it should NOT replace a template field with an ECS value that is not an array', () => {
-        mockEcsDataClone[0].host!.name = ('apache' as unknown) as string[]; // very unsafe cast for this test case
+        const dupTimelineDetails = [...mockTimelineDetails];
+        dupTimelineDetails[0] = {
+          ...dupTimelineDetails[0],
+          values: ('apache' as unknown) as string[],
+        }; // very unsafe cast for this test case
         const replacement = replaceTemplateFieldFromQuery(
           'host.name: *',
-          mockEcsDataClone[0],
+          dupTimelineDetails,
           TimelineType.default
         );
         expect(replacement).toEqual('host.name: *');
@@ -188,7 +231,7 @@ describe('helpers', () => {
       test('it should NOT replace a query with a template value that is not part of the template fields array', () => {
         const replacement = replaceTemplateFieldFromQuery(
           'user.id: placeholdertext',
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.default
         );
         expect(replacement).toEqual('user.id: placeholdertext');
@@ -198,7 +241,7 @@ describe('helpers', () => {
 
   describe('replaceTemplateFieldFromMatchFilters', () => {
     test('given an empty query filter this will return an empty filter', () => {
-      const replacement = replaceTemplateFieldFromMatchFilters([], mockEcsDataClone[0]);
+      const replacement = replaceTemplateFieldFromMatchFilters([], mockTimelineDetails);
       expect(replacement).toEqual([]);
     });
 
@@ -216,7 +259,7 @@ describe('helpers', () => {
           query: { match_phrase: { 'host.name': 'Braden' } },
         },
       ];
-      const replacement = replaceTemplateFieldFromMatchFilters(filters, mockEcsDataClone[0]);
+      const replacement = replaceTemplateFieldFromMatchFilters(filters, mockTimelineDetails);
       const expected: Filter[] = [
         {
           meta: {
@@ -247,7 +290,7 @@ describe('helpers', () => {
           query: { match_phrase: { 'user.id': 'Evan' } },
         },
       ];
-      const replacement = replaceTemplateFieldFromMatchFilters(filters, mockEcsDataClone[0]);
+      const replacement = replaceTemplateFieldFromMatchFilters(filters, mockTimelineDetails);
       const expected: Filter[] = [
         {
           meta: {
@@ -275,7 +318,7 @@ describe('helpers', () => {
         mockDataProvider.queryMatch.value = 'Braden';
         const replacement = reformatDataProviderWithNewValue(
           mockDataProvider,
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.default
         );
         expect(replacement).toEqual({
@@ -297,7 +340,11 @@ describe('helpers', () => {
       });
 
       test('it should replace a query with a template value such as apache from a mock data provider using a string in the data provider', () => {
-        mockEcsDataClone[0].host!.name = ('apache' as unknown) as string[]; // very unsafe cast for this test case
+        const dupTimelineDetails = [...mockTimelineDetails];
+        dupTimelineDetails[0] = {
+          ...dupTimelineDetails[0],
+          values: ('apache' as unknown) as string[],
+        }; // very unsafe cast for this test case
         const mockDataProvider: DataProvider = mockDataProviders[0];
         mockDataProvider.queryMatch.field = 'host.name';
         mockDataProvider.id = 'Braden';
@@ -305,7 +352,7 @@ describe('helpers', () => {
         mockDataProvider.queryMatch.value = 'Braden';
         const replacement = reformatDataProviderWithNewValue(
           mockDataProvider,
-          mockEcsDataClone[0],
+          dupTimelineDetails,
           TimelineType.default
         );
         expect(replacement).toEqual({
@@ -334,7 +381,7 @@ describe('helpers', () => {
         mockDataProvider.queryMatch.value = 'Rebecca';
         const replacement = reformatDataProviderWithNewValue(
           mockDataProvider,
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.default
         );
         expect(replacement).toEqual({
@@ -366,7 +413,7 @@ describe('helpers', () => {
         mockDataProvider.type = DataProviderType.template;
         const replacement = reformatDataProviderWithNewValue(
           mockDataProvider,
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.template
         );
         expect(replacement).toEqual({
@@ -396,7 +443,7 @@ describe('helpers', () => {
         mockDataProvider.type = DataProviderType.default;
         const replacement = reformatDataProviderWithNewValue(
           mockDataProvider,
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.template
         );
         expect(replacement).toEqual({
@@ -418,7 +465,11 @@ describe('helpers', () => {
       });
 
       test('it should replace a query with a template value such as apache from a mock data provider using a string in the data provider', () => {
-        mockEcsDataClone[0].host!.name = ('apache' as unknown) as string[]; // very unsafe cast for this test case
+        const dupTimelineDetails = [...mockTimelineDetails];
+        dupTimelineDetails[0] = {
+          ...dupTimelineDetails[0],
+          values: ('apache' as unknown) as string[],
+        }; // very unsafe cast for this test case
         const mockDataProvider: DataProvider = mockDataProviders[0];
         mockDataProvider.queryMatch.field = 'host.name';
         mockDataProvider.id = 'Braden';
@@ -427,7 +478,7 @@ describe('helpers', () => {
         mockDataProvider.type = DataProviderType.template;
         const replacement = reformatDataProviderWithNewValue(
           mockDataProvider,
-          mockEcsDataClone[0],
+          dupTimelineDetails,
           TimelineType.template
         );
         expect(replacement).toEqual({
@@ -457,7 +508,7 @@ describe('helpers', () => {
         mockDataProvider.type = DataProviderType.default;
         const replacement = reformatDataProviderWithNewValue(
           mockDataProvider,
-          mockEcsDataClone[0],
+          mockTimelineDetails,
           TimelineType.template
         );
         expect(replacement).toEqual({
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.ts
index 084e4bff7e0ac..20c233a03a8cf 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/helpers.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { get, isEmpty } from 'lodash/fp';
+import { isEmpty } from 'lodash/fp';
 import { Filter, esKuery, KueryNode } from '../../../../../../../src/plugins/data/public';
 import {
   DataProvider,
   DataProviderType,
   DataProvidersAnd,
 } from '../../../timelines/components/timeline/data_providers/data_provider';
-import { Ecs, TimelineType } from '../../../graphql/types';
+import { DetailItem, TimelineType } from '../../../graphql/types';
 
 interface FindValueToChangeInQuery {
   field: string;
@@ -47,8 +47,12 @@ const templateFields = [
  * @param data The unknown data that is typically a ECS value to get the value
  * @param localConsole The local console which can be sent in to make this pure (for tests) or use the default console
  */
-export const getStringArray = (field: string, data: unknown, localConsole = console): string[] => {
-  const value: unknown | undefined = get(field, data);
+export const getStringArray = (
+  field: string,
+  data: DetailItem[],
+  localConsole = console
+): string[] => {
+  const value: unknown | undefined = data.find((d) => d.field === field)?.values ?? null;
   if (value == null) {
     return [];
   } else if (typeof value === 'string') {
@@ -104,14 +108,14 @@ export const findValueToChangeInQuery = (
 
 export const replaceTemplateFieldFromQuery = (
   query: string,
-  ecsData: Ecs,
+  eventData: DetailItem[],
   timelineType: TimelineType = TimelineType.default
 ): string => {
   if (timelineType === TimelineType.default) {
     if (query.trim() !== '') {
       const valueToChange = findValueToChangeInQuery(esKuery.fromKueryExpression(query));
       return valueToChange.reduce((newQuery, vtc) => {
-        const newValue = getStringArray(vtc.field, ecsData);
+        const newValue = getStringArray(vtc.field, eventData);
         if (newValue.length) {
           return newQuery.replace(vtc.valueToChange, newValue[0]);
         } else {
@@ -126,14 +130,17 @@ export const replaceTemplateFieldFromQuery = (
   return query.trim();
 };
 
-export const replaceTemplateFieldFromMatchFilters = (filters: Filter[], ecsData: Ecs): Filter[] =>
+export const replaceTemplateFieldFromMatchFilters = (
+  filters: Filter[],
+  eventData: DetailItem[]
+): Filter[] =>
   filters.map((filter) => {
     if (
       filter.meta.type === 'phrase' &&
       filter.meta.key != null &&
       templateFields.includes(filter.meta.key)
     ) {
-      const newValue = getStringArray(filter.meta.key, ecsData);
+      const newValue = getStringArray(filter.meta.key, eventData);
       if (newValue.length) {
         filter.meta.params = { query: newValue[0] };
         filter.query = { match_phrase: { [filter.meta.key]: newValue[0] } };
@@ -144,13 +151,13 @@ export const replaceTemplateFieldFromMatchFilters = (filters: Filter[], ecsData:
 
 export const reformatDataProviderWithNewValue = <T extends DataProvider | DataProvidersAnd>(
   dataProvider: T,
-  ecsData: Ecs,
+  eventData: DetailItem[],
   timelineType: TimelineType = TimelineType.default
 ): T => {
   // Support for legacy "template-like" timeline behavior that is using hardcoded list of templateFields
   if (timelineType !== TimelineType.template) {
     if (templateFields.includes(dataProvider.queryMatch.field)) {
-      const newValue = getStringArray(dataProvider.queryMatch.field, ecsData);
+      const newValue = getStringArray(dataProvider.queryMatch.field, eventData);
       if (newValue.length) {
         dataProvider.id = dataProvider.id.replace(dataProvider.name, newValue[0]);
         dataProvider.name = newValue[0];
@@ -168,7 +175,7 @@ export const reformatDataProviderWithNewValue = <T extends DataProvider | DataPr
       dataProvider.type === DataProviderType.template &&
       dataProvider.queryMatch.operator === ':'
     ) {
-      const newValue = getStringArray(dataProvider.queryMatch.field, ecsData);
+      const newValue = getStringArray(dataProvider.queryMatch.field, eventData);
 
       if (!newValue.length) {
         dataProvider.enabled = false;
@@ -194,14 +201,14 @@ export const reformatDataProviderWithNewValue = <T extends DataProvider | DataPr
 
 export const replaceTemplateFieldFromDataProviders = (
   dataProviders: DataProvider[],
-  ecsData: Ecs,
+  eventData: DetailItem[],
   timelineType: TimelineType = TimelineType.default
 ): DataProvider[] =>
   dataProviders.map((dataProvider) => {
-    const newDataProvider = reformatDataProviderWithNewValue(dataProvider, ecsData, timelineType);
+    const newDataProvider = reformatDataProviderWithNewValue(dataProvider, eventData, timelineType);
     if (newDataProvider.and != null && !isEmpty(newDataProvider.and)) {
       newDataProvider.and = newDataProvider.and.map((andDataProvider) =>
-        reformatDataProviderWithNewValue(andDataProvider, ecsData, timelineType)
+        reformatDataProviderWithNewValue(andDataProvider, eventData, timelineType)
       );
     }
     return newDataProvider;
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
index d93bad29f3348..66423259ec155 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
@@ -147,13 +147,14 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
 
   // Callback for creating a new timeline -- utilized by row/batch actions
   const createTimelineCallback = useCallback(
-    ({ from: fromTimeline, timeline, to: toTimeline, ruleNote }: CreateTimelineProps) => {
+    ({ from: fromTimeline, timeline, to: toTimeline, ruleNote, notes }: CreateTimelineProps) => {
       updateTimelineIsLoading({ id: 'timeline-1', isLoading: false });
       updateTimeline({
         duplicate: true,
+        forceNotes: true,
         from: fromTimeline,
         id: 'timeline-1',
-        notes: [],
+        notes,
         timeline: {
           ...timeline,
           show: true,
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
index ebf1a6d3ed533..2e77e77f6b3d5 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
@@ -7,7 +7,7 @@
 import ApolloClient from 'apollo-client';
 
 import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
-import { Ecs, TimelineNonEcsData } from '../../../graphql/types';
+import { Ecs, NoteResult, TimelineNonEcsData } from '../../../graphql/types';
 import { TimelineModel } from '../../../timelines/store/timeline/model';
 import { inputsModel } from '../../../common/store';
 
@@ -63,6 +63,7 @@ export interface CreateTimelineProps {
   from: string;
   timeline: TimelineModel;
   to: string;
+  notes: NoteResult[] | null;
   ruleNote?: string;
 }
 
diff --git a/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/one_ancestor_two_children.ts b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/no_ancestors_two_children.ts
similarity index 62%
rename from x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/one_ancestor_two_children.ts
rename to x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/no_ancestors_two_children.ts
index 94c176d343d17..b0407fa5d7c1d 100644
--- a/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/one_ancestor_two_children.ts
+++ b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/no_ancestors_two_children.ts
@@ -9,11 +9,8 @@ import {
   ResolverTree,
   ResolverEntityIndex,
 } from '../../../../common/endpoint/types';
-import { mockEndpointEvent } from '../../store/mocks/endpoint_event';
-import {
-  mockTreeWithNoAncestorsAnd2Children,
-  withRelatedEventsOnOrigin,
-} from '../../store/mocks/resolver_tree';
+import { mockEndpointEvent } from '../../mocks/endpoint_event';
+import { mockTreeWithNoAncestorsAnd2Children } from '../../mocks/resolver_tree';
 import { DataAccessLayer } from '../../types';
 
 interface Metadata {
@@ -43,24 +40,11 @@ interface Metadata {
 /**
  * A simple mock dataAccessLayer possible that returns a tree with 0 ancestors and 2 direct children. 1 related event is returned. The parameter to `entities` is ignored.
  */
-export function oneAncestorTwoChildren(
-  { withRelatedEvents }: { withRelatedEvents: Iterable<[string, string]> | null } = {
-    withRelatedEvents: null,
-  }
-): { dataAccessLayer: DataAccessLayer; metadata: Metadata } {
+export function noAncestorsTwoChildren(): { dataAccessLayer: DataAccessLayer; metadata: Metadata } {
   const metadata: Metadata = {
     databaseDocumentID: '_id',
     entityIDs: { origin: 'origin', firstChild: 'firstChild', secondChild: 'secondChild' },
   };
-  const baseTree = mockTreeWithNoAncestorsAnd2Children({
-    originID: metadata.entityIDs.origin,
-    firstChildID: metadata.entityIDs.firstChild,
-    secondChildID: metadata.entityIDs.secondChild,
-  });
-  const composedTree = withRelatedEvents
-    ? withRelatedEventsOnOrigin(baseTree, withRelatedEvents)
-    : baseTree;
-
   return {
     metadata,
     dataAccessLayer: {
@@ -70,17 +54,13 @@ export function oneAncestorTwoChildren(
       relatedEvents(entityID: string): Promise<ResolverRelatedEvents> {
         return Promise.resolve({
           entityID,
-          events:
-            /* Respond with the mocked related events when the origin's related events are fetched*/ withRelatedEvents &&
-            entityID === metadata.entityIDs.origin
-              ? composedTree.relatedEvents.events
-              : [
-                  mockEndpointEvent({
-                    entityID,
-                    name: 'event',
-                    timestamp: 0,
-                  }),
-                ],
+          events: [
+            mockEndpointEvent({
+              entityID,
+              name: 'event',
+              timestamp: 0,
+            }),
+          ],
           nextEvent: null,
         });
       },
@@ -89,7 +69,13 @@ export function oneAncestorTwoChildren(
        * Fetch a ResolverTree for a entityID
        */
       resolverTree(): Promise<ResolverTree> {
-        return Promise.resolve(composedTree);
+        return Promise.resolve(
+          mockTreeWithNoAncestorsAnd2Children({
+            originID: metadata.entityIDs.origin,
+            firstChildID: metadata.entityIDs.firstChild,
+            secondChildID: metadata.entityIDs.secondChild,
+          })
+        );
       },
 
       /**
diff --git a/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/no_ancestors_two_children_with_related_events_on_origin.ts b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/no_ancestors_two_children_with_related_events_on_origin.ts
new file mode 100644
index 0000000000000..01e75e3eefdbf
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/no_ancestors_two_children_with_related_events_on_origin.ts
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { DataAccessLayer } from '../../types';
+import { mockTreeWithNoAncestorsAndTwoChildrenAndRelatedEventsOnOrigin } from '../../mocks/resolver_tree';
+import {
+  ResolverRelatedEvents,
+  ResolverTree,
+  ResolverEntityIndex,
+} from '../../../../common/endpoint/types';
+
+interface Metadata {
+  /**
+   * The `_id` of the document being analyzed.
+   */
+  databaseDocumentID: string;
+  /**
+   * A record of entityIDs to be used in tests assertions.
+   */
+  entityIDs: {
+    /**
+     * The entityID of the node related to the document being analyzed.
+     */
+    origin: 'origin';
+    /**
+     * The entityID of the first child of the origin.
+     */
+    firstChild: 'firstChild';
+    /**
+     * The entityID of the second child of the origin.
+     */
+    secondChild: 'secondChild';
+  };
+}
+
+export function noAncestorsTwoChildrenWithRelatedEventsOnOrigin(): {
+  dataAccessLayer: DataAccessLayer;
+  metadata: Metadata;
+} {
+  const metadata: Metadata = {
+    databaseDocumentID: '_id',
+    entityIDs: { origin: 'origin', firstChild: 'firstChild', secondChild: 'secondChild' },
+  };
+  const tree = mockTreeWithNoAncestorsAndTwoChildrenAndRelatedEventsOnOrigin({
+    originID: metadata.entityIDs.origin,
+    firstChildID: metadata.entityIDs.firstChild,
+    secondChildID: metadata.entityIDs.secondChild,
+  });
+
+  return {
+    metadata,
+    dataAccessLayer: {
+      /**
+       * Fetch related events for an entity ID
+       */
+      relatedEvents(entityID: string): Promise<ResolverRelatedEvents> {
+        /**
+         * Respond with the mocked related events when the origin's related events are fetched.
+         **/
+        const events = entityID === metadata.entityIDs.origin ? tree.relatedEvents.events : [];
+
+        return Promise.resolve({
+          entityID,
+          events,
+          nextEvent: null,
+        } as ResolverRelatedEvents);
+      },
+
+      /**
+       * Fetch a ResolverTree for a entityID
+       */
+      resolverTree(): Promise<ResolverTree> {
+        return Promise.resolve(tree);
+      },
+
+      /**
+       * Get an array of index patterns that contain events.
+       */
+      indexPatterns(): string[] {
+        return ['index pattern'];
+      },
+
+      /**
+       * Get entities matching a document.
+       */
+      entities(): Promise<ResolverEntityIndex> {
+        return Promise.resolve([{ entity_id: metadata.entityIDs.origin }]);
+      },
+    },
+  };
+}
diff --git a/x-pack/plugins/security_solution/public/resolver/store/mocks/endpoint_event.ts b/x-pack/plugins/security_solution/public/resolver/mocks/endpoint_event.ts
similarity index 66%
rename from x-pack/plugins/security_solution/public/resolver/store/mocks/endpoint_event.ts
rename to x-pack/plugins/security_solution/public/resolver/mocks/endpoint_event.ts
index 709f2faf13b00..c822fdf647c16 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/mocks/endpoint_event.ts
+++ b/x-pack/plugins/security_solution/public/resolver/mocks/endpoint_event.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EndpointEvent } from '../../../../common/endpoint/types';
+import { EndpointEvent } from '../../../common/endpoint/types';
 
 /**
  * Simple mock endpoint event that works for tree layouts.
@@ -28,10 +28,29 @@ export function mockEndpointEvent({
       type: lifecycleType ? lifecycleType : 'start',
       category: 'process',
     },
+    agent: {
+      id: 'agent.id',
+      version: 'agent.version',
+      type: 'agent.type',
+    },
+    ecs: {
+      version: 'ecs.version',
+    },
+    user: {
+      name: 'user.name',
+      domain: 'user.domain',
+    },
     process: {
       entity_id: entityID,
+      executable: 'executable',
+      args: 'args',
       name,
+      pid: 0,
+      hash: {
+        md5: 'hash.md5',
+      },
       parent: {
+        pid: 0,
         entity_id: parentEntityId,
       },
     },
diff --git a/x-pack/plugins/security_solution/public/resolver/store/mocks/resolver_tree.ts b/x-pack/plugins/security_solution/public/resolver/mocks/resolver_tree.ts
similarity index 89%
rename from x-pack/plugins/security_solution/public/resolver/store/mocks/resolver_tree.ts
rename to x-pack/plugins/security_solution/public/resolver/mocks/resolver_tree.ts
index 21d0309501aa8..5d2cbb2eab0dc 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/mocks/resolver_tree.ts
+++ b/x-pack/plugins/security_solution/public/resolver/mocks/resolver_tree.ts
@@ -5,8 +5,7 @@
  */
 
 import { mockEndpointEvent } from './endpoint_event';
-import { mockRelatedEvent } from './related_event';
-import { ResolverTree, ResolverEvent } from '../../../../common/endpoint/types';
+import { ResolverTree, ResolverEvent, SafeResolverEvent } from '../../../common/endpoint/types';
 
 export function mockTreeWith2AncestorsAndNoChildren({
   originID,
@@ -125,11 +124,11 @@ type RelatedEventType = string;
  * @param treeToAddRelatedEventsTo the ResolverTree to modify
  * @param relatedEventsToAddByCategoryAndType Iterable of `[category, type]` pairs describing related events. e.g. [['dns','info'],['registry','access']]
  */
-export function withRelatedEventsOnOrigin(
+function withRelatedEventsOnOrigin(
   treeToAddRelatedEventsTo: ResolverTree,
   relatedEventsToAddByCategoryAndType: Iterable<[RelatedEventCategory, RelatedEventType]>
 ): ResolverTree {
-  const events = [];
+  const events: SafeResolverEvent[] = [];
   const byCategory: Record<string, number> = {};
   const stats = {
     totalAlerts: 0,
@@ -139,14 +138,18 @@ export function withRelatedEventsOnOrigin(
     },
   };
   for (const [category, type] of relatedEventsToAddByCategoryAndType) {
-    events.push(
-      mockRelatedEvent({
-        entityID: treeToAddRelatedEventsTo.entityID,
-        timestamp: 1,
-        category,
+    events.push({
+      '@timestamp': 1,
+      event: {
+        kind: 'event',
         type,
-      })
-    );
+        category,
+        id: 'xyz',
+      },
+      process: {
+        entity_id: treeToAddRelatedEventsTo.entityID,
+      },
+    });
     stats.events.total++;
     stats.events.byCategory[category] = stats.events.byCategory[category]
       ? stats.events.byCategory[category] + 1
@@ -156,7 +159,7 @@ export function withRelatedEventsOnOrigin(
     ...treeToAddRelatedEventsTo,
     stats,
     relatedEvents: {
-      events,
+      events: events as ResolverEvent[],
       nextEvent: null,
     },
   };
@@ -309,3 +312,24 @@ export function mockTreeWithNoProcessEvents(): ResolverTree {
     },
   };
 }
+
+export function mockTreeWithNoAncestorsAndTwoChildrenAndRelatedEventsOnOrigin({
+  originID,
+  firstChildID,
+  secondChildID,
+}: {
+  originID: string;
+  firstChildID: string;
+  secondChildID: string;
+}) {
+  const baseTree = mockTreeWithNoAncestorsAnd2Children({
+    originID,
+    firstChildID,
+    secondChildID,
+  });
+  const withRelatedEvents: Array<[string, string]> = [
+    ['registry', 'access'],
+    ['registry', 'access'],
+  ];
+  return withRelatedEventsOnOrigin(baseTree, withRelatedEvents);
+}
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/__snapshots__/isometric_taxi_layout.test.ts.snap b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/__snapshots__/isometric_taxi_layout.test.ts.snap
index 6f26bfe063c05..db8d047c2ce86 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/__snapshots__/isometric_taxi_layout.test.ts.snap
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/__snapshots__/isometric_taxi_layout.test.ts.snap
@@ -182,7 +182,7 @@ Object {
   "edgeLineSegments": Array [
     Object {
       "metadata": Object {
-        "uniqueId": "parentToMid",
+        "uniqueId": "parentToMidedge:0:1",
       },
       "points": Array [
         Array [
@@ -197,7 +197,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "midway",
+        "uniqueId": "midwayedge:0:1",
       },
       "points": Array [
         Array [
@@ -212,7 +212,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "",
+        "uniqueId": "edge:0:1",
       },
       "points": Array [
         Array [
@@ -227,7 +227,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "",
+        "uniqueId": "edge:0:2",
       },
       "points": Array [
         Array [
@@ -242,7 +242,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "",
+        "uniqueId": "edge:0:8",
       },
       "points": Array [
         Array [
@@ -257,7 +257,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "parentToMid13",
+        "uniqueId": "parentToMidedge:1:3",
       },
       "points": Array [
         Array [
@@ -272,7 +272,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "midway13",
+        "uniqueId": "midwayedge:1:3",
       },
       "points": Array [
         Array [
@@ -287,7 +287,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "13",
+        "uniqueId": "edge:1:3",
       },
       "points": Array [
         Array [
@@ -302,7 +302,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "14",
+        "uniqueId": "edge:1:4",
       },
       "points": Array [
         Array [
@@ -317,7 +317,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "parentToMid25",
+        "uniqueId": "parentToMidedge:2:5",
       },
       "points": Array [
         Array [
@@ -332,7 +332,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "midway25",
+        "uniqueId": "midwayedge:2:5",
       },
       "points": Array [
         Array [
@@ -347,7 +347,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "25",
+        "uniqueId": "edge:2:5",
       },
       "points": Array [
         Array [
@@ -362,7 +362,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "26",
+        "uniqueId": "edge:2:6",
       },
       "points": Array [
         Array [
@@ -377,7 +377,7 @@ Object {
     },
     Object {
       "metadata": Object {
-        "uniqueId": "67",
+        "uniqueId": "edge:6:7",
       },
       "points": Array [
         Array [
@@ -584,7 +584,7 @@ Object {
   "edgeLineSegments": Array [
     Object {
       "metadata": Object {
-        "uniqueId": "",
+        "uniqueId": "edge:0:1",
       },
       "points": Array [
         Array [
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.ts
index 060a014b8730f..f6b893ba25b78 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/index.ts
@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { uniquePidForProcess, uniqueParentPidForProcess, orderByTime } from '../process_event';
+import { orderByTime } from '../process_event';
 import { IndexedProcessTree } from '../../types';
-import { ResolverEvent } from '../../../../common/endpoint/types';
+import { SafeResolverEvent } from '../../../../common/endpoint/types';
 import { levelOrder as baseLevelOrder } from '../../lib/tree_sequencers';
+import * as eventModel from '../../../../common/endpoint/models/event';
 
 /**
  * Create a new IndexedProcessTree from an array of ProcessEvents.
@@ -15,24 +16,25 @@ import { levelOrder as baseLevelOrder } from '../../lib/tree_sequencers';
  */
 export function factory(
   // Array of processes to index as a tree
-  processes: ResolverEvent[]
+  processes: SafeResolverEvent[]
 ): IndexedProcessTree {
-  const idToChildren = new Map<string | undefined, ResolverEvent[]>();
-  const idToValue = new Map<string, ResolverEvent>();
+  const idToChildren = new Map<string | undefined, SafeResolverEvent[]>();
+  const idToValue = new Map<string, SafeResolverEvent>();
 
   for (const process of processes) {
-    const uniqueProcessPid = uniquePidForProcess(process);
-    idToValue.set(uniqueProcessPid, process);
+    const entityID: string | undefined = eventModel.entityIDSafeVersion(process);
+    if (entityID !== undefined) {
+      idToValue.set(entityID, process);
 
-    // NB: If the value was null or undefined, use `undefined`
-    const uniqueParentPid: string | undefined = uniqueParentPidForProcess(process) ?? undefined;
+      const uniqueParentPid: string | undefined = eventModel.parentEntityIDSafeVersion(process);
 
-    let childrenWithTheSameParent = idToChildren.get(uniqueParentPid);
-    if (!childrenWithTheSameParent) {
-      childrenWithTheSameParent = [];
-      idToChildren.set(uniqueParentPid, childrenWithTheSameParent);
+      let childrenWithTheSameParent = idToChildren.get(uniqueParentPid);
+      if (!childrenWithTheSameParent) {
+        childrenWithTheSameParent = [];
+        idToChildren.set(uniqueParentPid, childrenWithTheSameParent);
+      }
+      childrenWithTheSameParent.push(process);
     }
-    childrenWithTheSameParent.push(process);
   }
 
   // sort the children of each node
@@ -49,7 +51,10 @@ export function factory(
 /**
  * Returns an array with any children `ProcessEvent`s of the passed in `process`
  */
-export function children(tree: IndexedProcessTree, parentID: string | undefined): ResolverEvent[] {
+export function children(
+  tree: IndexedProcessTree,
+  parentID: string | undefined
+): SafeResolverEvent[] {
   const currentProcessSiblings = tree.idToChildren.get(parentID);
   return currentProcessSiblings === undefined ? [] : currentProcessSiblings;
 }
@@ -57,7 +62,7 @@ export function children(tree: IndexedProcessTree, parentID: string | undefined)
 /**
  * Get the indexed process event for the ID
  */
-export function processEvent(tree: IndexedProcessTree, entityID: string): ResolverEvent | null {
+export function processEvent(tree: IndexedProcessTree, entityID: string): SafeResolverEvent | null {
   return tree.idToProcess.get(entityID) ?? null;
 }
 
@@ -66,9 +71,9 @@ export function processEvent(tree: IndexedProcessTree, entityID: string): Resolv
  */
 export function parent(
   tree: IndexedProcessTree,
-  childProcess: ResolverEvent
-): ResolverEvent | undefined {
-  const uniqueParentPid = uniqueParentPidForProcess(childProcess);
+  childProcess: SafeResolverEvent
+): SafeResolverEvent | undefined {
+  const uniqueParentPid = eventModel.parentEntityIDSafeVersion(childProcess);
   if (uniqueParentPid === undefined) {
     return undefined;
   } else {
@@ -91,7 +96,7 @@ export function root(tree: IndexedProcessTree) {
     return null;
   }
   // any node will do
-  let current: ResolverEvent = tree.idToProcess.values().next().value;
+  let current: SafeResolverEvent = tree.idToProcess.values().next().value;
 
   // iteratively swap current w/ its parent
   while (parent(tree, current) !== undefined) {
@@ -106,8 +111,8 @@ export function root(tree: IndexedProcessTree) {
 export function* levelOrder(tree: IndexedProcessTree) {
   const rootNode = root(tree);
   if (rootNode !== null) {
-    yield* baseLevelOrder(rootNode, (parentNode: ResolverEvent): ResolverEvent[] =>
-      children(tree, uniquePidForProcess(parentNode))
+    yield* baseLevelOrder(rootNode, (parentNode: SafeResolverEvent): SafeResolverEvent[] =>
+      children(tree, eventModel.entityIDSafeVersion(parentNode))
     );
   }
 }
diff --git a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts
index 1fc2ea0150aee..f0880fa635a24 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/indexed_process_tree/isometric_taxi_layout.ts
@@ -14,12 +14,11 @@ import {
   Matrix3,
   IsometricTaxiLayout,
 } from '../../types';
-import * as event from '../../../../common/endpoint/models/event';
-import { ResolverEvent } from '../../../../common/endpoint/types';
+import * as eventModel from '../../../../common/endpoint/models/event';
+import { SafeResolverEvent } from '../../../../common/endpoint/types';
 import * as vector2 from '../vector2';
 import * as indexedProcessTreeModel from './index';
 import { getFriendlyElapsedTime as elapsedTime } from '../../lib/date';
-import { uniquePidForProcess } from '../process_event';
 
 /**
  * Graph the process tree
@@ -30,25 +29,29 @@ export function isometricTaxiLayoutFactory(
   /**
    * Walk the tree in reverse level order, calculating the 'width' of subtrees.
    */
-  const widths = widthsOfProcessSubtrees(indexedProcessTree);
+  const widths: Map<SafeResolverEvent, number> = widthsOfProcessSubtrees(indexedProcessTree);
 
   /**
    * Walk the tree in level order. Using the precalculated widths, calculate the position of nodes.
    * Nodes are positioned relative to their parents and preceding siblings.
    */
-  const positions = processPositions(indexedProcessTree, widths);
+  const positions: Map<SafeResolverEvent, Vector2> = processPositions(indexedProcessTree, widths);
 
   /**
    * With the widths and positions precalculated, we calculate edge line segments (arrays of vector2s)
    * which connect them in a 'pitchfork' design.
    */
-  const edgeLineSegments = processEdgeLineSegments(indexedProcessTree, widths, positions);
+  const edgeLineSegments: EdgeLineSegment[] = processEdgeLineSegments(
+    indexedProcessTree,
+    widths,
+    positions
+  );
 
   /**
    * Transform the positions of nodes and edges so they seem like they are on an isometric grid.
    */
   const transformedEdgeLineSegments: EdgeLineSegment[] = [];
-  const transformedPositions = new Map<ResolverEvent, Vector2>();
+  const transformedPositions = new Map<SafeResolverEvent, Vector2>();
 
   for (const [processEvent, position] of positions) {
     transformedPositions.set(
@@ -83,8 +86,8 @@ export function isometricTaxiLayoutFactory(
 /**
  * Calculate a level (starting at 1) for each node.
  */
-function ariaLevels(indexedProcessTree: IndexedProcessTree): Map<ResolverEvent, number> {
-  const map: Map<ResolverEvent, number> = new Map();
+function ariaLevels(indexedProcessTree: IndexedProcessTree): Map<SafeResolverEvent, number> {
+  const map: Map<SafeResolverEvent, number> = new Map();
   for (const node of indexedProcessTreeModel.levelOrder(indexedProcessTree)) {
     const parentNode = indexedProcessTreeModel.parent(indexedProcessTree, node);
     if (parentNode === undefined) {
@@ -143,20 +146,20 @@ function ariaLevels(indexedProcessTree: IndexedProcessTree): Map<ResolverEvent,
  *
  */
 function widthsOfProcessSubtrees(indexedProcessTree: IndexedProcessTree): ProcessWidths {
-  const widths = new Map<ResolverEvent, number>();
+  const widths = new Map<SafeResolverEvent, number>();
 
   if (indexedProcessTreeModel.size(indexedProcessTree) === 0) {
     return widths;
   }
 
-  const processesInReverseLevelOrder: ResolverEvent[] = [
+  const processesInReverseLevelOrder: SafeResolverEvent[] = [
     ...indexedProcessTreeModel.levelOrder(indexedProcessTree),
   ].reverse();
 
   for (const process of processesInReverseLevelOrder) {
     const children = indexedProcessTreeModel.children(
       indexedProcessTree,
-      uniquePidForProcess(process)
+      eventModel.entityIDSafeVersion(process)
     );
 
     const sumOfWidthOfChildren = function sumOfWidthOfChildren() {
@@ -167,7 +170,7 @@ function widthsOfProcessSubtrees(indexedProcessTree: IndexedProcessTree): Proces
          * Therefore a parent can always find a width for its children, since all of its children
          * will have been handled already.
          */
-        return currentValue + widths.get(child)!;
+        return currentValue + (widths.get(child) ?? 0);
       }, 0);
     };
 
@@ -178,6 +181,9 @@ function widthsOfProcessSubtrees(indexedProcessTree: IndexedProcessTree): Proces
   return widths;
 }
 
+/**
+ * Layout the graph. Note: if any process events are missing the `entity_id`, this will throw an Error.
+ */
 function processEdgeLineSegments(
   indexedProcessTree: IndexedProcessTree,
   widths: ProcessWidths,
@@ -196,9 +202,13 @@ function processEdgeLineSegments(
     const { process, parent, parentWidth } = metadata;
     const position = positions.get(process);
     const parentPosition = positions.get(parent);
-    const parentId = event.entityId(parent);
-    const processEntityId = event.entityId(process);
-    const edgeLineId = parentId ? parentId + processEntityId : parentId;
+    const parentID = eventModel.entityIDSafeVersion(parent);
+    const processEntityID = eventModel.entityIDSafeVersion(process);
+
+    if (processEntityID === undefined) {
+      throw new Error('tried to graph a Resolver that had a process with no `process.entity_id`');
+    }
+    const edgeLineID = `edge:${parentID ?? 'undefined'}:${processEntityID}`;
 
     if (position === undefined || parentPosition === undefined) {
       /**
@@ -207,12 +217,12 @@ function processEdgeLineSegments(
       throw new Error();
     }
 
-    const parentTime = event.eventTimestamp(parent);
-    const processTime = event.eventTimestamp(process);
+    const parentTime = eventModel.timestampSafeVersion(parent);
+    const processTime = eventModel.timestampSafeVersion(process);
     if (parentTime && processTime) {
       edgeLineMetadata.elapsedTime = elapsedTime(parentTime, processTime) ?? undefined;
     }
-    edgeLineMetadata.uniqueId = edgeLineId;
+    edgeLineMetadata.uniqueId = edgeLineID;
 
     /**
      * The point halfway between the parent and child on the y axis, we sometimes have a hard angle here in the edge line
@@ -236,7 +246,7 @@ function processEdgeLineSegments(
 
     const siblings = indexedProcessTreeModel.children(
       indexedProcessTree,
-      uniquePidForProcess(parent)
+      eventModel.entityIDSafeVersion(parent)
     );
     const isFirstChild = process === siblings[0];
 
@@ -260,7 +270,7 @@ function processEdgeLineSegments(
 
       const lineFromParentToMidwayLine: EdgeLineSegment = {
         points: [parentPosition, [parentPosition[0], midwayY]],
-        metadata: { uniqueId: `parentToMid${edgeLineId}` },
+        metadata: { uniqueId: `parentToMid${edgeLineID}` },
       };
 
       const widthOfMidline = parentWidth - firstChildWidth / 2 - lastChildWidth / 2;
@@ -281,7 +291,7 @@ function processEdgeLineSegments(
             midwayY,
           ],
         ],
-        metadata: { uniqueId: `midway${edgeLineId}` },
+        metadata: { uniqueId: `midway${edgeLineID}` },
       };
 
       edgeLineSegments.push(
@@ -303,13 +313,13 @@ function processPositions(
   indexedProcessTree: IndexedProcessTree,
   widths: ProcessWidths
 ): ProcessPositions {
-  const positions = new Map<ResolverEvent, Vector2>();
+  const positions = new Map<SafeResolverEvent, Vector2>();
   /**
    * This algorithm iterates the tree in level order. It keeps counters that are reset for each parent.
    * By keeping track of the last parent node, we can know when we are dealing with a new set of siblings and
    * reset the counters.
    */
-  let lastProcessedParentNode: ResolverEvent | undefined;
+  let lastProcessedParentNode: SafeResolverEvent | undefined;
   /**
    * Nodes are positioned relative to their siblings. We walk this in level order, so we handle
    * children left -> right.
@@ -431,7 +441,10 @@ function* levelOrderWithWidths(
         parentWidth,
       };
 
-      const siblings = indexedProcessTreeModel.children(tree, uniquePidForProcess(parent));
+      const siblings = indexedProcessTreeModel.children(
+        tree,
+        eventModel.entityIDSafeVersion(parent)
+      );
       if (siblings.length === 1) {
         metadata.isOnlyChild = true;
         metadata.lastChildWidth = width;
@@ -488,7 +501,10 @@ const distanceBetweenNodesInUnits = 2;
  */
 const distanceBetweenNodes = distanceBetweenNodesInUnits * unit;
 
-export function nodePosition(model: IsometricTaxiLayout, node: ResolverEvent): Vector2 | undefined {
+export function nodePosition(
+  model: IsometricTaxiLayout,
+  node: SafeResolverEvent
+): Vector2 | undefined {
   return model.processNodePositions.get(node);
 }
 
diff --git a/x-pack/plugins/security_solution/public/resolver/models/process_event.test.ts b/x-pack/plugins/security_solution/public/resolver/models/process_event.test.ts
index 4b1d555d0a7c3..4d48b34fb2841 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/process_event.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/process_event.test.ts
@@ -6,7 +6,11 @@
 import { eventType, orderByTime, userInfoForProcess } from './process_event';
 
 import { mockProcessEvent } from './process_event_test_helpers';
-import { LegacyEndpointEvent, ResolverEvent } from '../../../common/endpoint/types';
+import {
+  LegacyEndpointEvent,
+  ResolverEvent,
+  SafeResolverEvent,
+} from '../../../common/endpoint/types';
 
 describe('process event', () => {
   describe('eventType', () => {
@@ -42,7 +46,7 @@ describe('process event', () => {
   });
   describe('orderByTime', () => {
     let mock: (time: number, eventID: string) => ResolverEvent;
-    let events: ResolverEvent[];
+    let events: SafeResolverEvent[];
     beforeEach(() => {
       mock = (time, eventID) => {
         return {
@@ -56,14 +60,14 @@ describe('process event', () => {
       // each event has a unique id, a through h
       // order is arbitrary
       events = [
-        mock(-1, 'a'),
-        mock(0, 'c'),
-        mock(1, 'e'),
-        mock(NaN, 'g'),
-        mock(-1, 'b'),
-        mock(0, 'd'),
-        mock(1, 'f'),
-        mock(NaN, 'h'),
+        mock(-1, 'a') as SafeResolverEvent,
+        mock(0, 'c') as SafeResolverEvent,
+        mock(1, 'e') as SafeResolverEvent,
+        mock(NaN, 'g') as SafeResolverEvent,
+        mock(-1, 'b') as SafeResolverEvent,
+        mock(0, 'd') as SafeResolverEvent,
+        mock(1, 'f') as SafeResolverEvent,
+        mock(NaN, 'h') as SafeResolverEvent,
       ];
     });
     it('sorts events as expected', () => {
diff --git a/x-pack/plugins/security_solution/public/resolver/models/process_event.ts b/x-pack/plugins/security_solution/public/resolver/models/process_event.ts
index 1a5c67f6a6f2f..ea588731a55c8 100644
--- a/x-pack/plugins/security_solution/public/resolver/models/process_event.ts
+++ b/x-pack/plugins/security_solution/public/resolver/models/process_event.ts
@@ -5,7 +5,7 @@
  */
 
 import * as event from '../../../common/endpoint/models/event';
-import { ResolverEvent } from '../../../common/endpoint/types';
+import { ResolverEvent, SafeResolverEvent } from '../../../common/endpoint/types';
 import { ResolverProcessType } from '../types';
 
 /**
@@ -32,8 +32,8 @@ export function isTerminatedProcess(passedEvent: ResolverEvent) {
  * ms since Unix epoc, based on timestamp.
  * may return NaN if the timestamp wasn't present or was invalid.
  */
-export function datetime(passedEvent: ResolverEvent): number | null {
-  const timestamp = event.eventTimestamp(passedEvent);
+export function datetime(passedEvent: SafeResolverEvent): number | null {
+  const timestamp = event.timestampSafeVersion(passedEvent);
 
   const time = timestamp === undefined ? 0 : new Date(timestamp).getTime();
 
@@ -178,13 +178,15 @@ export function argsForProcess(passedEvent: ResolverEvent): string | undefined {
 /**
  * used to sort events
  */
-export function orderByTime(first: ResolverEvent, second: ResolverEvent): number {
+export function orderByTime(first: SafeResolverEvent, second: SafeResolverEvent): number {
   const firstDatetime: number | null = datetime(first);
   const secondDatetime: number | null = datetime(second);
 
   if (firstDatetime === secondDatetime) {
     // break ties using an arbitrary (stable) comparison of `eventId` (which should be unique)
-    return String(event.eventId(first)).localeCompare(String(event.eventId(second)));
+    return String(event.eventIDSafeVersion(first)).localeCompare(
+      String(event.eventIDSafeVersion(second))
+    );
   } else if (firstDatetime === null || secondDatetime === null) {
     // sort `null`'s as higher than numbers
     return (firstDatetime === null ? 1 : 0) - (secondDatetime === null ? 1 : 0);
diff --git a/x-pack/plugins/security_solution/public/resolver/store/actions.ts b/x-pack/plugins/security_solution/public/resolver/store/actions.ts
index 418eb0d837276..29c03215e9ff4 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/actions.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/actions.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { CameraAction } from './camera';
-import { ResolverEvent } from '../../../common/endpoint/types';
+import { ResolverEvent, SafeResolverEvent } from '../../../common/endpoint/types';
 import { DataAction } from './data/action';
 
 /**
@@ -96,7 +96,7 @@ interface UserSelectedResolverNode {
 interface UserSelectedRelatedEventCategory {
   readonly type: 'userSelectedRelatedEventCategory';
   readonly payload: {
-    subject: ResolverEvent;
+    subject: SafeResolverEvent;
     category?: string;
   };
 }
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
index 6786a93f1d9ca..15a981d460730 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
@@ -15,7 +15,7 @@ import {
   mockTreeWith1AncestorAnd2ChildrenAndAllNodesHave2GraphableEvents,
   mockTreeWithAllProcessesTerminated,
   mockTreeWithNoProcessEvents,
-} from '../mocks/resolver_tree';
+} from '../../mocks/resolver_tree';
 import { uniquePidForProcess } from '../../models/process_event';
 import { EndpointEvent } from '../../../../common/endpoint/types';
 
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts
index 272d0aae7eef4..569a24bb8537e 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts
@@ -28,10 +28,11 @@ import {
   ResolverTree,
   ResolverNodeStats,
   ResolverRelatedEvents,
+  SafeResolverEvent,
 } from '../../../../common/endpoint/types';
 import * as resolverTreeModel from '../../models/resolver_tree';
 import * as isometricTaxiLayoutModel from '../../models/indexed_process_tree/isometric_taxi_layout';
-import { allEventCategories } from '../../../../common/endpoint/models/event';
+import * as eventModel from '../../../../common/endpoint/models/event';
 import * as vector2 from '../../models/vector2';
 
 /**
@@ -145,7 +146,7 @@ export const tree = createSelector(graphableProcesses, function indexedTree(
   graphableProcesses
   /* eslint-enable no-shadow */
 ) {
-  return indexedProcessTreeModel.factory(graphableProcesses);
+  return indexedProcessTreeModel.factory(graphableProcesses as SafeResolverEvent[]);
 });
 
 /**
@@ -194,7 +195,9 @@ export const relatedEventsByCategory: (
         }
         return relatedById.events.reduce(
           (eventsByCategory: ResolverEvent[], candidate: ResolverEvent) => {
-            if ([candidate && allEventCategories(candidate)].flat().includes(ecsCategory)) {
+            if (
+              [candidate && eventModel.allEventCategories(candidate)].flat().includes(ecsCategory)
+            ) {
               eventsByCategory.push(candidate);
             }
             return eventsByCategory;
@@ -280,7 +283,7 @@ export const relatedEventInfoByEntityId: (
           return [];
         }
         return eventsResponseForThisEntry.events.filter((resolverEvent) => {
-          for (const category of [allEventCategories(resolverEvent)].flat()) {
+          for (const category of [eventModel.allEventCategories(resolverEvent)].flat()) {
             if (category === eventCategory) {
               return true;
             }
@@ -404,7 +407,7 @@ export const processEventForID: (
 ) => (nodeID: string) => ResolverEvent | null = createSelector(
   tree,
   (indexedProcessTree) => (nodeID: string) =>
-    indexedProcessTreeModel.processEvent(indexedProcessTree, nodeID)
+    indexedProcessTreeModel.processEvent(indexedProcessTree, nodeID) as ResolverEvent
 );
 
 /**
@@ -415,7 +418,7 @@ export const ariaLevel: (state: DataState) => (nodeID: string) => number | null
   processEventForID,
   ({ ariaLevels }, processEventGetter) => (nodeID: string) => {
     const node = processEventGetter(nodeID);
-    return node ? ariaLevels.get(node) ?? null : null;
+    return node ? ariaLevels.get(node as SafeResolverEvent) ?? null : null;
   }
 );
 
@@ -468,10 +471,10 @@ export const ariaFlowtoCandidate: (
       for (const child of children) {
         if (previousChild !== null) {
           // Set the `child` as the following sibling of `previousChild`.
-          memo.set(uniquePidForProcess(previousChild), uniquePidForProcess(child));
+          memo.set(uniquePidForProcess(previousChild), uniquePidForProcess(child as ResolverEvent));
         }
         // Set the child as the previous child.
-        previousChild = child;
+        previousChild = child as ResolverEvent;
       }
 
       if (previousChild) {
@@ -553,7 +556,7 @@ export const nodesAndEdgelines: (
       maxX,
       maxY,
     });
-    const visibleProcessNodePositions = new Map<ResolverEvent, Vector2>(
+    const visibleProcessNodePositions = new Map<SafeResolverEvent, Vector2>(
       entities
         .filter((entity): entity is IndexedProcessNode => entity.type === 'processNode')
         .map((node) => [node.entity, node.position])
diff --git a/x-pack/plugins/security_solution/public/resolver/store/methods.ts b/x-pack/plugins/security_solution/public/resolver/store/methods.ts
index ad06ddf36161a..8dd15b1a44d0c 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/methods.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/methods.ts
@@ -7,7 +7,7 @@
 import { animatePanning } from './camera/methods';
 import { layout } from './selectors';
 import { ResolverState } from '../types';
-import { ResolverEvent } from '../../../common/endpoint/types';
+import { ResolverEvent, SafeResolverEvent } from '../../../common/endpoint/types';
 
 const animationDuration = 1000;
 
@@ -20,7 +20,7 @@ export function animateProcessIntoView(
   process: ResolverEvent
 ): ResolverState {
   const { processNodePositions } = layout(state);
-  const position = processNodePositions.get(process);
+  const position = processNodePositions.get(process as SafeResolverEvent);
   if (position) {
     return {
       ...state,
diff --git a/x-pack/plugins/security_solution/public/resolver/store/mocks/related_event.ts b/x-pack/plugins/security_solution/public/resolver/store/mocks/related_event.ts
deleted file mode 100644
index 1e0c460a3a711..0000000000000
--- a/x-pack/plugins/security_solution/public/resolver/store/mocks/related_event.ts
+++ /dev/null
@@ -1,36 +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 { EndpointEvent } from '../../../../common/endpoint/types';
-
-/**
- * Simple mock related event.
- */
-export function mockRelatedEvent({
-  entityID,
-  timestamp,
-  category,
-  type,
-  id,
-}: {
-  entityID: string;
-  timestamp: number;
-  category: string;
-  type: string;
-  id?: string;
-}): EndpointEvent {
-  return {
-    '@timestamp': timestamp,
-    event: {
-      kind: 'event',
-      type,
-      category,
-      id: id ?? 'xyz',
-    },
-    process: {
-      entity_id: entityID,
-    },
-  } as EndpointEvent;
-}
diff --git a/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts b/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
index df365a078b27f..f113e861d3ce9 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/selectors.test.ts
@@ -12,7 +12,8 @@ import * as selectors from './selectors';
 import {
   mockTreeWith2AncestorsAndNoChildren,
   mockTreeWithNoAncestorsAnd2Children,
-} from './mocks/resolver_tree';
+} from '../mocks/resolver_tree';
+import { SafeResolverEvent } from '../../../common/endpoint/types';
 
 describe('resolver selectors', () => {
   const actions: ResolverAction[] = [];
@@ -114,7 +115,9 @@ describe('resolver selectors', () => {
 
           // find the position of the second child
           const secondChild = selectors.processEventForID(state())(secondChildID);
-          const positionOfSecondChild = layout.processNodePositions.get(secondChild!)!;
+          const positionOfSecondChild = layout.processNodePositions.get(
+            secondChild as SafeResolverEvent
+          )!;
 
           // the child is indexed by an AABB that extends -720/2 to the left
           const leftSideOfSecondChildAABB = positionOfSecondChild[0] - 720 / 2;
@@ -130,19 +133,25 @@ describe('resolver selectors', () => {
         it('the origin should be in view', () => {
           const origin = selectors.processEventForID(state())(originID)!;
           expect(
-            selectors.visibleNodesAndEdgeLines(state())(0).processNodePositions.has(origin)
+            selectors
+              .visibleNodesAndEdgeLines(state())(0)
+              .processNodePositions.has(origin as SafeResolverEvent)
           ).toBe(true);
         });
         it('the first child should be in view', () => {
           const firstChild = selectors.processEventForID(state())(firstChildID)!;
           expect(
-            selectors.visibleNodesAndEdgeLines(state())(0).processNodePositions.has(firstChild)
+            selectors
+              .visibleNodesAndEdgeLines(state())(0)
+              .processNodePositions.has(firstChild as SafeResolverEvent)
           ).toBe(true);
         });
         it('the second child should not be in view', () => {
           const secondChild = selectors.processEventForID(state())(secondChildID)!;
           expect(
-            selectors.visibleNodesAndEdgeLines(state())(0).processNodePositions.has(secondChild)
+            selectors
+              .visibleNodesAndEdgeLines(state())(0)
+              .processNodePositions.has(secondChild as SafeResolverEvent)
           ).toBe(false);
         });
         it('should return nothing as the flowto for the first child', () => {
diff --git a/x-pack/plugins/security_solution/public/resolver/store/selectors.ts b/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
index 87ef8d5d095ef..70a461909a99b 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
@@ -9,8 +9,8 @@ import * as cameraSelectors from './camera/selectors';
 import * as dataSelectors from './data/selectors';
 import * as uiSelectors from './ui/selectors';
 import { ResolverState, IsometricTaxiLayout } from '../types';
-import { uniquePidForProcess } from '../models/process_event';
 import { ResolverEvent, ResolverNodeStats } from '../../../common/endpoint/types';
+import { entityIDSafeVersion } from '../../../common/endpoint/models/event';
 
 /**
  * A matrix that when applied to a Vector2 will convert it from world coordinates to screen coordinates.
@@ -271,9 +271,14 @@ export const ariaFlowtoNodeID: (
       const { processNodePositions } = visibleNodesAndEdgeLinesAtTime(time);
 
       // get a `Set` containing their node IDs
-      const nodesVisibleAtTime: Set<string> = new Set(
-        [...processNodePositions.keys()].map(uniquePidForProcess)
-      );
+      const nodesVisibleAtTime: Set<string> = new Set();
+      // NB: in practice, any event that has been graphed is guaranteed to have an entity_id
+      for (const visibleEvent of processNodePositions.keys()) {
+        const nodeID = entityIDSafeVersion(visibleEvent);
+        if (nodeID !== undefined) {
+          nodesVisibleAtTime.add(nodeID);
+        }
+      }
 
       // return the ID of `nodeID`'s following sibling, if it is visible
       return (nodeID: string): string | null => {
diff --git a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
index ed30643ed871e..6f44c5aee7cac 100644
--- a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
@@ -113,83 +113,21 @@ export class Simulator {
   }
 
   /**
-   * Return a promise that resolves after the `store`'s next state transition.
-   * Used by `mapStateTransitions`
+   * Yield the result of `mapper` over and over, once per event-loop cycle.
+   * After 10 times, quit.
+   * Use this to continually check a value. See `toYieldEqualTo`.
    */
-  private stateTransitioned(): Promise<void> {
-    // keep track of the resolve function of the promise that has been returned.
-    let resolveState: (() => void) | null = null;
-
-    const promise: Promise<undefined> = new Promise((resolve) => {
-      // Immediately expose the resolve function in the outer scope. It will be resolved when the next state transition occurs.
-      resolveState = resolve;
-    });
-
-    // Subscribe to the store
-    const unsubscribe = this.store.subscribe(() => {
-      // Once a state transition occurs, unsubscribe.
-      unsubscribe();
-      // Resolve the promise. The null assertion is safe here as Promise initializers run immediately (according to spec and node/browser implementations.)
-      // NB: the state is not resolved here. Code using the simulator should not rely on state or selectors of state.
-      resolveState!();
-    });
-
-    // Return the promise that will be resolved on the next state transition, allowing code to `await` for the next state transition.
-    return promise;
-  }
-
-  /**
-   * This will yield the return value of `mapper` after each state transition. If no state transition occurs for 10 event loops in a row, this will give up.
-   */
-  public async *mapStateTransitions<R>(mapper: () => R): AsyncIterable<R> {
-    // Yield the value before any state transitions have occurred.
-    yield mapper();
-
-    /** Increment this each time an event loop completes without a state transition.
-     * If this value hits `10`, end the loop.
-     *
-     * Code will test assertions after each state transition. If the assertion hasn't passed and no further state transitions occur,
-     * then the jest timeout will happen. The timeout doesn't give a useful message about the assertion.
-     * By short-circuiting this function, code that uses it can short circuit the test timeout and print a useful error message.
-     *
-     * NB: the logic to short-circuit the loop is here because knowledge of state is a concern of the simulator, not tests.
-     */
+  public async *map<R>(mapper: () => R): AsyncIterable<R> {
     let timeoutCount = 0;
-    while (true) {
-      /**
-       * `await` a race between the next state transition and a timeout that happens after `0`ms.
-       * If the timeout wins, no `dispatch` call caused a state transition in the last loop.
-       * If this keeps happening, assume that Resolver isn't going to do anything else.
-       *
-       * If Resolver adds intentional delay logic (e.g. waiting before making a request), this code might have to change.
-       * In that case, Resolver should use the side effect context to schedule future work. This code could then subscribe to some event published by the side effect context. That way, this code will be aware of Resolver's intention to do work.
-       */
-      const timedOut: boolean = await Promise.race([
-        (async (): Promise<false> => {
-          await this.stateTransitioned();
-          // If a state transition occurs, return false for `timedOut`
-          return false;
-        })(),
-        new Promise<true>((resolve) => {
-          setTimeout(() => {
-            // If a timeout occurs, resolve `timedOut` as true
-            return resolve(true);
-          }, 0);
-        }),
-      ]);
-
-      if (timedOut) {
-        // If a timout occurred, note it.
-        timeoutCount++;
-        if (timeoutCount === 10) {
-          // if 10 timeouts happen in a row, end the loop early
-          return;
-        }
-      } else {
-        // If a state transition occurs, reset the timeout count and yield the value
-        timeoutCount = 0;
-        yield mapper();
-      }
+    while (timeoutCount < 10) {
+      timeoutCount++;
+      yield mapper();
+      await new Promise((resolve) => {
+        setTimeout(() => {
+          this.wrapper.update();
+          resolve();
+        }, 0);
+      });
     }
   }
 
@@ -198,25 +136,22 @@ export class Simulator {
    * returns a `ReactWrapper` even if nothing is found, as that is how `enzyme` does things.
    */
   public processNodeElements(options: ProcessNodeElementSelectorOptions = {}): ReactWrapper {
-    return this.findInDOM(processNodeElementSelector(options));
+    return this.domNodes(processNodeElementSelector(options));
   }
 
   /**
-   * true if a process node element is found for the entityID and if it has an [aria-selected] attribute.
+   * Return the node element with the given `entityID`.
    */
-  public processNodeElementLooksSelected(entityID: string): boolean {
-    return this.processNodeElements({ entityID, selected: true }).length === 1;
+  public selectedProcessNode(entityID: string): ReactWrapper {
+    return this.processNodeElements({ entityID, selected: true });
   }
 
   /**
-   * true if a process node element is found for the entityID and if it *does not have* an [aria-selected] attribute.
+   * Return the node element with the given `entityID`. It will only be returned if it is not selected.
    */
-  public processNodeElementLooksUnselected(entityID: string): boolean {
-    //  find the process node, then exclude it if its selected.
-    return (
-      this.processNodeElements({ entityID }).not(
-        processNodeElementSelector({ entityID, selected: true })
-      ).length === 1
+  public unselectedProcessNode(entityID: string): ReactWrapper {
+    return this.processNodeElements({ entityID }).not(
+      processNodeElementSelector({ entityID, selected: true })
     );
   }
 
@@ -234,11 +169,8 @@ export class Simulator {
    * @param entityID The entity ID of the proocess node to select in
    */
   public processNodeRelatedEventButton(entityID: string): ReactWrapper {
-    return this.processNodeElements({ entityID }).findWhere(
-      (wrapper) =>
-        // Filter out React components
-        typeof wrapper.type() === 'string' &&
-        wrapper.prop('data-test-subj') === 'resolver:submenu:button'
+    return this.domNodes(
+      `${processNodeElementSelector({ entityID })} [data-test-subj="resolver:submenu:button"]`
     );
   }
 
@@ -256,42 +188,98 @@ export class Simulator {
    * The element that shows when Resolver is waiting for the graph data.
    */
   public graphLoadingElement(): ReactWrapper {
-    return this.findInDOM('[data-test-subj="resolver:graph:loading"]');
+    return this.domNodes('[data-test-subj="resolver:graph:loading"]');
   }
 
   /**
    * The element that shows if Resolver couldn't draw the graph.
    */
   public graphErrorElement(): ReactWrapper {
-    return this.findInDOM('[data-test-subj="resolver:graph:error"]');
+    return this.domNodes('[data-test-subj="resolver:graph:error"]');
   }
 
   /**
    * The element where nodes get drawn.
    */
   public graphElement(): ReactWrapper {
-    return this.findInDOM('[data-test-subj="resolver:graph"]');
+    return this.domNodes('[data-test-subj="resolver:graph"]');
+  }
+
+  /**
+   * An element with a list of all nodes.
+   */
+  public nodeListElement(): ReactWrapper {
+    return this.domNodes('[data-test-subj="resolver:node-list"]');
+  }
+
+  /**
+   * Return the items in the node list (the default panel view.)
+   */
+  public nodeListItems(): ReactWrapper {
+    return this.domNodes('[data-test-subj="resolver:node-list:item"]');
+  }
+
+  /**
+   * The element containing the details for the selected node.
+   */
+  public nodeDetailElement(): ReactWrapper {
+    return this.domNodes('[data-test-subj="resolver:node-detail"]');
+  }
+
+  /**
+   * The details of the selected node are shown in a description list. This returns the title elements of the description list.
+   */
+  private nodeDetailEntryTitle(): ReactWrapper {
+    return this.domNodes('[data-test-subj="resolver:node-detail:entry-title"]');
   }
 
   /**
-   * The outer panel container.
+   * The details of the selected node are shown in a description list. This returns the description elements of the description list.
    */
-  public panelElement(): ReactWrapper {
-    return this.findInDOM('[data-test-subj="resolver:panel"]');
+  private nodeDetailEntryDescription(): ReactWrapper {
+    return this.domNodes('[data-test-subj="resolver:node-detail:entry-description"]');
   }
 
   /**
-   * The panel content element (which may include tables, lists, other data depending on the view).
+   * Return DOM nodes that match `enzymeSelector`.
    */
-  public panelContentElement(): ReactWrapper {
-    return this.findInDOM('[data-test-subj^="resolver:panel:"]');
+  private domNodes(enzymeSelector: string): ReactWrapper {
+    return this.wrapper
+      .find(enzymeSelector)
+      .filterWhere((wrapper) => typeof wrapper.type() === 'string');
   }
 
   /**
-   * Like `this.wrapper.find` but only returns DOM nodes.
+   * The titles and descriptions (as text) from the node detail panel.
    */
-  private findInDOM(selector: string): ReactWrapper {
-    return this.wrapper.find(selector).filterWhere((wrapper) => typeof wrapper.type() === 'string');
+  public nodeDetailDescriptionListEntries(): Array<[string, string]> {
+    const titles = this.nodeDetailEntryTitle();
+    const descriptions = this.nodeDetailEntryDescription();
+    const entries: Array<[string, string]> = [];
+    for (let index = 0; index < Math.min(titles.length, descriptions.length); index++) {
+      const title = titles.at(index).text();
+      const description = descriptions.at(index).text();
+
+      // Exclude timestamp since we can't currently calculate the expected description for it from tests
+      if (title !== '@timestamp') {
+        entries.push([title, description]);
+      }
+    }
+    return entries;
+  }
+
+  /**
+   * Resolve the wrapper returned by `wrapperFactory` only once it has at least 1 element in it.
+   */
+  public async resolveWrapper(
+    wrapperFactory: () => ReactWrapper,
+    predicate: (wrapper: ReactWrapper) => boolean = (wrapper) => wrapper.length > 0
+  ): Promise<ReactWrapper | void> {
+    for await (const wrapper of this.map(wrapperFactory)) {
+      if (predicate(wrapper)) {
+        return wrapper;
+      }
+    }
   }
 }
 
diff --git a/x-pack/plugins/security_solution/public/resolver/types.ts b/x-pack/plugins/security_solution/public/resolver/types.ts
index c2871fdceb20a..30634e722050f 100644
--- a/x-pack/plugins/security_solution/public/resolver/types.ts
+++ b/x-pack/plugins/security_solution/public/resolver/types.ts
@@ -11,10 +11,10 @@ import { Middleware, Dispatch } from 'redux';
 import { BBox } from 'rbush';
 import { ResolverAction } from './store/actions';
 import {
-  ResolverEvent,
   ResolverRelatedEvents,
   ResolverTree,
   ResolverEntityIndex,
+  SafeResolverEvent,
 } from '../../common/endpoint/types';
 
 /**
@@ -155,7 +155,7 @@ export interface IndexedEdgeLineSegment extends BBox {
  */
 export interface IndexedProcessNode extends BBox {
   type: 'processNode';
-  entity: ResolverEvent;
+  entity: SafeResolverEvent;
   position: Vector2;
 }
 
@@ -280,21 +280,21 @@ export interface IndexedProcessTree {
   /**
    * Map of ID to a process's ordered children
    */
-  idToChildren: Map<string | undefined, ResolverEvent[]>;
+  idToChildren: Map<string | undefined, SafeResolverEvent[]>;
   /**
    * Map of ID to process
    */
-  idToProcess: Map<string, ResolverEvent>;
+  idToProcess: Map<string, SafeResolverEvent>;
 }
 
 /**
  * A map of `ProcessEvents` (representing process nodes) to the 'width' of their subtrees as calculated by `widthsOfProcessSubtrees`
  */
-export type ProcessWidths = Map<ResolverEvent, number>;
+export type ProcessWidths = Map<SafeResolverEvent, number>;
 /**
  * Map of ProcessEvents (representing process nodes) to their positions. Calculated by `processPositions`
  */
-export type ProcessPositions = Map<ResolverEvent, Vector2>;
+export type ProcessPositions = Map<SafeResolverEvent, Vector2>;
 
 export type DurationTypes =
   | 'millisecond'
@@ -346,11 +346,11 @@ export interface EdgeLineSegment {
  * Used to provide pre-calculated info from `widthsOfProcessSubtrees`. These 'width' values are used in the layout of the graph.
  */
 export type ProcessWithWidthMetadata = {
-  process: ResolverEvent;
+  process: SafeResolverEvent;
   width: number;
 } & (
   | {
-      parent: ResolverEvent;
+      parent: SafeResolverEvent;
       parentWidth: number;
       isOnlyChild: boolean;
       firstChildWidth: number;
@@ -433,7 +433,7 @@ export interface IsometricTaxiLayout {
   /**
    * A map of events to position. Each event represents its own node.
    */
-  processNodePositions: Map<ResolverEvent, Vector2>;
+  processNodePositions: Map<SafeResolverEvent, Vector2>;
   /**
    * A map of edge-line segments, which graphically connect nodes.
    */
@@ -442,7 +442,7 @@ export interface IsometricTaxiLayout {
   /**
    * defines the aria levels for nodes.
    */
-  ariaLevels: Map<ResolverEvent, number>;
+  ariaLevels: Map<SafeResolverEvent, number>;
 }
 
 /**
diff --git a/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx
index c819491dd28f0..98ea235d3524f 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx
@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { oneAncestorTwoChildren } from '../data_access_layer/mocks/one_ancestor_two_children';
+import { noAncestorsTwoChildren } from '../data_access_layer/mocks/no_ancestors_two_children';
 import { Simulator } from '../test_utilities/simulator';
 // Extend jest with a custom matcher
 import '../test_utilities/extend_jest';
+import { noAncestorsTwoChildrenWithRelatedEventsOnOrigin } from '../data_access_layer/mocks/no_ancestors_two_children_with_related_events_on_origin';
 
 let simulator: Simulator;
 let databaseDocumentID: string;
@@ -16,10 +17,10 @@ let entityIDs: { origin: string; firstChild: string; secondChild: string };
 // the resolver component instance ID, used by the react code to distinguish piece of global state from those used by other resolver instances
 const resolverComponentInstanceID = 'resolverComponentInstanceID';
 
-describe('Resolver, when analyzing a tree that has 1 ancestor and 2 children', () => {
+describe('Resolver, when analyzing a tree that has no ancestors and 2 children', () => {
   beforeEach(async () => {
     // create a mock data access layer
-    const { metadata: dataAccessLayerMetadata, dataAccessLayer } = oneAncestorTwoChildren();
+    const { metadata: dataAccessLayerMetadata, dataAccessLayer } = noAncestorsTwoChildren();
 
     // save a reference to the entity IDs exposed by the mock data layer
     entityIDs = dataAccessLayerMetadata.entityIDs;
@@ -40,7 +41,7 @@ describe('Resolver, when analyzing a tree that has 1 ancestor and 2 children', (
          *
          * For example, there might be no loading element at one point, and 1 graph element at one point, but never a single time when there is both 1 graph element and 0 loading elements.
          */
-        simulator.mapStateTransitions(() => ({
+        simulator.map(() => ({
           graphElements: simulator.graphElement().length,
           graphLoadingElements: simulator.graphLoadingElement().length,
           graphErrorElements: simulator.graphErrorElement().length,
@@ -55,22 +56,23 @@ describe('Resolver, when analyzing a tree that has 1 ancestor and 2 children', (
 
     // Combining assertions here for performance. Unfortunately, Enzyme + jsdom + React is slow.
     it(`should have 3 nodes, with the entityID's 'origin', 'firstChild', and 'secondChild'. 'origin' should be selected.`, async () => {
-      expect(simulator.processNodeElementLooksSelected(entityIDs.origin)).toBe(true);
-
-      expect(simulator.processNodeElementLooksUnselected(entityIDs.firstChild)).toBe(true);
-      expect(simulator.processNodeElementLooksUnselected(entityIDs.secondChild)).toBe(true);
-
-      expect(simulator.processNodeElements().length).toBe(3);
+      await expect(
+        simulator.map(() => ({
+          selectedOriginCount: simulator.selectedProcessNode(entityIDs.origin).length,
+          unselectedFirstChildCount: simulator.unselectedProcessNode(entityIDs.firstChild).length,
+          unselectedSecondChildCount: simulator.unselectedProcessNode(entityIDs.secondChild).length,
+          processNodeCount: simulator.processNodeElements().length,
+        }))
+      ).toYieldEqualTo({
+        selectedOriginCount: 1,
+        unselectedFirstChildCount: 1,
+        unselectedSecondChildCount: 1,
+        processNodeCount: 3,
+      });
     });
 
-    it(`should have the default "process list" panel present`, async () => {
-      expect(simulator.panelElement().length).toBe(1);
-      expect(simulator.panelContentElement().length).toBe(1);
-      const testSubjectName = simulator
-        .panelContentElement()
-        .getDOMNode()
-        .getAttribute('data-test-subj');
-      expect(testSubjectName).toMatch(/process-list/g);
+    it(`should show the node list`, async () => {
+      await expect(simulator.map(() => simulator.nodeListElement().length)).toYieldEqualTo(1);
     });
 
     describe("when the second child node's first button has been clicked", () => {
@@ -82,42 +84,37 @@ describe('Resolver, when analyzing a tree that has 1 ancestor and 2 children', (
           .first()
           .simulate('click');
       });
-      it('should render the second child node as selected, and the first child not as not selected, and the query string should indicate that the second child is selected', async () => {
+      it('should render the second child node as selected, and the origin as not selected, and the query string should indicate that the second child is selected', async () => {
         await expect(
-          simulator.mapStateTransitions(function value() {
-            return {
-              // the query string has a key showing that the second child is selected
-              queryStringSelectedNode: simulator.queryStringValues().selectedNode,
-              // the second child is rendered in the DOM, and shows up as selected
-              secondChildLooksSelected: simulator.processNodeElementLooksSelected(
-                entityIDs.secondChild
-              ),
-              // the origin is in the DOM, but shows up as unselected
-              originLooksUnselected: simulator.processNodeElementLooksUnselected(entityIDs.origin),
-            };
-          })
+          simulator.map(() => ({
+            // the query string has a key showing that the second child is selected
+            queryStringSelectedNode: simulator.queryStringValues().selectedNode,
+            // the second child is rendered in the DOM, and shows up as selected
+            selectedSecondChildNodeCount: simulator.selectedProcessNode(entityIDs.secondChild)
+              .length,
+            // the origin is in the DOM, but shows up as unselected
+            unselectedOriginNodeCount: simulator.unselectedProcessNode(entityIDs.origin).length,
+          }))
         ).toYieldEqualTo({
           // Just the second child should be marked as selected in the query string
           queryStringSelectedNode: [entityIDs.secondChild],
           // The second child is rendered and has `[aria-selected]`
-          secondChildLooksSelected: true,
+          selectedSecondChildNodeCount: 1,
           // The origin child is rendered and doesn't have `[aria-selected]`
-          originLooksUnselected: true,
+          unselectedOriginNodeCount: 1,
         });
       });
     });
   });
 });
 
-describe('Resolver, when analyzing a tree that has some related events', () => {
+describe('Resolver, when analyzing a tree that has two related events for the origin', () => {
   beforeEach(async () => {
     // create a mock data access layer with related events
-    const { metadata: dataAccessLayerMetadata, dataAccessLayer } = oneAncestorTwoChildren({
-      withRelatedEvents: [
-        ['registry', 'access'],
-        ['registry', 'access'],
-      ],
-    });
+    const {
+      metadata: dataAccessLayerMetadata,
+      dataAccessLayer,
+    } = noAncestorsTwoChildrenWithRelatedEventsOnOrigin();
 
     // save a reference to the entity IDs exposed by the mock data layer
     entityIDs = dataAccessLayerMetadata.entityIDs;
@@ -132,7 +129,7 @@ describe('Resolver, when analyzing a tree that has some related events', () => {
   describe('when it has loaded', () => {
     beforeEach(async () => {
       await expect(
-        simulator.mapStateTransitions(() => ({
+        simulator.map(() => ({
           graphElements: simulator.graphElement().length,
           graphLoadingElements: simulator.graphLoadingElement().length,
           graphErrorElements: simulator.graphErrorElement().length,
@@ -148,7 +145,7 @@ describe('Resolver, when analyzing a tree that has some related events', () => {
 
     it('should render a related events button', async () => {
       await expect(
-        simulator.mapStateTransitions(() => ({
+        simulator.map(() => ({
           relatedEventButtons: simulator.processNodeRelatedEventButton(entityIDs.origin).length,
         }))
       ).toYieldEqualTo({
diff --git a/x-pack/plugins/security_solution/public/resolver/view/map.tsx b/x-pack/plugins/security_solution/public/resolver/view/map.tsx
index a965f06c04926..bbff2388af8b7 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/map.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/map.tsx
@@ -20,7 +20,7 @@ import { SymbolDefinitions, useResolverTheme } from './assets';
 import { useStateSyncingActions } from './use_state_syncing_actions';
 import { useResolverQueryParams } from './use_resolver_query_params';
 import { StyledMapContainer, StyledPanel, GraphContainer } from './styles';
-import { entityId } from '../../../common/endpoint/models/event';
+import { entityIDSafeVersion } from '../../../common/endpoint/models/event';
 import { SideEffectContext } from './side_effect_context';
 
 /**
@@ -107,7 +107,7 @@ export const ResolverMap = React.memo(function ({
             />
           ))}
           {[...processNodePositions].map(([processEvent, position]) => {
-            const processEntityId = entityId(processEvent);
+            const processEntityId = entityIDSafeVersion(processEvent);
             return (
               <ProcessEventDot
                 key={processEntityId}
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panel.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/panel.test.tsx
new file mode 100644
index 0000000000000..78e5fd79bea13
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/view/panel.test.tsx
@@ -0,0 +1,59 @@
+/*
+ * 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 { noAncestorsTwoChildren } from '../data_access_layer/mocks/no_ancestors_two_children';
+import { Simulator } from '../test_utilities/simulator';
+// Extend jest with a custom matcher
+import '../test_utilities/extend_jest';
+
+describe('Resolver: when analyzing a tree with no ancestors and two children', () => {
+  let simulator: Simulator;
+  let databaseDocumentID: string;
+
+  // the resolver component instance ID, used by the react code to distinguish piece of global state from those used by other resolver instances
+  const resolverComponentInstanceID = 'resolverComponentInstanceID';
+
+  beforeEach(async () => {
+    // create a mock data access layer
+    const { metadata: dataAccessLayerMetadata, dataAccessLayer } = noAncestorsTwoChildren();
+
+    // save a reference to the `_id` supported by the mock data layer
+    databaseDocumentID = dataAccessLayerMetadata.databaseDocumentID;
+
+    // create a resolver simulator, using the data access layer and an arbitrary component instance ID
+    simulator = new Simulator({ databaseDocumentID, dataAccessLayer, resolverComponentInstanceID });
+  });
+
+  it('should show the node list', async () => {
+    await expect(simulator.map(() => simulator.nodeListElement().length)).toYieldEqualTo(1);
+  });
+
+  it('should have 3 nodes in the node list', async () => {
+    await expect(simulator.map(() => simulator.nodeListItems().length)).toYieldEqualTo(3);
+  });
+  describe('when there is an item in the node list and it has been clicked', () => {
+    beforeEach(async () => {
+      const nodeListItems = await simulator.resolveWrapper(() => simulator.nodeListItems());
+      expect(nodeListItems && nodeListItems.length).toBeTruthy();
+      if (nodeListItems) {
+        nodeListItems.first().find('button').simulate('click');
+      }
+    });
+    it('should show the details for the first node', async () => {
+      await expect(
+        simulator.map(() => simulator.nodeDetailDescriptionListEntries())
+      ).toYieldEqualTo([
+        ['process.executable', 'executable'],
+        ['process.pid', '0'],
+        ['user.name', 'user.name'],
+        ['user.domain', 'user.domain'],
+        ['process.parent.pid', '0'],
+        ['process.hash.md5', 'hash.md5'],
+        ['process.args', 'args'],
+      ]);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/process_cube_icon.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/cube_for_process.tsx
similarity index 96%
rename from x-pack/plugins/security_solution/public/resolver/view/panels/process_cube_icon.tsx
rename to x-pack/plugins/security_solution/public/resolver/view/panels/cube_for_process.tsx
index b073324b27f9b..0d8f65b4e39e6 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/process_cube_icon.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/cube_for_process.tsx
@@ -1,45 +1,45 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { memo } from 'react';
-import { useResolverTheme } from '../assets';
-
-/**
- * During user testing, one user indicated they wanted to see stronger visual relationships between
- * Nodes on the graph and what's in the table. Using the same symbol in both places (as below) could help with that.
- */
-export const CubeForProcess = memo(function CubeForProcess({
-  isProcessTerminated,
-}: {
-  isProcessTerminated: boolean;
-}) {
-  const { cubeAssetsForNode } = useResolverTheme();
-  const { cubeSymbol, descriptionText } = cubeAssetsForNode(isProcessTerminated, false);
-
-  return (
-    <>
-      <svg
-        style={{ position: 'relative', top: '0.4em', marginRight: '.25em' }}
-        className="table-process-icon"
-        width="1.5em"
-        height="1.5em"
-        viewBox="0 0 1 1"
-      >
-        <desc>{descriptionText}</desc>
-        <use
-          role="presentation"
-          xlinkHref={cubeSymbol}
-          x={0}
-          y={0}
-          width={1}
-          height={1}
-          opacity="1"
-          className="cube"
-        />
-      </svg>
-    </>
-  );
-});
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo } from 'react';
+import { useResolverTheme } from '../assets';
+
+/**
+ * During user testing, one user indicated they wanted to see stronger visual relationships between
+ * Nodes on the graph and what's in the table. Using the same symbol in both places (as below) could help with that.
+ */
+export const CubeForProcess = memo(function CubeForProcess({
+  isProcessTerminated,
+}: {
+  isProcessTerminated: boolean;
+}) {
+  const { cubeAssetsForNode } = useResolverTheme();
+  const { cubeSymbol, descriptionText } = cubeAssetsForNode(isProcessTerminated, false);
+
+  return (
+    <>
+      <svg
+        style={{ position: 'relative', top: '0.4em', marginRight: '.25em' }}
+        className="table-process-icon"
+        width="1.5em"
+        height="1.5em"
+        viewBox="0 0 1 1"
+      >
+        <desc>{descriptionText}</desc>
+        <use
+          role="presentation"
+          xlinkHref={cubeSymbol}
+          x={0}
+          y={0}
+          width={1}
+          height={1}
+          opacity="1"
+          className="cube"
+        />
+      </svg>
+    </>
+  );
+});
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_related_counts.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/event_counts_for_process.tsx
similarity index 97%
rename from x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_related_counts.tsx
rename to x-pack/plugins/security_solution/public/resolver/view/panels/event_counts_for_process.tsx
index 880ee1dc7a10a..129aff776808a 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_related_counts.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/event_counts_for_process.tsx
@@ -1,144 +1,144 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { memo, useMemo } from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiBasicTableColumn, EuiButtonEmpty, EuiSpacer, EuiInMemoryTable } from '@elastic/eui';
-import { FormattedMessage } from 'react-intl';
-import { CrumbInfo, StyledBreadcrumbs } from './panel_content_utilities';
-
-import * as event from '../../../../common/endpoint/models/event';
-import { ResolverEvent, ResolverNodeStats } from '../../../../common/endpoint/types';
-
-/**
- * This view gives counts for all the related events of a process grouped by related event type.
- * It should look something like:
- *
- * | Count                  | Event Type                 |
- * | :--------------------- | :------------------------- |
- * | 5                      | DNS                        |
- * | 12                     | Registry                   |
- * | 2                      | Network                    |
- *
- */
-export const EventCountsForProcess = memo(function EventCountsForProcess({
-  processEvent,
-  pushToQueryParams,
-  relatedStats,
-}: {
-  processEvent: ResolverEvent;
-  pushToQueryParams: (queryStringKeyValuePair: CrumbInfo) => unknown;
-  relatedStats: ResolverNodeStats;
-}) {
-  interface EventCountsTableView {
-    name: string;
-    count: number;
-  }
-
-  const relatedEventsState = { stats: relatedStats.events.byCategory };
-  const processName = processEvent && event.eventName(processEvent);
-  const processEntityId = event.entityId(processEvent);
-  /**
-   * totalCount: This will reflect the aggregated total by category for all related events
-   * e.g. [dns,file],[dns,file],[registry] will have an aggregate total of 5. This is to keep the
-   * total number consistent with the "broken out" totals we see elsewhere in the app.
-   * E.g. on the rleated list by type, the above would show as:
-   * 2 dns
-   * 2 file
-   * 1 registry
-   * So it would be extremely disorienting to show the user a "3" above that as a total.
-   */
-  const totalCount = Object.values(relatedStats.events.byCategory).reduce(
-    (sum, val) => sum + val,
-    0
-  );
-  const eventsString = i18n.translate(
-    'xpack.securitySolution.endpoint.resolver.panel.processEventCounts.events',
-    {
-      defaultMessage: 'Events',
-    }
-  );
-  const crumbs = useMemo(() => {
-    return [
-      {
-        text: eventsString,
-        onClick: () => {
-          pushToQueryParams({ crumbId: '', crumbEvent: '' });
-        },
-      },
-      {
-        text: processName,
-        onClick: () => {
-          pushToQueryParams({ crumbId: processEntityId, crumbEvent: '' });
-        },
-      },
-      {
-        text: (
-          <>
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.resolver.panel.relatedCounts.numberOfEventsInCrumb"
-              values={{ totalCount }}
-              defaultMessage="{totalCount} Events"
-            />
-          </>
-        ),
-        onClick: () => {
-          pushToQueryParams({ crumbId: processEntityId, crumbEvent: '' });
-        },
-      },
-    ];
-  }, [processName, totalCount, processEntityId, pushToQueryParams, eventsString]);
-  const rows = useMemo(() => {
-    return Object.entries(relatedEventsState.stats).map(
-      ([eventType, count]): EventCountsTableView => {
-        return {
-          name: eventType,
-          count,
-        };
-      }
-    );
-  }, [relatedEventsState]);
-  const columns = useMemo<Array<EuiBasicTableColumn<EventCountsTableView>>>(
-    () => [
-      {
-        field: 'count',
-        name: i18n.translate('xpack.securitySolution.endpoint.resolver.panel.table.row.count', {
-          defaultMessage: 'Count',
-        }),
-        width: '20%',
-        sortable: true,
-      },
-      {
-        field: 'name',
-        name: i18n.translate('xpack.securitySolution.endpoint.resolver.panel.table.row.eventType', {
-          defaultMessage: 'Event Type',
-        }),
-        width: '80%',
-        sortable: true,
-        render(name: string) {
-          return (
-            <EuiButtonEmpty
-              onClick={() => {
-                pushToQueryParams({ crumbId: event.entityId(processEvent), crumbEvent: name });
-              }}
-            >
-              {name}
-            </EuiButtonEmpty>
-          );
-        },
-      },
-    ],
-    [pushToQueryParams, processEvent]
-  );
-  return (
-    <>
-      <StyledBreadcrumbs breadcrumbs={crumbs} />
-      <EuiSpacer size="l" />
-      <EuiInMemoryTable<EventCountsTableView> items={rows} columns={columns} sorting />
-    </>
-  );
-});
-EventCountsForProcess.displayName = 'EventCountsForProcess';
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo, useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiBasicTableColumn, EuiButtonEmpty, EuiSpacer, EuiInMemoryTable } from '@elastic/eui';
+import { FormattedMessage } from 'react-intl';
+import { CrumbInfo, StyledBreadcrumbs } from './panel_content_utilities';
+
+import * as event from '../../../../common/endpoint/models/event';
+import { ResolverEvent, ResolverNodeStats } from '../../../../common/endpoint/types';
+
+/**
+ * This view gives counts for all the related events of a process grouped by related event type.
+ * It should look something like:
+ *
+ * | Count                  | Event Type                 |
+ * | :--------------------- | :------------------------- |
+ * | 5                      | DNS                        |
+ * | 12                     | Registry                   |
+ * | 2                      | Network                    |
+ *
+ */
+export const EventCountsForProcess = memo(function EventCountsForProcess({
+  processEvent,
+  pushToQueryParams,
+  relatedStats,
+}: {
+  processEvent: ResolverEvent;
+  pushToQueryParams: (queryStringKeyValuePair: CrumbInfo) => unknown;
+  relatedStats: ResolverNodeStats;
+}) {
+  interface EventCountsTableView {
+    name: string;
+    count: number;
+  }
+
+  const relatedEventsState = { stats: relatedStats.events.byCategory };
+  const processName = processEvent && event.eventName(processEvent);
+  const processEntityId = event.entityId(processEvent);
+  /**
+   * totalCount: This will reflect the aggregated total by category for all related events
+   * e.g. [dns,file],[dns,file],[registry] will have an aggregate total of 5. This is to keep the
+   * total number consistent with the "broken out" totals we see elsewhere in the app.
+   * E.g. on the rleated list by type, the above would show as:
+   * 2 dns
+   * 2 file
+   * 1 registry
+   * So it would be extremely disorienting to show the user a "3" above that as a total.
+   */
+  const totalCount = Object.values(relatedStats.events.byCategory).reduce(
+    (sum, val) => sum + val,
+    0
+  );
+  const eventsString = i18n.translate(
+    'xpack.securitySolution.endpoint.resolver.panel.processEventCounts.events',
+    {
+      defaultMessage: 'Events',
+    }
+  );
+  const crumbs = useMemo(() => {
+    return [
+      {
+        text: eventsString,
+        onClick: () => {
+          pushToQueryParams({ crumbId: '', crumbEvent: '' });
+        },
+      },
+      {
+        text: processName,
+        onClick: () => {
+          pushToQueryParams({ crumbId: processEntityId, crumbEvent: '' });
+        },
+      },
+      {
+        text: (
+          <>
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.resolver.panel.relatedCounts.numberOfEventsInCrumb"
+              values={{ totalCount }}
+              defaultMessage="{totalCount} Events"
+            />
+          </>
+        ),
+        onClick: () => {
+          pushToQueryParams({ crumbId: processEntityId, crumbEvent: '' });
+        },
+      },
+    ];
+  }, [processName, totalCount, processEntityId, pushToQueryParams, eventsString]);
+  const rows = useMemo(() => {
+    return Object.entries(relatedEventsState.stats).map(
+      ([eventType, count]): EventCountsTableView => {
+        return {
+          name: eventType,
+          count,
+        };
+      }
+    );
+  }, [relatedEventsState]);
+  const columns = useMemo<Array<EuiBasicTableColumn<EventCountsTableView>>>(
+    () => [
+      {
+        field: 'count',
+        name: i18n.translate('xpack.securitySolution.endpoint.resolver.panel.table.row.count', {
+          defaultMessage: 'Count',
+        }),
+        width: '20%',
+        sortable: true,
+      },
+      {
+        field: 'name',
+        name: i18n.translate('xpack.securitySolution.endpoint.resolver.panel.table.row.eventType', {
+          defaultMessage: 'Event Type',
+        }),
+        width: '80%',
+        sortable: true,
+        render(name: string) {
+          return (
+            <EuiButtonEmpty
+              onClick={() => {
+                pushToQueryParams({ crumbId: event.entityId(processEvent), crumbEvent: name });
+              }}
+            >
+              {name}
+            </EuiButtonEmpty>
+          );
+        },
+      },
+    ],
+    [pushToQueryParams, processEvent]
+  );
+  return (
+    <>
+      <StyledBreadcrumbs breadcrumbs={crumbs} />
+      <EuiSpacer size="l" />
+      <EuiInMemoryTable<EventCountsTableView> items={rows} columns={columns} sorting />
+    </>
+  );
+});
+EventCountsForProcess.displayName = 'EventCountsForProcess';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panel.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/index.tsx
similarity index 90%
rename from x-pack/plugins/security_solution/public/resolver/view/panel.tsx
rename to x-pack/plugins/security_solution/public/resolver/view/panels/index.tsx
index f378ab36bac94..7e7e8b757baf7 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panel.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/index.tsx
@@ -7,17 +7,17 @@
 import React, { memo, useMemo, useContext, useLayoutEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { EuiPanel } from '@elastic/eui';
-import * as selectors from '../store/selectors';
-import { useResolverDispatch } from './use_resolver_dispatch';
-import * as event from '../../../common/endpoint/models/event';
-import { ResolverEvent, ResolverNodeStats } from '../../../common/endpoint/types';
-import { SideEffectContext } from './side_effect_context';
-import { ProcessEventListNarrowedByType } from './panels/panel_content_related_list';
-import { EventCountsForProcess } from './panels/panel_content_related_counts';
-import { ProcessDetails } from './panels/panel_content_process_detail';
-import { ProcessListWithCounts } from './panels/panel_content_process_list';
-import { RelatedEventDetail } from './panels/panel_content_related_detail';
-import { useResolverQueryParams } from './use_resolver_query_params';
+import * as selectors from '../../store/selectors';
+import { useResolverDispatch } from '../use_resolver_dispatch';
+import * as event from '../../../../common/endpoint/models/event';
+import { ResolverEvent, ResolverNodeStats } from '../../../../common/endpoint/types';
+import { SideEffectContext } from '../side_effect_context';
+import { ProcessEventList } from './process_event_list';
+import { EventCountsForProcess } from './event_counts_for_process';
+import { ProcessDetails } from './process_details';
+import { ProcessListWithCounts } from './process_list_with_counts';
+import { RelatedEventDetail } from './related_event_detail';
+import { useResolverQueryParams } from '../use_resolver_query_params';
 
 /**
  * The team decided to use this table to determine which breadcrumbs/view to display:
@@ -145,7 +145,7 @@ const PanelContent = memo(function PanelContent() {
        */
 
       if (crumbEvent && crumbEvent.length && uiSelectedEvent) {
-        return 'processEventListNarrowedByType';
+        return 'processEventList';
       }
     }
 
@@ -179,9 +179,9 @@ const PanelContent = memo(function PanelContent() {
       );
     }
 
-    if (panelToShow === 'processEventListNarrowedByType') {
+    if (panelToShow === 'processEventList') {
       return (
-        <ProcessEventListNarrowedByType
+        <ProcessEventList
           processEvent={uiSelectedEvent!}
           pushToQueryParams={pushToQueryParams}
           relatedStats={relatedStatsForIdFromParams!}
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_process_detail.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
similarity index 83%
rename from x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_process_detail.tsx
rename to x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
index 7b5eb13359dbb..112a3400c4947 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_process_detail.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
@@ -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 React, { memo, useMemo } from 'react';
+import React, { memo, useMemo, HTMLAttributes } from 'react';
 import { useSelector } from 'react-redux';
 import { i18n } from '@kbn/i18n';
 import {
@@ -16,6 +16,7 @@ import {
 } from '@elastic/eui';
 import styled from 'styled-components';
 import { FormattedMessage } from 'react-intl';
+import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list';
 import * as selectors from '../../store/selectors';
 import * as event from '../../../../common/endpoint/models/event';
 import { CrumbInfo, formatDate, StyledBreadcrumbs } from './panel_content_utilities';
@@ -27,7 +28,7 @@ import {
   md5HashForProcess,
   argsForProcess,
 } from '../../models/process_event';
-import { CubeForProcess } from './process_cube_icon';
+import { CubeForProcess } from './cube_for_process';
 import { ResolverEvent } from '../../../../common/endpoint/types';
 import { useResolverTheme } from '../assets';
 
@@ -51,9 +52,9 @@ export const ProcessDetails = memo(function ProcessDetails({
   const processName = event.eventName(processEvent);
   const entityId = event.entityId(processEvent);
   const isProcessTerminated = useSelector(selectors.isProcessTerminated)(entityId);
-  const processInfoEntry = useMemo(() => {
+  const processInfoEntry: EuiDescriptionListProps['listItems'] = useMemo(() => {
     const eventTime = event.eventTimestamp(processEvent);
-    const dateTime = eventTime ? formatDate(eventTime) : '';
+    const dateTime = eventTime === undefined ? null : formatDate(eventTime);
 
     const createdEntry = {
       title: '@timestamp',
@@ -95,7 +96,7 @@ export const ProcessDetails = memo(function ProcessDetails({
       description: argsForProcess(processEvent),
     };
 
-    // This is the data in {title, description} form for the EUIDescriptionList to display
+    // This is the data in {title, description} form for the EuiDescriptionList to display
     const processDescriptionListData = [
       createdEntry,
       pathEntry,
@@ -107,7 +108,7 @@ export const ProcessDetails = memo(function ProcessDetails({
       commandLineEntry,
     ]
       .filter((entry) => {
-        return entry.description;
+        return entry.description !== undefined;
       })
       .map((entry) => {
         return {
@@ -172,13 +173,24 @@ export const ProcessDetails = memo(function ProcessDetails({
       </EuiText>
       <EuiSpacer size="l" />
       <StyledDescriptionList
+        data-test-subj="resolver:node-detail"
         type="column"
         align="left"
-        titleProps={{ className: 'desc-title' }}
+        titleProps={
+          {
+            'data-test-subj': 'resolver:node-detail:entry-title',
+            className: 'desc-title',
+            // Casting this to allow data attribute
+          } as HTMLAttributes<HTMLElement>
+        }
+        descriptionProps={
+          { 'data-test-subj': 'resolver:node-detail:entry-description' } as HTMLAttributes<
+            HTMLElement
+          >
+        }
         compressed
         listItems={processInfoEntry}
       />
     </>
   );
 });
-ProcessDetails.displayName = 'ProcessDetails';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_related_list.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/process_event_list.tsx
similarity index 95%
rename from x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_related_list.tsx
rename to x-pack/plugins/security_solution/public/resolver/view/panels/process_event_list.tsx
index 9a477fd998bb3..101711475c938 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_related_list.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/process_event_list.tsx
@@ -1,290 +1,290 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { memo, useMemo, useEffect, Fragment } from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiTitle, EuiSpacer, EuiText, EuiButtonEmpty, EuiHorizontalRule } from '@elastic/eui';
-import { useSelector } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
-import styled from 'styled-components';
-import {
-  CrumbInfo,
-  formatDate,
-  StyledBreadcrumbs,
-  BoldCode,
-  StyledTime,
-} from './panel_content_utilities';
-import * as event from '../../../../common/endpoint/models/event';
-import { ResolverEvent, ResolverNodeStats } from '../../../../common/endpoint/types';
-import * as selectors from '../../store/selectors';
-import { useResolverDispatch } from '../use_resolver_dispatch';
-import { RelatedEventLimitWarning } from '../limit_warnings';
-
-/**
- * This view presents a list of related events of a given type for a given process.
- * It will appear like:
- *
- * |                                                        |
- * | :----------------------------------------------------- |
- * | **registry deletion** @ *3:32PM..* *HKLM/software...*  |
- * | **file creation** @ *3:34PM..* *C:/directory/file.exe* |
- */
-
-interface MatchingEventEntry {
-  formattedDate: string;
-  eventType: string;
-  eventCategory: string;
-  name: { subject: string; descriptor?: string };
-  setQueryParams: () => void;
-}
-
-const StyledRelatedLimitWarning = styled(RelatedEventLimitWarning)`
-  flex-flow: row wrap;
-  display: block;
-  align-items: baseline;
-  margin-top: 1em;
-
-  & .euiCallOutHeader {
-    display: inline;
-    margin-right: 0.25em;
-  }
-
-  & .euiText {
-    display: inline;
-  }
-
-  & .euiText p {
-    display: inline;
-  }
-`;
-
-const DisplayList = memo(function DisplayList({
-  crumbs,
-  matchingEventEntries,
-  eventType,
-  processEntityId,
-}: {
-  crumbs: Array<{ text: string | JSX.Element; onClick: () => void }>;
-  matchingEventEntries: MatchingEventEntry[];
-  eventType: string;
-  processEntityId: string;
-}) {
-  const relatedLookupsByCategory = useSelector(selectors.relatedEventInfoByEntityId);
-  const lookupsForThisNode = relatedLookupsByCategory(processEntityId);
-  const shouldShowLimitWarning = lookupsForThisNode?.shouldShowLimitForCategory(eventType);
-  const numberDisplayed = lookupsForThisNode?.numberActuallyDisplayedForCategory(eventType);
-  const numberMissing = lookupsForThisNode?.numberNotDisplayedForCategory(eventType);
-
-  return (
-    <>
-      <StyledBreadcrumbs breadcrumbs={crumbs} />
-      {shouldShowLimitWarning && typeof numberDisplayed !== 'undefined' && numberMissing ? (
-        <StyledRelatedLimitWarning
-          eventType={eventType}
-          numberActuallyDisplayed={numberDisplayed}
-          numberMissing={numberMissing}
-        />
-      ) : null}
-      <EuiSpacer size="l" />
-      <>
-        {matchingEventEntries.map((eventView, index) => {
-          const { subject, descriptor = '' } = eventView.name;
-          return (
-            <Fragment key={index}>
-              <EuiText>
-                <BoldCode>
-                  <FormattedMessage
-                    id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.categoryAndType"
-                    values={{
-                      category: eventView.eventCategory,
-                      eventType: eventView.eventType,
-                    }}
-                    defaultMessage="{category} {eventType}"
-                  />
-                </BoldCode>
-                <StyledTime dateTime={eventView.formattedDate}>
-                  <FormattedMessage
-                    id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.atTime"
-                    values={{ date: eventView.formattedDate }}
-                    defaultMessage="@ {date}"
-                  />
-                </StyledTime>
-              </EuiText>
-              <EuiSpacer size="xs" />
-              <EuiButtonEmpty onClick={eventView.setQueryParams}>
-                <FormattedMessage
-                  id="xpack.securitySolution.endpoint.resolver.panel.processEventListByType.eventDescriptiveName"
-                  values={{ subject, descriptor }}
-                  defaultMessage="{descriptor} {subject}"
-                />
-              </EuiButtonEmpty>
-              {index === matchingEventEntries.length - 1 ? null : <EuiHorizontalRule margin="m" />}
-            </Fragment>
-          );
-        })}
-      </>
-    </>
-  );
-});
-
-export const ProcessEventListNarrowedByType = memo(function ProcessEventListNarrowedByType({
-  processEvent,
-  eventType,
-  relatedStats,
-  pushToQueryParams,
-}: {
-  processEvent: ResolverEvent;
-  pushToQueryParams: (arg0: CrumbInfo) => unknown;
-  eventType: string;
-  relatedStats: ResolverNodeStats;
-}) {
-  const processName = processEvent && event.eventName(processEvent);
-  const processEntityId = event.entityId(processEvent);
-  const totalCount = Object.values(relatedStats.events.byCategory).reduce(
-    (sum, val) => sum + val,
-    0
-  );
-  const eventsString = i18n.translate(
-    'xpack.securitySolution.endpoint.resolver.panel.processEventListByType.events',
-    {
-      defaultMessage: 'Events',
-    }
-  );
-  const waitingString = i18n.translate(
-    'xpack.securitySolution.endpoint.resolver.panel.processEventListByType.wait',
-    {
-      defaultMessage: 'Waiting For Events...',
-    }
-  );
-
-  const relatedsReadyMap = useSelector(selectors.relatedEventsReady);
-  const relatedsReady = relatedsReadyMap.get(processEntityId);
-
-  const dispatch = useResolverDispatch();
-
-  useEffect(() => {
-    if (typeof relatedsReady === 'undefined') {
-      dispatch({
-        type: 'appDetectedMissingEventData',
-        payload: processEntityId,
-      });
-    }
-  }, [relatedsReady, dispatch, processEntityId]);
-
-  const waitCrumbs = useMemo(() => {
-    return [
-      {
-        text: eventsString,
-        onClick: () => {
-          pushToQueryParams({ crumbId: '', crumbEvent: '' });
-        },
-      },
-    ];
-  }, [pushToQueryParams, eventsString]);
-
-  const relatedByCategory = useSelector(selectors.relatedEventsByCategory);
-
-  /**
-   * A list entry will be displayed for each of these
-   */
-  const matchingEventEntries: MatchingEventEntry[] = useMemo(() => {
-    const relateds = relatedByCategory(processEntityId)(eventType).map((resolverEvent) => {
-      const eventTime = event.eventTimestamp(resolverEvent);
-      const formattedDate = typeof eventTime === 'undefined' ? '' : formatDate(eventTime);
-      const entityId = event.eventId(resolverEvent);
-
-      return {
-        formattedDate,
-        eventCategory: `${eventType}`,
-        eventType: `${event.ecsEventType(resolverEvent)}`,
-        name: event.descriptiveName(resolverEvent),
-        setQueryParams: () => {
-          pushToQueryParams({
-            crumbId: entityId === undefined ? '' : String(entityId),
-            crumbEvent: processEntityId,
-          });
-        },
-      };
-    });
-    return relateds;
-  }, [relatedByCategory, eventType, processEntityId, pushToQueryParams]);
-
-  const crumbs = useMemo(() => {
-    return [
-      {
-        text: eventsString,
-        onClick: () => {
-          pushToQueryParams({ crumbId: '', crumbEvent: '' });
-        },
-      },
-      {
-        text: processName,
-        onClick: () => {
-          pushToQueryParams({ crumbId: processEntityId, crumbEvent: '' });
-        },
-      },
-      {
-        text: (
-          <>
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.resolver.panel.relatedEventList.numberOfEvents"
-              values={{ totalCount }}
-              defaultMessage="{totalCount} Events"
-            />
-          </>
-        ),
-        onClick: () => {
-          pushToQueryParams({ crumbId: processEntityId, crumbEvent: 'all' });
-        },
-      },
-      {
-        text: (
-          <>
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.resolver.panel.relatedEventList.countByCategory"
-              values={{ count: matchingEventEntries.length, category: eventType }}
-              defaultMessage="{count} {category}"
-            />
-          </>
-        ),
-        onClick: () => {},
-      },
-    ];
-  }, [
-    eventType,
-    eventsString,
-    matchingEventEntries.length,
-    processEntityId,
-    processName,
-    pushToQueryParams,
-    totalCount,
-  ]);
-
-  /**
-   * Wait here until the effect resolves...
-   */
-  if (!relatedsReady) {
-    return (
-      <>
-        <StyledBreadcrumbs breadcrumbs={waitCrumbs} />
-        <EuiSpacer size="l" />
-        <EuiTitle>
-          <h4>{waitingString}</h4>
-        </EuiTitle>
-      </>
-    );
-  }
-
-  return (
-    <DisplayList
-      crumbs={crumbs}
-      processEntityId={processEntityId}
-      matchingEventEntries={matchingEventEntries}
-      eventType={eventType}
-    />
-  );
-});
-ProcessEventListNarrowedByType.displayName = 'ProcessEventListNarrowedByType';
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo, useMemo, useEffect, Fragment } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiTitle, EuiSpacer, EuiText, EuiButtonEmpty, EuiHorizontalRule } from '@elastic/eui';
+import { useSelector } from 'react-redux';
+import { FormattedMessage } from 'react-intl';
+import styled from 'styled-components';
+import {
+  CrumbInfo,
+  formatDate,
+  StyledBreadcrumbs,
+  BoldCode,
+  StyledTime,
+} from './panel_content_utilities';
+import * as event from '../../../../common/endpoint/models/event';
+import { ResolverEvent, ResolverNodeStats } from '../../../../common/endpoint/types';
+import * as selectors from '../../store/selectors';
+import { useResolverDispatch } from '../use_resolver_dispatch';
+import { RelatedEventLimitWarning } from '../limit_warnings';
+
+/**
+ * This view presents a list of related events of a given type for a given process.
+ * It will appear like:
+ *
+ * |                                                        |
+ * | :----------------------------------------------------- |
+ * | **registry deletion** @ *3:32PM..* *HKLM/software...*  |
+ * | **file creation** @ *3:34PM..* *C:/directory/file.exe* |
+ */
+
+interface MatchingEventEntry {
+  formattedDate: string;
+  eventType: string;
+  eventCategory: string;
+  name: { subject: string; descriptor?: string };
+  setQueryParams: () => void;
+}
+
+const StyledRelatedLimitWarning = styled(RelatedEventLimitWarning)`
+  flex-flow: row wrap;
+  display: block;
+  align-items: baseline;
+  margin-top: 1em;
+
+  & .euiCallOutHeader {
+    display: inline;
+    margin-right: 0.25em;
+  }
+
+  & .euiText {
+    display: inline;
+  }
+
+  & .euiText p {
+    display: inline;
+  }
+`;
+
+const DisplayList = memo(function DisplayList({
+  crumbs,
+  matchingEventEntries,
+  eventType,
+  processEntityId,
+}: {
+  crumbs: Array<{ text: string | JSX.Element; onClick: () => void }>;
+  matchingEventEntries: MatchingEventEntry[];
+  eventType: string;
+  processEntityId: string;
+}) {
+  const relatedLookupsByCategory = useSelector(selectors.relatedEventInfoByEntityId);
+  const lookupsForThisNode = relatedLookupsByCategory(processEntityId);
+  const shouldShowLimitWarning = lookupsForThisNode?.shouldShowLimitForCategory(eventType);
+  const numberDisplayed = lookupsForThisNode?.numberActuallyDisplayedForCategory(eventType);
+  const numberMissing = lookupsForThisNode?.numberNotDisplayedForCategory(eventType);
+
+  return (
+    <>
+      <StyledBreadcrumbs breadcrumbs={crumbs} />
+      {shouldShowLimitWarning && typeof numberDisplayed !== 'undefined' && numberMissing ? (
+        <StyledRelatedLimitWarning
+          eventType={eventType}
+          numberActuallyDisplayed={numberDisplayed}
+          numberMissing={numberMissing}
+        />
+      ) : null}
+      <EuiSpacer size="l" />
+      <>
+        {matchingEventEntries.map((eventView, index) => {
+          const { subject, descriptor = '' } = eventView.name;
+          return (
+            <Fragment key={index}>
+              <EuiText>
+                <BoldCode>
+                  <FormattedMessage
+                    id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.categoryAndType"
+                    values={{
+                      category: eventView.eventCategory,
+                      eventType: eventView.eventType,
+                    }}
+                    defaultMessage="{category} {eventType}"
+                  />
+                </BoldCode>
+                <StyledTime dateTime={eventView.formattedDate}>
+                  <FormattedMessage
+                    id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.atTime"
+                    values={{ date: eventView.formattedDate }}
+                    defaultMessage="@ {date}"
+                  />
+                </StyledTime>
+              </EuiText>
+              <EuiSpacer size="xs" />
+              <EuiButtonEmpty onClick={eventView.setQueryParams}>
+                <FormattedMessage
+                  id="xpack.securitySolution.endpoint.resolver.panel.processEventListByType.eventDescriptiveName"
+                  values={{ subject, descriptor }}
+                  defaultMessage="{descriptor} {subject}"
+                />
+              </EuiButtonEmpty>
+              {index === matchingEventEntries.length - 1 ? null : <EuiHorizontalRule margin="m" />}
+            </Fragment>
+          );
+        })}
+      </>
+    </>
+  );
+});
+
+export const ProcessEventList = memo(function ProcessEventList({
+  processEvent,
+  eventType,
+  relatedStats,
+  pushToQueryParams,
+}: {
+  processEvent: ResolverEvent;
+  pushToQueryParams: (arg0: CrumbInfo) => unknown;
+  eventType: string;
+  relatedStats: ResolverNodeStats;
+}) {
+  const processName = processEvent && event.eventName(processEvent);
+  const processEntityId = event.entityId(processEvent);
+  const totalCount = Object.values(relatedStats.events.byCategory).reduce(
+    (sum, val) => sum + val,
+    0
+  );
+  const eventsString = i18n.translate(
+    'xpack.securitySolution.endpoint.resolver.panel.processEventListByType.events',
+    {
+      defaultMessage: 'Events',
+    }
+  );
+  const waitingString = i18n.translate(
+    'xpack.securitySolution.endpoint.resolver.panel.processEventListByType.wait',
+    {
+      defaultMessage: 'Waiting For Events...',
+    }
+  );
+
+  const relatedsReadyMap = useSelector(selectors.relatedEventsReady);
+  const relatedsReady = relatedsReadyMap.get(processEntityId);
+
+  const dispatch = useResolverDispatch();
+
+  useEffect(() => {
+    if (typeof relatedsReady === 'undefined') {
+      dispatch({
+        type: 'appDetectedMissingEventData',
+        payload: processEntityId,
+      });
+    }
+  }, [relatedsReady, dispatch, processEntityId]);
+
+  const waitCrumbs = useMemo(() => {
+    return [
+      {
+        text: eventsString,
+        onClick: () => {
+          pushToQueryParams({ crumbId: '', crumbEvent: '' });
+        },
+      },
+    ];
+  }, [pushToQueryParams, eventsString]);
+
+  const relatedByCategory = useSelector(selectors.relatedEventsByCategory);
+
+  /**
+   * A list entry will be displayed for each of these
+   */
+  const matchingEventEntries: MatchingEventEntry[] = useMemo(() => {
+    const relateds = relatedByCategory(processEntityId)(eventType).map((resolverEvent) => {
+      const eventTime = event.eventTimestamp(resolverEvent);
+      const formattedDate = typeof eventTime === 'undefined' ? '' : formatDate(eventTime);
+      const entityId = event.eventId(resolverEvent);
+
+      return {
+        formattedDate,
+        eventCategory: `${eventType}`,
+        eventType: `${event.ecsEventType(resolverEvent)}`,
+        name: event.descriptiveName(resolverEvent),
+        setQueryParams: () => {
+          pushToQueryParams({
+            crumbId: entityId === undefined ? '' : String(entityId),
+            crumbEvent: processEntityId,
+          });
+        },
+      };
+    });
+    return relateds;
+  }, [relatedByCategory, eventType, processEntityId, pushToQueryParams]);
+
+  const crumbs = useMemo(() => {
+    return [
+      {
+        text: eventsString,
+        onClick: () => {
+          pushToQueryParams({ crumbId: '', crumbEvent: '' });
+        },
+      },
+      {
+        text: processName,
+        onClick: () => {
+          pushToQueryParams({ crumbId: processEntityId, crumbEvent: '' });
+        },
+      },
+      {
+        text: (
+          <>
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.resolver.panel.relatedEventList.numberOfEvents"
+              values={{ totalCount }}
+              defaultMessage="{totalCount} Events"
+            />
+          </>
+        ),
+        onClick: () => {
+          pushToQueryParams({ crumbId: processEntityId, crumbEvent: 'all' });
+        },
+      },
+      {
+        text: (
+          <>
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.resolver.panel.relatedEventList.countByCategory"
+              values={{ count: matchingEventEntries.length, category: eventType }}
+              defaultMessage="{count} {category}"
+            />
+          </>
+        ),
+        onClick: () => {},
+      },
+    ];
+  }, [
+    eventType,
+    eventsString,
+    matchingEventEntries.length,
+    processEntityId,
+    processName,
+    pushToQueryParams,
+    totalCount,
+  ]);
+
+  /**
+   * Wait here until the effect resolves...
+   */
+  if (!relatedsReady) {
+    return (
+      <>
+        <StyledBreadcrumbs breadcrumbs={waitCrumbs} />
+        <EuiSpacer size="l" />
+        <EuiTitle>
+          <h4>{waitingString}</h4>
+        </EuiTitle>
+      </>
+    );
+  }
+
+  return (
+    <DisplayList
+      crumbs={crumbs}
+      processEntityId={processEntityId}
+      matchingEventEntries={matchingEventEntries}
+      eventType={eventType}
+    />
+  );
+});
+ProcessEventList.displayName = 'ProcessEventList';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_process_list.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/process_list_with_counts.tsx
similarity index 85%
rename from x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_process_list.tsx
rename to x-pack/plugins/security_solution/public/resolver/view/panels/process_list_with_counts.tsx
index 8ca002ace26fe..11f005f8acbcd 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_process_list.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/process_list_with_counts.tsx
@@ -1,199 +1,204 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import React, { memo, useContext, useCallback, useMemo } from 'react';
-import {
-  EuiBasicTableColumn,
-  EuiBadge,
-  EuiButtonEmpty,
-  EuiSpacer,
-  EuiInMemoryTable,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { useSelector } from 'react-redux';
-import styled from 'styled-components';
-import * as event from '../../../../common/endpoint/models/event';
-import * as selectors from '../../store/selectors';
-import { CrumbInfo, formatter, StyledBreadcrumbs } from './panel_content_utilities';
-import { useResolverDispatch } from '../use_resolver_dispatch';
-import { SideEffectContext } from '../side_effect_context';
-import { CubeForProcess } from './process_cube_icon';
-import { ResolverEvent } from '../../../../common/endpoint/types';
-import { LimitWarning } from '../limit_warnings';
-
-const StyledLimitWarning = styled(LimitWarning)`
-  flex-flow: row wrap;
-  display: block;
-  align-items: baseline;
-  margin-top: 1em;
-
-  & .euiCallOutHeader {
-    display: inline;
-    margin-right: 0.25em;
-  }
-
-  & .euiText {
-    display: inline;
-  }
-
-  & .euiText p {
-    display: inline;
-  }
-`;
-
-/**
- * The "default" view for the panel: A list of all the processes currently in the graph.
- *
- * @param {function} pushToQueryparams A function to update the hash value in the URL to control panel state
- */
-export const ProcessListWithCounts = memo(function ProcessListWithCounts({
-  pushToQueryParams,
-}: {
-  pushToQueryParams: (queryStringKeyValuePair: CrumbInfo) => unknown;
-}) {
-  interface ProcessTableView {
-    name: string;
-    timestamp?: Date;
-    event: ResolverEvent;
-  }
-
-  const dispatch = useResolverDispatch();
-  const { timestamp } = useContext(SideEffectContext);
-  const isProcessTerminated = useSelector(selectors.isProcessTerminated);
-  const handleBringIntoViewClick = useCallback(
-    (processTableViewItem) => {
-      dispatch({
-        type: 'userBroughtProcessIntoView',
-        payload: {
-          time: timestamp(),
-          process: processTableViewItem.event,
-        },
-      });
-      pushToQueryParams({ crumbId: event.entityId(processTableViewItem.event), crumbEvent: '' });
-    },
-    [dispatch, timestamp, pushToQueryParams]
-  );
-
-  const columns = useMemo<Array<EuiBasicTableColumn<ProcessTableView>>>(
-    () => [
-      {
-        field: 'name',
-        name: i18n.translate(
-          'xpack.securitySolution.endpoint.resolver.panel.table.row.processNameTitle',
-          {
-            defaultMessage: 'Process Name',
-          }
-        ),
-        sortable: true,
-        truncateText: true,
-        render(name: string, item: ProcessTableView) {
-          const entityId = event.entityId(item.event);
-          const isTerminated = isProcessTerminated(entityId);
-          return name === '' ? (
-            <EuiBadge color="warning">
-              {i18n.translate(
-                'xpack.securitySolution.endpoint.resolver.panel.table.row.valueMissingDescription',
-                {
-                  defaultMessage: 'Value is missing',
-                }
-              )}
-            </EuiBadge>
-          ) : (
-            <EuiButtonEmpty
-              onClick={() => {
-                handleBringIntoViewClick(item);
-                pushToQueryParams({ crumbId: event.entityId(item.event), crumbEvent: '' });
-              }}
-            >
-              <CubeForProcess isProcessTerminated={isTerminated} />
-              {name}
-            </EuiButtonEmpty>
-          );
-        },
-      },
-      {
-        field: 'timestamp',
-        name: i18n.translate(
-          'xpack.securitySolution.endpoint.resolver.panel.table.row.timestampTitle',
-          {
-            defaultMessage: 'Timestamp',
-          }
-        ),
-        dataType: 'date',
-        sortable: true,
-        render(eventDate?: Date) {
-          return eventDate ? (
-            formatter.format(eventDate)
-          ) : (
-            <EuiBadge color="warning">
-              {i18n.translate(
-                'xpack.securitySolution.endpoint.resolver.panel.table.row.timestampInvalidLabel',
-                {
-                  defaultMessage: 'invalid',
-                }
-              )}
-            </EuiBadge>
-          );
-        },
-      },
-    ],
-    [pushToQueryParams, handleBringIntoViewClick, isProcessTerminated]
-  );
-
-  const { processNodePositions } = useSelector(selectors.layout);
-  const processTableView: ProcessTableView[] = useMemo(
-    () =>
-      [...processNodePositions.keys()].map((processEvent) => {
-        let dateTime;
-        const eventTime = event.eventTimestamp(processEvent);
-        const name = event.eventName(processEvent);
-        if (eventTime) {
-          const date = new Date(eventTime);
-          if (isFinite(date.getTime())) {
-            dateTime = date;
-          }
-        }
-        return {
-          name,
-          timestamp: dateTime,
-          event: processEvent,
-        };
-      }),
-    [processNodePositions]
-  );
-  const numberOfProcesses = processTableView.length;
-
-  const crumbs = useMemo(() => {
-    return [
-      {
-        text: i18n.translate(
-          'xpack.securitySolution.endpoint.resolver.panel.processListWithCounts.events',
-          {
-            defaultMessage: 'All Process Events',
-          }
-        ),
-        onClick: () => {},
-      },
-    ];
-  }, []);
-
-  const children = useSelector(selectors.hasMoreChildren);
-  const ancestors = useSelector(selectors.hasMoreAncestors);
-  const showWarning = children === true || ancestors === true;
-  return (
-    <>
-      <StyledBreadcrumbs breadcrumbs={crumbs} />
-      {showWarning && <StyledLimitWarning numberDisplayed={numberOfProcesses} />}
-      <EuiSpacer size="l" />
-      <EuiInMemoryTable<ProcessTableView>
-        data-test-subj="resolver:panel:process-list"
-        items={processTableView}
-        columns={columns}
-        sorting
-      />
-    </>
-  );
-});
-ProcessListWithCounts.displayName = 'ProcessListWithCounts';
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { memo, useContext, useCallback, useMemo } from 'react';
+import {
+  EuiBasicTableColumn,
+  EuiBadge,
+  EuiButtonEmpty,
+  EuiSpacer,
+  EuiInMemoryTable,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { useSelector } from 'react-redux';
+import styled from 'styled-components';
+import * as event from '../../../../common/endpoint/models/event';
+import * as selectors from '../../store/selectors';
+import { CrumbInfo, formatter, StyledBreadcrumbs } from './panel_content_utilities';
+import { useResolverDispatch } from '../use_resolver_dispatch';
+import { SideEffectContext } from '../side_effect_context';
+import { CubeForProcess } from './cube_for_process';
+import { SafeResolverEvent } from '../../../../common/endpoint/types';
+import { LimitWarning } from '../limit_warnings';
+
+const StyledLimitWarning = styled(LimitWarning)`
+  flex-flow: row wrap;
+  display: block;
+  align-items: baseline;
+  margin-top: 1em;
+
+  & .euiCallOutHeader {
+    display: inline;
+    margin-right: 0.25em;
+  }
+
+  & .euiText {
+    display: inline;
+  }
+
+  & .euiText p {
+    display: inline;
+  }
+`;
+
+/**
+ * The "default" view for the panel: A list of all the processes currently in the graph.
+ *
+ * @param {function} pushToQueryparams A function to update the hash value in the URL to control panel state
+ */
+export const ProcessListWithCounts = memo(function ProcessListWithCounts({
+  pushToQueryParams,
+}: {
+  pushToQueryParams: (queryStringKeyValuePair: CrumbInfo) => unknown;
+}) {
+  interface ProcessTableView {
+    name?: string;
+    timestamp?: Date;
+    event: SafeResolverEvent;
+  }
+
+  const dispatch = useResolverDispatch();
+  const { timestamp } = useContext(SideEffectContext);
+  const isProcessTerminated = useSelector(selectors.isProcessTerminated);
+  const handleBringIntoViewClick = useCallback(
+    (processTableViewItem) => {
+      dispatch({
+        type: 'userBroughtProcessIntoView',
+        payload: {
+          time: timestamp(),
+          process: processTableViewItem.event,
+        },
+      });
+      pushToQueryParams({ crumbId: event.entityId(processTableViewItem.event), crumbEvent: '' });
+    },
+    [dispatch, timestamp, pushToQueryParams]
+  );
+
+  const columns = useMemo<Array<EuiBasicTableColumn<ProcessTableView>>>(
+    () => [
+      {
+        field: 'name',
+        name: i18n.translate(
+          'xpack.securitySolution.endpoint.resolver.panel.table.row.processNameTitle',
+          {
+            defaultMessage: 'Process Name',
+          }
+        ),
+        sortable: true,
+        truncateText: true,
+        render(name: string, item: ProcessTableView) {
+          const entityID = event.entityIDSafeVersion(item.event);
+          const isTerminated = entityID === undefined ? false : isProcessTerminated(entityID);
+          return name === '' ? (
+            <EuiBadge color="warning">
+              {i18n.translate(
+                'xpack.securitySolution.endpoint.resolver.panel.table.row.valueMissingDescription',
+                {
+                  defaultMessage: 'Value is missing',
+                }
+              )}
+            </EuiBadge>
+          ) : (
+            <EuiButtonEmpty
+              onClick={() => {
+                handleBringIntoViewClick(item);
+                pushToQueryParams({
+                  // Take the user back to the list of nodes if this node has no ID
+                  crumbId: event.entityIDSafeVersion(item.event) ?? '',
+                  crumbEvent: '',
+                });
+              }}
+            >
+              <CubeForProcess isProcessTerminated={isTerminated} />
+              {name}
+            </EuiButtonEmpty>
+          );
+        },
+      },
+      {
+        field: 'timestamp',
+        name: i18n.translate(
+          'xpack.securitySolution.endpoint.resolver.panel.table.row.timestampTitle',
+          {
+            defaultMessage: 'Timestamp',
+          }
+        ),
+        dataType: 'date',
+        sortable: true,
+        render(eventDate?: Date) {
+          return eventDate ? (
+            formatter.format(eventDate)
+          ) : (
+            <EuiBadge color="warning">
+              {i18n.translate(
+                'xpack.securitySolution.endpoint.resolver.panel.table.row.timestampInvalidLabel',
+                {
+                  defaultMessage: 'invalid',
+                }
+              )}
+            </EuiBadge>
+          );
+        },
+      },
+    ],
+    [pushToQueryParams, handleBringIntoViewClick, isProcessTerminated]
+  );
+
+  const { processNodePositions } = useSelector(selectors.layout);
+  const processTableView: ProcessTableView[] = useMemo(
+    () =>
+      [...processNodePositions.keys()].map((processEvent) => {
+        let dateTime: Date | undefined;
+        const eventTime = event.timestampSafeVersion(processEvent);
+        const name = event.processNameSafeVersion(processEvent);
+        if (eventTime) {
+          const date = new Date(eventTime);
+          if (isFinite(date.getTime())) {
+            dateTime = date;
+          }
+        }
+        return {
+          name,
+          timestamp: dateTime,
+          event: processEvent,
+        };
+      }),
+    [processNodePositions]
+  );
+  const numberOfProcesses = processTableView.length;
+
+  const crumbs = useMemo(() => {
+    return [
+      {
+        text: i18n.translate(
+          'xpack.securitySolution.endpoint.resolver.panel.processListWithCounts.events',
+          {
+            defaultMessage: 'All Process Events',
+          }
+        ),
+        onClick: () => {},
+      },
+    ];
+  }, []);
+
+  const children = useSelector(selectors.hasMoreChildren);
+  const ancestors = useSelector(selectors.hasMoreAncestors);
+  const showWarning = children === true || ancestors === true;
+  const rowProps = useMemo(() => ({ 'data-test-subj': 'resolver:node-list:item' }), []);
+  return (
+    <>
+      <StyledBreadcrumbs breadcrumbs={crumbs} />
+      {showWarning && <StyledLimitWarning numberDisplayed={numberOfProcesses} />}
+      <EuiSpacer size="l" />
+      <EuiInMemoryTable<ProcessTableView>
+        rowProps={rowProps}
+        data-test-subj="resolver:node-list"
+        items={processTableView}
+        columns={columns}
+        sorting
+      />
+    </>
+  );
+});
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_related_detail.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
similarity index 97%
rename from x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_related_detail.tsx
rename to x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
index 10e57a09b5da4..3579b1b2f69b8 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_related_detail.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
@@ -1,375 +1,375 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { memo, useMemo, useEffect, Fragment } from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiSpacer, EuiText, EuiDescriptionList, EuiTextColor, EuiTitle } from '@elastic/eui';
-import styled from 'styled-components';
-import { useSelector } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
-import {
-  CrumbInfo,
-  formatDate,
-  StyledBreadcrumbs,
-  BoldCode,
-  StyledTime,
-} from './panel_content_utilities';
-import * as event from '../../../../common/endpoint/models/event';
-import { ResolverEvent } from '../../../../common/endpoint/types';
-import * as selectors from '../../store/selectors';
-import { useResolverDispatch } from '../use_resolver_dispatch';
-import { PanelContentError } from './panel_content_error';
-
-/**
- * A helper function to turn objects into EuiDescriptionList entries.
- * This reflects the strategy of more or less "dumping" metadata for related processes
- * in description lists with little/no 'prettification'. This has the obvious drawback of
- * data perhaps appearing inscrutable/daunting, but the benefit of presenting these fields
- * to the user "as they occur" in ECS, which may help them with e.g. EQL queries.
- *
- * Given an object like: {a:{b: 1}, c: 'd'} it will yield title/description entries like so:
- * {title: "a.b", description: "1"}, {title: "c", description: "d"}
- *
- * @param {object} obj The object to turn into `<dt><dd>` entries
- */
-const objectToDescriptionListEntries = function* (
-  obj: object,
-  prefix = ''
-): Generator<{ title: string; description: string }> {
-  const nextPrefix = prefix.length ? `${prefix}.` : '';
-  for (const [metaKey, metaValue] of Object.entries(obj)) {
-    if (typeof metaValue === 'number' || typeof metaValue === 'string') {
-      yield { title: nextPrefix + metaKey, description: `${metaValue}` };
-    } else if (metaValue instanceof Array) {
-      yield {
-        title: nextPrefix + metaKey,
-        description: metaValue
-          .filter((arrayEntry) => {
-            return typeof arrayEntry === 'number' || typeof arrayEntry === 'string';
-          })
-          .join(','),
-      };
-    } else if (typeof metaValue === 'object') {
-      yield* objectToDescriptionListEntries(metaValue, nextPrefix + metaKey);
-    }
-  }
-};
-
-// Adding some styles to prevent horizontal scrollbars, per request from UX review
-const StyledDescriptionList = memo(styled(EuiDescriptionList)`
-  &.euiDescriptionList.euiDescriptionList--column dt.euiDescriptionList__title.desc-title {
-    max-width: 8em;
-  }
-  &.euiDescriptionList.euiDescriptionList--column dd.euiDescriptionList__description {
-    max-width: calc(100% - 8.5em);
-    overflow-wrap: break-word;
-  }
-`);
-
-// Styling subtitles, per UX review:
-const StyledFlexTitle = memo(styled('h3')`
-  display: flex;
-  flex-flow: row;
-  font-size: 1.2em;
-`);
-const StyledTitleRule = memo(styled('hr')`
-  &.euiHorizontalRule.euiHorizontalRule--full.euiHorizontalRule--marginSmall.override {
-    display: block;
-    flex: 1;
-    margin-left: 0.5em;
-  }
-`);
-
-const TitleHr = memo(() => {
-  return (
-    <StyledTitleRule className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall override" />
-  );
-});
-TitleHr.displayName = 'TitleHR';
-
-/**
- * This view presents a detailed view of all the available data for a related event, split and titled by the "section"
- * it appears in the underlying ResolverEvent
- */
-export const RelatedEventDetail = memo(function RelatedEventDetail({
-  relatedEventId,
-  parentEvent,
-  pushToQueryParams,
-  countForParent,
-}: {
-  relatedEventId: string;
-  parentEvent: ResolverEvent;
-  pushToQueryParams: (queryStringKeyValuePair: CrumbInfo) => unknown;
-  countForParent: number | undefined;
-}) {
-  const processName = (parentEvent && event.eventName(parentEvent)) || '*';
-  const processEntityId = parentEvent && event.entityId(parentEvent);
-  const totalCount = countForParent || 0;
-  const eventsString = i18n.translate(
-    'xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.events',
-    {
-      defaultMessage: 'Events',
-    }
-  );
-  const naString = i18n.translate(
-    'xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.NA',
-    {
-      defaultMessage: 'N/A',
-    }
-  );
-
-  const relatedsReadyMap = useSelector(selectors.relatedEventsReady);
-  const relatedsReady = relatedsReadyMap.get(processEntityId!);
-  const dispatch = useResolverDispatch();
-
-  /**
-   * If we don't have the related events for the parent yet, use this effect
-   * to request them.
-   */
-  useEffect(() => {
-    if (typeof relatedsReady === 'undefined') {
-      dispatch({
-        type: 'appDetectedMissingEventData',
-        payload: processEntityId,
-      });
-    }
-  }, [relatedsReady, dispatch, processEntityId]);
-
-  const relatedEventsForThisProcess = useSelector(selectors.relatedEventsByEntityId).get(
-    processEntityId!
-  );
-
-  const [relatedEventToShowDetailsFor, countBySameCategory, relatedEventCategory] = useMemo(() => {
-    if (!relatedEventsForThisProcess) {
-      return [undefined, 0];
-    }
-    const specificEvent = relatedEventsForThisProcess.events.find(
-      (evt) => event.eventId(evt) === relatedEventId
-    );
-    // For breadcrumbs:
-    const specificCategory = specificEvent && event.primaryEventCategory(specificEvent);
-    const countOfCategory = relatedEventsForThisProcess.events.reduce((sumtotal, evt) => {
-      return event.primaryEventCategory(evt) === specificCategory ? sumtotal + 1 : sumtotal;
-    }, 0);
-    return [specificEvent, countOfCategory, specificCategory || naString];
-  }, [relatedEventsForThisProcess, naString, relatedEventId]);
-
-  const [sections, formattedDate] = useMemo(() => {
-    if (!relatedEventToShowDetailsFor) {
-      // This could happen if user relaods from URL param and requests an eventId that no longer exists
-      return [[], naString];
-    }
-    // Assuming these details (agent, ecs, process) aren't as helpful, can revisit
-    const {
-      agent,
-      ecs,
-      process,
-      ...relevantData
-    } = relatedEventToShowDetailsFor as ResolverEvent & {
-      // Type this with various unknown keys so that ts will let us delete those keys
-      ecs: unknown;
-      process: unknown;
-    };
-    let displayDate = '';
-    const sectionData: Array<{
-      sectionTitle: string;
-      entries: Array<{ title: string; description: string }>;
-    }> = Object.entries(relevantData)
-      .map(([sectionTitle, val]) => {
-        if (sectionTitle === '@timestamp') {
-          displayDate = formatDate(val);
-          return { sectionTitle: '', entries: [] };
-        }
-        if (typeof val !== 'object') {
-          return { sectionTitle, entries: [{ title: sectionTitle, description: `${val}` }] };
-        }
-        return { sectionTitle, entries: [...objectToDescriptionListEntries(val)] };
-      })
-      .filter((v) => v.sectionTitle !== '' && v.entries.length);
-    return [sectionData, displayDate];
-  }, [relatedEventToShowDetailsFor, naString]);
-
-  const waitCrumbs = useMemo(() => {
-    return [
-      {
-        text: eventsString,
-        onClick: () => {
-          pushToQueryParams({ crumbId: '', crumbEvent: '' });
-        },
-      },
-    ];
-  }, [pushToQueryParams, eventsString]);
-
-  const { subject = '', descriptor = '' } = relatedEventToShowDetailsFor
-    ? event.descriptiveName(relatedEventToShowDetailsFor)
-    : {};
-  const crumbs = useMemo(() => {
-    return [
-      {
-        text: eventsString,
-        onClick: () => {
-          pushToQueryParams({ crumbId: '', crumbEvent: '' });
-        },
-      },
-      {
-        text: processName,
-        onClick: () => {
-          pushToQueryParams({ crumbId: processEntityId!, crumbEvent: '' });
-        },
-      },
-      {
-        text: (
-          <>
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.numberOfEvents"
-              values={{ totalCount }}
-              defaultMessage="{totalCount} Events"
-            />
-          </>
-        ),
-        onClick: () => {
-          pushToQueryParams({ crumbId: processEntityId!, crumbEvent: 'all' });
-        },
-      },
-      {
-        text: (
-          <>
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.countByCategory"
-              values={{ count: countBySameCategory, category: relatedEventCategory }}
-              defaultMessage="{count} {category}"
-            />
-          </>
-        ),
-        onClick: () => {
-          pushToQueryParams({
-            crumbId: processEntityId!,
-            crumbEvent: relatedEventCategory || 'all',
-          });
-        },
-      },
-      {
-        text: relatedEventToShowDetailsFor ? (
-          <FormattedMessage
-            id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.eventDescriptiveName"
-            values={{ subject, descriptor }}
-            defaultMessage="{descriptor} {subject}"
-          />
-        ) : (
-          naString
-        ),
-        onClick: () => {},
-      },
-    ];
-  }, [
-    processName,
-    processEntityId,
-    eventsString,
-    pushToQueryParams,
-    totalCount,
-    countBySameCategory,
-    naString,
-    relatedEventCategory,
-    relatedEventToShowDetailsFor,
-    subject,
-    descriptor,
-  ]);
-
-  /**
-   * If the ship hasn't come in yet, wait on the dock
-   */
-  if (!relatedsReady) {
-    const waitingString = i18n.translate(
-      'xpack.securitySolution.endpoint.resolver.panel.relatedDetail.wait',
-      {
-        defaultMessage: 'Waiting For Events...',
-      }
-    );
-    return (
-      <>
-        <StyledBreadcrumbs breadcrumbs={waitCrumbs} />
-        <EuiSpacer size="l" />
-        <EuiTitle>
-          <h4>{waitingString}</h4>
-        </EuiTitle>
-      </>
-    );
-  }
-
-  /**
-   * Could happen if user e.g. loads a URL with a bad crumbEvent
-   */
-  if (!relatedEventToShowDetailsFor) {
-    const errString = i18n.translate(
-      'xpack.securitySolution.endpoint.resolver.panel.relatedDetail.missing',
-      {
-        defaultMessage: 'Related event not found.',
-      }
-    );
-    return (
-      <PanelContentError translatedErrorMessage={errString} pushToQueryParams={pushToQueryParams} />
-    );
-  }
-
-  return (
-    <>
-      <StyledBreadcrumbs breadcrumbs={crumbs} />
-      <EuiSpacer size="l" />
-      <EuiText size="s">
-        <BoldCode>
-          <FormattedMessage
-            id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.categoryAndType"
-            values={{
-              category: relatedEventCategory,
-              eventType: String(event.ecsEventType(relatedEventToShowDetailsFor)),
-            }}
-            defaultMessage="{category} {eventType}"
-          />
-        </BoldCode>
-        <StyledTime dateTime={formattedDate}>
-          <FormattedMessage
-            id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.atTime"
-            values={{ date: formattedDate }}
-            defaultMessage="@ {date}"
-          />
-        </StyledTime>
-      </EuiText>
-      <EuiSpacer size="m" />
-      <EuiText>
-        <FormattedMessage
-          id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.eventDescriptiveNameInTitle"
-          values={{ subject, descriptor }}
-          defaultMessage="{descriptor} {subject}"
-        />
-      </EuiText>
-      <EuiSpacer size="l" />
-      {sections.map(({ sectionTitle, entries }, index) => {
-        return (
-          <Fragment key={index}>
-            {index === 0 ? null : <EuiSpacer size="m" />}
-            <EuiTitle size="xxxs">
-              <EuiTextColor color="subdued">
-                <StyledFlexTitle>
-                  {sectionTitle}
-                  <TitleHr />
-                </StyledFlexTitle>
-              </EuiTextColor>
-            </EuiTitle>
-            <EuiSpacer size="m" />
-            <StyledDescriptionList
-              type="column"
-              align="left"
-              titleProps={{ className: 'desc-title' }}
-              compressed
-              listItems={entries}
-            />
-            {index === sections.length - 1 ? null : <EuiSpacer size="m" />}
-          </Fragment>
-        );
-      })}
-    </>
-  );
-});
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo, useMemo, useEffect, Fragment } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiSpacer, EuiText, EuiDescriptionList, EuiTextColor, EuiTitle } from '@elastic/eui';
+import styled from 'styled-components';
+import { useSelector } from 'react-redux';
+import { FormattedMessage } from 'react-intl';
+import {
+  CrumbInfo,
+  formatDate,
+  StyledBreadcrumbs,
+  BoldCode,
+  StyledTime,
+} from './panel_content_utilities';
+import * as event from '../../../../common/endpoint/models/event';
+import { ResolverEvent } from '../../../../common/endpoint/types';
+import * as selectors from '../../store/selectors';
+import { useResolverDispatch } from '../use_resolver_dispatch';
+import { PanelContentError } from './panel_content_error';
+
+/**
+ * A helper function to turn objects into EuiDescriptionList entries.
+ * This reflects the strategy of more or less "dumping" metadata for related processes
+ * in description lists with little/no 'prettification'. This has the obvious drawback of
+ * data perhaps appearing inscrutable/daunting, but the benefit of presenting these fields
+ * to the user "as they occur" in ECS, which may help them with e.g. EQL queries.
+ *
+ * Given an object like: {a:{b: 1}, c: 'd'} it will yield title/description entries like so:
+ * {title: "a.b", description: "1"}, {title: "c", description: "d"}
+ *
+ * @param {object} obj The object to turn into `<dt><dd>` entries
+ */
+const objectToDescriptionListEntries = function* (
+  obj: object,
+  prefix = ''
+): Generator<{ title: string; description: string }> {
+  const nextPrefix = prefix.length ? `${prefix}.` : '';
+  for (const [metaKey, metaValue] of Object.entries(obj)) {
+    if (typeof metaValue === 'number' || typeof metaValue === 'string') {
+      yield { title: nextPrefix + metaKey, description: `${metaValue}` };
+    } else if (metaValue instanceof Array) {
+      yield {
+        title: nextPrefix + metaKey,
+        description: metaValue
+          .filter((arrayEntry) => {
+            return typeof arrayEntry === 'number' || typeof arrayEntry === 'string';
+          })
+          .join(','),
+      };
+    } else if (typeof metaValue === 'object') {
+      yield* objectToDescriptionListEntries(metaValue, nextPrefix + metaKey);
+    }
+  }
+};
+
+// Adding some styles to prevent horizontal scrollbars, per request from UX review
+const StyledDescriptionList = memo(styled(EuiDescriptionList)`
+  &.euiDescriptionList.euiDescriptionList--column dt.euiDescriptionList__title.desc-title {
+    max-width: 8em;
+  }
+  &.euiDescriptionList.euiDescriptionList--column dd.euiDescriptionList__description {
+    max-width: calc(100% - 8.5em);
+    overflow-wrap: break-word;
+  }
+`);
+
+// Styling subtitles, per UX review:
+const StyledFlexTitle = memo(styled('h3')`
+  display: flex;
+  flex-flow: row;
+  font-size: 1.2em;
+`);
+const StyledTitleRule = memo(styled('hr')`
+  &.euiHorizontalRule.euiHorizontalRule--full.euiHorizontalRule--marginSmall.override {
+    display: block;
+    flex: 1;
+    margin-left: 0.5em;
+  }
+`);
+
+const TitleHr = memo(() => {
+  return (
+    <StyledTitleRule className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall override" />
+  );
+});
+TitleHr.displayName = 'TitleHR';
+
+/**
+ * This view presents a detailed view of all the available data for a related event, split and titled by the "section"
+ * it appears in the underlying ResolverEvent
+ */
+export const RelatedEventDetail = memo(function RelatedEventDetail({
+  relatedEventId,
+  parentEvent,
+  pushToQueryParams,
+  countForParent,
+}: {
+  relatedEventId: string;
+  parentEvent: ResolverEvent;
+  pushToQueryParams: (queryStringKeyValuePair: CrumbInfo) => unknown;
+  countForParent: number | undefined;
+}) {
+  const processName = (parentEvent && event.eventName(parentEvent)) || '*';
+  const processEntityId = parentEvent && event.entityId(parentEvent);
+  const totalCount = countForParent || 0;
+  const eventsString = i18n.translate(
+    'xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.events',
+    {
+      defaultMessage: 'Events',
+    }
+  );
+  const naString = i18n.translate(
+    'xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.NA',
+    {
+      defaultMessage: 'N/A',
+    }
+  );
+
+  const relatedsReadyMap = useSelector(selectors.relatedEventsReady);
+  const relatedsReady = relatedsReadyMap.get(processEntityId!);
+  const dispatch = useResolverDispatch();
+
+  /**
+   * If we don't have the related events for the parent yet, use this effect
+   * to request them.
+   */
+  useEffect(() => {
+    if (typeof relatedsReady === 'undefined') {
+      dispatch({
+        type: 'appDetectedMissingEventData',
+        payload: processEntityId,
+      });
+    }
+  }, [relatedsReady, dispatch, processEntityId]);
+
+  const relatedEventsForThisProcess = useSelector(selectors.relatedEventsByEntityId).get(
+    processEntityId!
+  );
+
+  const [relatedEventToShowDetailsFor, countBySameCategory, relatedEventCategory] = useMemo(() => {
+    if (!relatedEventsForThisProcess) {
+      return [undefined, 0];
+    }
+    const specificEvent = relatedEventsForThisProcess.events.find(
+      (evt) => event.eventId(evt) === relatedEventId
+    );
+    // For breadcrumbs:
+    const specificCategory = specificEvent && event.primaryEventCategory(specificEvent);
+    const countOfCategory = relatedEventsForThisProcess.events.reduce((sumtotal, evt) => {
+      return event.primaryEventCategory(evt) === specificCategory ? sumtotal + 1 : sumtotal;
+    }, 0);
+    return [specificEvent, countOfCategory, specificCategory || naString];
+  }, [relatedEventsForThisProcess, naString, relatedEventId]);
+
+  const [sections, formattedDate] = useMemo(() => {
+    if (!relatedEventToShowDetailsFor) {
+      // This could happen if user relaods from URL param and requests an eventId that no longer exists
+      return [[], naString];
+    }
+    // Assuming these details (agent, ecs, process) aren't as helpful, can revisit
+    const {
+      agent,
+      ecs,
+      process,
+      ...relevantData
+    } = relatedEventToShowDetailsFor as ResolverEvent & {
+      // Type this with various unknown keys so that ts will let us delete those keys
+      ecs: unknown;
+      process: unknown;
+    };
+    let displayDate = '';
+    const sectionData: Array<{
+      sectionTitle: string;
+      entries: Array<{ title: string; description: string }>;
+    }> = Object.entries(relevantData)
+      .map(([sectionTitle, val]) => {
+        if (sectionTitle === '@timestamp') {
+          displayDate = formatDate(val);
+          return { sectionTitle: '', entries: [] };
+        }
+        if (typeof val !== 'object') {
+          return { sectionTitle, entries: [{ title: sectionTitle, description: `${val}` }] };
+        }
+        return { sectionTitle, entries: [...objectToDescriptionListEntries(val)] };
+      })
+      .filter((v) => v.sectionTitle !== '' && v.entries.length);
+    return [sectionData, displayDate];
+  }, [relatedEventToShowDetailsFor, naString]);
+
+  const waitCrumbs = useMemo(() => {
+    return [
+      {
+        text: eventsString,
+        onClick: () => {
+          pushToQueryParams({ crumbId: '', crumbEvent: '' });
+        },
+      },
+    ];
+  }, [pushToQueryParams, eventsString]);
+
+  const { subject = '', descriptor = '' } = relatedEventToShowDetailsFor
+    ? event.descriptiveName(relatedEventToShowDetailsFor)
+    : {};
+  const crumbs = useMemo(() => {
+    return [
+      {
+        text: eventsString,
+        onClick: () => {
+          pushToQueryParams({ crumbId: '', crumbEvent: '' });
+        },
+      },
+      {
+        text: processName,
+        onClick: () => {
+          pushToQueryParams({ crumbId: processEntityId!, crumbEvent: '' });
+        },
+      },
+      {
+        text: (
+          <>
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.numberOfEvents"
+              values={{ totalCount }}
+              defaultMessage="{totalCount} Events"
+            />
+          </>
+        ),
+        onClick: () => {
+          pushToQueryParams({ crumbId: processEntityId!, crumbEvent: 'all' });
+        },
+      },
+      {
+        text: (
+          <>
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.countByCategory"
+              values={{ count: countBySameCategory, category: relatedEventCategory }}
+              defaultMessage="{count} {category}"
+            />
+          </>
+        ),
+        onClick: () => {
+          pushToQueryParams({
+            crumbId: processEntityId!,
+            crumbEvent: relatedEventCategory || 'all',
+          });
+        },
+      },
+      {
+        text: relatedEventToShowDetailsFor ? (
+          <FormattedMessage
+            id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.eventDescriptiveName"
+            values={{ subject, descriptor }}
+            defaultMessage="{descriptor} {subject}"
+          />
+        ) : (
+          naString
+        ),
+        onClick: () => {},
+      },
+    ];
+  }, [
+    processName,
+    processEntityId,
+    eventsString,
+    pushToQueryParams,
+    totalCount,
+    countBySameCategory,
+    naString,
+    relatedEventCategory,
+    relatedEventToShowDetailsFor,
+    subject,
+    descriptor,
+  ]);
+
+  /**
+   * If the ship hasn't come in yet, wait on the dock
+   */
+  if (!relatedsReady) {
+    const waitingString = i18n.translate(
+      'xpack.securitySolution.endpoint.resolver.panel.relatedDetail.wait',
+      {
+        defaultMessage: 'Waiting For Events...',
+      }
+    );
+    return (
+      <>
+        <StyledBreadcrumbs breadcrumbs={waitCrumbs} />
+        <EuiSpacer size="l" />
+        <EuiTitle>
+          <h4>{waitingString}</h4>
+        </EuiTitle>
+      </>
+    );
+  }
+
+  /**
+   * Could happen if user e.g. loads a URL with a bad crumbEvent
+   */
+  if (!relatedEventToShowDetailsFor) {
+    const errString = i18n.translate(
+      'xpack.securitySolution.endpoint.resolver.panel.relatedDetail.missing',
+      {
+        defaultMessage: 'Related event not found.',
+      }
+    );
+    return (
+      <PanelContentError translatedErrorMessage={errString} pushToQueryParams={pushToQueryParams} />
+    );
+  }
+
+  return (
+    <>
+      <StyledBreadcrumbs breadcrumbs={crumbs} />
+      <EuiSpacer size="l" />
+      <EuiText size="s">
+        <BoldCode>
+          <FormattedMessage
+            id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.categoryAndType"
+            values={{
+              category: relatedEventCategory,
+              eventType: String(event.ecsEventType(relatedEventToShowDetailsFor)),
+            }}
+            defaultMessage="{category} {eventType}"
+          />
+        </BoldCode>
+        <StyledTime dateTime={formattedDate}>
+          <FormattedMessage
+            id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.atTime"
+            values={{ date: formattedDate }}
+            defaultMessage="@ {date}"
+          />
+        </StyledTime>
+      </EuiText>
+      <EuiSpacer size="m" />
+      <EuiText>
+        <FormattedMessage
+          id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.eventDescriptiveNameInTitle"
+          values={{ subject, descriptor }}
+          defaultMessage="{descriptor} {subject}"
+        />
+      </EuiText>
+      <EuiSpacer size="l" />
+      {sections.map(({ sectionTitle, entries }, index) => {
+        return (
+          <Fragment key={index}>
+            {index === 0 ? null : <EuiSpacer size="m" />}
+            <EuiTitle size="xxxs">
+              <EuiTextColor color="subdued">
+                <StyledFlexTitle>
+                  {sectionTitle}
+                  <TitleHr />
+                </StyledFlexTitle>
+              </EuiTextColor>
+            </EuiTitle>
+            <EuiSpacer size="m" />
+            <StyledDescriptionList
+              type="column"
+              align="left"
+              titleProps={{ className: 'desc-title' }}
+              compressed
+              listItems={entries}
+            />
+            {index === sections.length - 1 ? null : <EuiSpacer size="m" />}
+          </Fragment>
+        );
+      })}
+    </>
+  );
+});
diff --git a/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx b/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
index 24de45ee894dc..2a5d91028d9f5 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
@@ -14,10 +14,9 @@ import { NodeSubMenu, subMenuAssets } from './submenu';
 import { applyMatrix3 } from '../models/vector2';
 import { Vector2, Matrix3 } from '../types';
 import { SymbolIds, useResolverTheme, calculateResolverFontSize } from './assets';
-import { ResolverEvent } from '../../../common/endpoint/types';
+import { ResolverEvent, SafeResolverEvent } from '../../../common/endpoint/types';
 import { useResolverDispatch } from './use_resolver_dispatch';
 import * as eventModel from '../../../common/endpoint/models/event';
-import * as processEventModel from '../models/process_event';
 import * as selectors from '../store/selectors';
 import { useResolverQueryParams } from './use_resolver_query_params';
 
@@ -85,7 +84,7 @@ const UnstyledProcessEventDot = React.memo(
     /**
      * An event which contains details about the process node.
      */
-    event: ResolverEvent;
+    event: SafeResolverEvent;
     /**
      * projectionMatrix which can be used to convert `position` to screen coordinates.
      */
@@ -114,7 +113,11 @@ const UnstyledProcessEventDot = React.memo(
     // Node (html id=) IDs
     const ariaActiveDescendant = useSelector(selectors.ariaActiveDescendant);
     const selectedNode = useSelector(selectors.selectedNode);
-    const nodeID = processEventModel.uniquePidForProcess(event);
+    const nodeID: string | undefined = eventModel.entityIDSafeVersion(event);
+    if (nodeID === undefined) {
+      // NB: this component should be taking nodeID as a `string` instead of handling this logic here
+      throw new Error('Tried to render a node with no ID');
+    }
     const relatedEventStats = useSelector(selectors.relatedEventsStats)(nodeID);
 
     // define a standard way of giving HTML IDs to nodes based on their entity_id/nodeID.
@@ -287,7 +290,9 @@ const UnstyledProcessEventDot = React.memo(
       ? subMenuAssets.initialMenuStatus
       : relatedEventOptions;
 
-    const grandTotal: number | null = useSelector(selectors.relatedEventTotalForProcess)(event);
+    const grandTotal: number | null = useSelector(selectors.relatedEventTotalForProcess)(
+      event as ResolverEvent
+    );
 
     /* eslint-disable jsx-a11y/click-events-have-key-events */
     /**
@@ -398,11 +403,11 @@ const UnstyledProcessEventDot = React.memo(
                 maxWidth: `${isShowingEventActions ? 400 : 210 * xScale}px`,
               }}
               tabIndex={-1}
-              title={eventModel.eventName(event)}
+              title={eventModel.processNameSafeVersion(event)}
             >
               <span className="euiButton__content">
                 <span className="euiButton__text" data-test-subj={'euiButton__text'}>
-                  {eventModel.eventName(event)}
+                  {eventModel.processNameSafeVersion(event)}
                 </span>
               </span>
             </EuiButton>
diff --git a/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx b/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx
index e74502243ffc8..5f1e5f18e575d 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx
@@ -20,7 +20,7 @@ import { SymbolDefinitions, useResolverTheme } from './assets';
 import { useStateSyncingActions } from './use_state_syncing_actions';
 import { useResolverQueryParams } from './use_resolver_query_params';
 import { StyledMapContainer, StyledPanel, GraphContainer } from './styles';
-import { entityId } from '../../../common/endpoint/models/event';
+import { entityIDSafeVersion } from '../../../common/endpoint/models/event';
 import { SideEffectContext } from './side_effect_context';
 import { ResolverProps } from '../types';
 
@@ -114,7 +114,7 @@ export const ResolverWithoutProviders = React.memo(
               )
             )}
             {[...processNodePositions].map(([processEvent, position]) => {
-              const processEntityId = entityId(processEvent);
+              const processEntityId = entityIDSafeVersion(processEvent);
               return (
                 <ProcessEventDot
                   key={processEntityId}
diff --git a/x-pack/plugins/security_solution/public/resolver/view/styles.tsx b/x-pack/plugins/security_solution/public/resolver/view/styles.tsx
index 4cdb29b283f1e..dfc2f970f1e6f 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/styles.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/styles.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import styled from 'styled-components';
-import { Panel } from './panel';
+import { Panel } from './panels';
 
 /**
  * The top level DOM element for Resolver
diff --git a/x-pack/plugins/security_solution/public/resolver/view/use_camera.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/use_camera.test.tsx
index b32d63283b547..630ee2f7ff7f0 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/use_camera.test.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/use_camera.test.tsx
@@ -191,7 +191,7 @@ describe('useCamera on an unpainted element', () => {
         }
         const processes: ResolverEvent[] = [
           ...selectors.layout(store.getState()).processNodePositions.keys(),
-        ];
+        ] as ResolverEvent[];
         process = processes[processes.length - 1];
         if (!process) {
           throw new Error('missing the process to bring into view');
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
index 0a08e45324b89..c2e23cc19d89e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
@@ -363,6 +363,7 @@ export const queryTimelineById = <TCache>({
 export const dispatchUpdateTimeline = (dispatch: Dispatch): DispatchUpdateTimeline => ({
   duplicate,
   id,
+  forceNotes = false,
   from,
   notes,
   timeline,
@@ -407,7 +408,7 @@ export const dispatchUpdateTimeline = (dispatch: Dispatch): DispatchUpdateTimeli
     dispatch(dispatchAddGlobalTimelineNote({ noteId: newNote.id, id }));
   }
 
-  if (!duplicate) {
+  if (!duplicate || forceNotes) {
     dispatch(
       dispatchAddNotes({
         notes:
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/types.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/types.ts
index 8950f814d6965..769a0a1658a46 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/types.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/types.ts
@@ -192,6 +192,7 @@ export interface OpenTimelineProps {
 export interface UpdateTimeline {
   duplicate: boolean;
   id: string;
+  forceNotes?: boolean;
   from: string;
   notes: NoteResult[] | null | undefined;
   timeline: TimelineModel;
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/helpers.test.ts b/x-pack/plugins/security_solution/public/timelines/containers/helpers.test.ts
new file mode 100644
index 0000000000000..043b5fe39a8bf
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/containers/helpers.test.ts
@@ -0,0 +1,54 @@
+/*
+ * 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 { TimelineId } from '../../../common/types/timeline';
+import { skipQueryForDetectionsPage } from './helpers';
+
+describe('skipQueryForDetectionsPage', () => {
+  test('Make sure to NOT skip the query when it is not a timeline from a detection pages', () => {
+    expect(skipQueryForDetectionsPage(TimelineId.active, ['auditbeat-*', 'filebeat-*'])).toBe(
+      false
+    );
+    expect(
+      skipQueryForDetectionsPage(TimelineId.hostsPageEvents, ['auditbeat-*', 'filebeat-*'])
+    ).toBe(false);
+    expect(
+      skipQueryForDetectionsPage(TimelineId.hostsPageExternalAlerts, ['auditbeat-*', 'filebeat-*'])
+    ).toBe(false);
+    expect(
+      skipQueryForDetectionsPage(TimelineId.networkPageExternalAlerts, [
+        'auditbeat-*',
+        'filebeat-*',
+      ])
+    ).toBe(false);
+  });
+
+  test('Make sure to SKIP the query when it is a timeline from a detection pages without the siem-signals', () => {
+    expect(
+      skipQueryForDetectionsPage(TimelineId.detectionsPage, ['auditbeat-*', 'filebeat-*'])
+    ).toBe(true);
+    expect(
+      skipQueryForDetectionsPage(TimelineId.detectionsRulesDetailsPage, [
+        'auditbeat-*',
+        'filebeat-*',
+      ])
+    ).toBe(true);
+  });
+
+  test('Make sure to NOT skip the query when it is a timeline from a detection pages with the siem-signals', () => {
+    expect(
+      skipQueryForDetectionsPage(TimelineId.detectionsPage, [
+        'auditbeat-*',
+        '.siem-signals-rainbow-butterfly',
+      ])
+    ).toBe(false);
+    expect(
+      skipQueryForDetectionsPage(TimelineId.detectionsRulesDetailsPage, [
+        '.siem-signals-rainbow-butterfly',
+      ])
+    ).toBe(false);
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/helpers.ts b/x-pack/plugins/security_solution/public/timelines/containers/helpers.ts
new file mode 100644
index 0000000000000..aef6f4df6f41b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/containers/helpers.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 { TimelineId } from '../../../common/types/timeline';
+
+export const detectionsTimelineIds = [
+  TimelineId.detectionsPage,
+  TimelineId.detectionsRulesDetailsPage,
+];
+
+export const skipQueryForDetectionsPage = (id: string, defaultIndex: string[]) =>
+  id != null &&
+  detectionsTimelineIds.some((timelineId) => timelineId === id) &&
+  !defaultIndex.some((di) => di.toLowerCase().startsWith('.siem-signals'));
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
index 562999108b4b0..de7175f0a7f97 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
@@ -11,7 +11,6 @@ import { Query } from 'react-apollo';
 import { compose, Dispatch } from 'redux';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { TimelineId } from '../../../common/types/timeline';
 import { DEFAULT_INDEX_KEY } from '../../../common/constants';
 import { IIndexPattern } from '../../../../../../src/plugins/data/common/index_patterns';
 import {
@@ -28,8 +27,7 @@ import { QueryTemplate, QueryTemplateProps } from '../../common/containers/query
 import { EventType } from '../../timelines/store/timeline/model';
 import { timelineQuery } from './index.gql_query';
 import { timelineActions } from '../../timelines/store/timeline';
-
-const timelineIds = [TimelineId.detectionsPage, TimelineId.detectionsRulesDetailsPage];
+import { detectionsTimelineIds, skipQueryForDetectionsPage } from './helpers';
 
 export interface TimelineArgs {
   events: TimelineItem[];
@@ -130,6 +128,7 @@ class TimelineQueryComponent extends QueryTemplate<
         query={timelineQuery}
         fetchPolicy="network-only"
         notifyOnNetworkStatusChange
+        skip={skipQueryForDetectionsPage(id, defaultIndex)}
         variables={variables}
       >
         {({ data, loading, fetchMore, refetch }) => {
@@ -202,7 +201,7 @@ const makeMapStateToProps = () => {
 
 const mapDispatchToProps = (dispatch: Dispatch) => ({
   clearSignalsState: ({ id }: { id?: string }) => {
-    if (id != null && timelineIds.some((timelineId) => timelineId === id)) {
+    if (id != null && detectionsTimelineIds.some((timelineId) => timelineId === id)) {
       dispatch(timelineActions.clearEventsLoading({ id }));
       dispatch(timelineActions.clearEventsDeleted({ id }));
     }
diff --git a/x-pack/plugins/security_solution/server/lib/hosts/mock.ts b/x-pack/plugins/security_solution/server/lib/hosts/mock.ts
index 44767563c6b75..97aa68c0f9bbf 100644
--- a/x-pack/plugins/security_solution/server/lib/hosts/mock.ts
+++ b/x-pack/plugins/security_solution/server/lib/hosts/mock.ts
@@ -588,7 +588,7 @@ export const mockEndpointMetadata = {
       type: 'endpoint',
       version: '7.9.0-SNAPSHOT',
     },
-    dataset: { name: 'endpoint.metadata', namespace: 'default', type: 'metrics' },
+    data_stream: { dataset: 'endpoint.metadata', namespace: 'default', type: 'metrics' },
     ecs: { version: '1.5.0' },
     elastic: { agent: { id: '' } },
     event: {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.test.ts
index a6f0ce232fa7b..5a976ee7521af 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.test.ts
@@ -110,7 +110,7 @@ describe('export timelines', () => {
       const result = server.validate(request);
 
       expect(result.badRequest.mock.calls[0][0]).toEqual(
-        'Invalid value "someId" supplied to "ids",Invalid value "someId" supplied to "ids",Invalid value "{"ids":"someId"}" supplied to "(Partial<{ ids: (Array<string> | null) }> | null)"'
+        'Invalid value "someId" supplied to "ids",Invalid value "{"ids":"someId"}" supplied to "(Partial<{ ids: (Array<string> | null) }> | null)"'
       );
     });
   });
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
index 2ad6c5d6fff60..ff76045db90cb 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
@@ -494,10 +494,7 @@ describe('import timelines', () => {
       const result = server.validate(request);
 
       expect(result.badRequest).toHaveBeenCalledWith(
-        [
-          'Invalid value "undefined" supplied to "file"',
-          'Invalid value "undefined" supplied to "file"',
-        ].join(',')
+        'Invalid value "undefined" supplied to "file"'
       );
     });
   });
@@ -923,10 +920,7 @@ describe('import timeline templates', () => {
       const result = server.validate(request);
 
       expect(result.badRequest).toHaveBeenCalledWith(
-        [
-          'Invalid value "undefined" supplied to "file"',
-          'Invalid value "undefined" supplied to "file"',
-        ].join(',')
+        'Invalid value "undefined" supplied to "file"'
       );
     });
   });
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 8218904f77df9..c2f180f5268d4 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -8207,7 +8207,6 @@
     "xpack.indexLifecycleMgmt.editPolicy.nodeAttributesMissingDescription": "ノード属性なしではシャードの割り当てをコントロールできません。",
     "xpack.indexLifecycleMgmt.editPolicy.nodeAttributesMissingLabel": "elasticsearch.yml でノード属性が構成されていません",
     "xpack.indexLifecycleMgmt.editPolicy.nodeDetailErrorMessage": "ノード属性の詳細の読み込み中にエラーが発生しました",
-    "xpack.indexLifecycleMgmt.editPolicy.nodeInfoErrorMessage": "ノード属性の情報の読み込み中にエラーが発生しました",
     "xpack.indexLifecycleMgmt.editPolicy.numberRequiredError": "数字が必要です。",
     "xpack.indexLifecycleMgmt.editPolicy.phaseCold.minimumAgeLabel": "コールドフェーズのタイミング",
     "xpack.indexLifecycleMgmt.editPolicy.phaseCold.minimumAgeUnitsAriaLabel": "コールドフェーズのタイミングの単位",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 21a42362bcdd3..84c3eab8db9e7 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -8209,7 +8209,6 @@
     "xpack.indexLifecycleMgmt.editPolicy.nodeAttributesMissingDescription": "没有节点属性，将无法控制分片分配。",
     "xpack.indexLifecycleMgmt.editPolicy.nodeAttributesMissingLabel": "elasticsearch.yml 中未配置任何节点属性",
     "xpack.indexLifecycleMgmt.editPolicy.nodeDetailErrorMessage": "加载节点属性详细信息时出错",
-    "xpack.indexLifecycleMgmt.editPolicy.nodeInfoErrorMessage": "加载节点属性信息时出错",
     "xpack.indexLifecycleMgmt.editPolicy.numberRequiredError": "数字必填。",
     "xpack.indexLifecycleMgmt.editPolicy.phaseCold.minimumAgeLabel": "冷阶段计时",
     "xpack.indexLifecycleMgmt.editPolicy.phaseCold.minimumAgeUnitsAriaLabel": "冷阶段计时单位",
diff --git a/x-pack/plugins/uptime/common/runtime_types/ping/ping.ts b/x-pack/plugins/uptime/common/runtime_types/ping/ping.ts
index 5ed71acaf7739..0a4d6310927c4 100644
--- a/x-pack/plugins/uptime/common/runtime_types/ping/ping.ts
+++ b/x-pack/plugins/uptime/common/runtime_types/ping/ping.ts
@@ -143,7 +143,7 @@ export const PingType = t.intersection([
       response: t.partial({
         body: HttpResponseBodyType,
         bytes: t.number,
-        redirects: t.string,
+        redirects: t.array(t.string),
         status_code: t.number,
       }),
       version: t.string,
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap
index 004de391a51a4..11bdf134bd0e8 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`PingListExpandedRow doesn't render list items if the body field is undefined 1`] = `
-<EuiFlexGroup>
+<EuiFlexGroup
+  direction="column"
+>
   <EuiFlexItem>
     <EuiCallOut
       color="primary"
@@ -15,7 +17,9 @@ exports[`PingListExpandedRow doesn't render list items if the body field is unde
 `;
 
 exports[`PingListExpandedRow doesn't render list items if the http field is undefined 1`] = `
-<EuiFlexGroup>
+<EuiFlexGroup
+  direction="column"
+>
   <EuiFlexItem>
     <EuiCallOut
       color="primary"
@@ -29,7 +33,9 @@ exports[`PingListExpandedRow doesn't render list items if the http field is unde
 `;
 
 exports[`PingListExpandedRow doesn't render list items if the response field is undefined 1`] = `
-<EuiFlexGroup>
+<EuiFlexGroup
+  direction="column"
+>
   <EuiFlexItem>
     <EuiCallOut
       color="primary"
@@ -43,7 +49,9 @@ exports[`PingListExpandedRow doesn't render list items if the response field is
 `;
 
 exports[`PingListExpandedRow renders error information when an error field is present 1`] = `
-<EuiFlexGroup>
+<EuiFlexGroup
+  direction="column"
+>
   <EuiFlexItem>
     <EuiCallOut
       color="danger"
@@ -86,7 +94,9 @@ exports[`PingListExpandedRow renders error information when an error field is pr
 `;
 
 exports[`PingListExpandedRow renders expected elements for valid props 1`] = `
-<EuiFlexGroup>
+<EuiFlexGroup
+  direction="column"
+>
   <EuiFlexItem>
     <EuiCallOut
       color="primary"
@@ -124,7 +134,7 @@ exports[`PingListExpandedRow renders expected elements for valid props 1`] = `
 
 exports[`PingListExpandedRow renders link to docs if body is not recorded but it is present 1`] = `
 <div
-  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
+  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
 >
   <div
     class="euiFlexItem"
@@ -180,7 +190,9 @@ exports[`PingListExpandedRow renders link to docs if body is not recorded but it
 `;
 
 exports[`PingListExpandedRow shallow renders link to docs if body is not recorded but it is present 1`] = `
-<EuiFlexGroup>
+<EuiFlexGroup
+  direction="column"
+>
   <EuiFlexItem>
     <EuiCallOut
       color="primary"
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx
index 67bef3e72929e..201803ff3a951 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/expanded_row.tsx
@@ -18,6 +18,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { Ping, HttpResponseBody } from '../../../../common/runtime_types';
 import { DocLinkForBody } from './doc_link_body';
+import { PingRedirects } from './ping_redirects';
 
 interface Props {
   ping: Ping;
@@ -78,7 +79,12 @@ export const PingListExpandedRowComponent = ({ ping }: Props) => {
     });
   }
   return (
-    <EuiFlexGroup>
+    <EuiFlexGroup direction="column">
+      {ping?.http?.response?.redirects && (
+        <EuiFlexItem>
+          <PingRedirects monitorStatus={ping} showTitle={true} />
+        </EuiFlexItem>
+      )}
       <EuiFlexItem>
         <EuiCallOut color={ping?.error ? 'danger' : 'primary'}>
           <EuiDescriptionList listItems={listItems} />
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx
index 576810bba24fd..09782c1b76edb 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list.tsx
@@ -237,6 +237,7 @@ export const PingListComponent = (props: Props) => {
       render: (item: Ping) => {
         return (
           <EuiButtonIcon
+            data-test-subj="uptimePingListExpandBtn"
             onClick={() => toggleDetails(item, expandedRows, setExpandedRows)}
             disabled={!item.error && !(item.http?.response?.body?.bytes ?? 0 > 0)}
             aria-label={
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_redirects.tsx b/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_redirects.tsx
new file mode 100644
index 0000000000000..b3e59615cbce5
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/ping_redirects.tsx
@@ -0,0 +1,97 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import styled from 'styled-components';
+import { EuiListGroup, EuiListGroupItemProps, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
+import { Ping } from '../../../../common/runtime_types/ping';
+
+const ListGroup = styled(EuiListGroup)`
+  &&& {
+    a {
+      padding-left: 0;
+    }
+  }
+`;
+
+interface Props {
+  monitorStatus: Ping | null;
+  showTitle?: boolean;
+}
+
+export const PingRedirects: React.FC<Props> = ({ monitorStatus, showTitle }) => {
+  const monitorUrl = monitorStatus?.url?.full;
+
+  const list = monitorStatus?.http?.response?.redirects;
+
+  const listOfRedirects: EuiListGroupItemProps[] = [
+    {
+      label: monitorUrl,
+      href: monitorUrl,
+      iconType: 'globe',
+      size: 's',
+      target: '_blank',
+      extraAction: {
+        color: 'subdued',
+        iconType: 'popout',
+        iconSize: 's',
+        alwaysShow: true,
+        'aria-label': i18n.translate('xpack.uptime.monitorList.redirects.openWindow', {
+          defaultMessage: 'Link will open in new window.',
+        }),
+      },
+    },
+  ];
+
+  (list ?? []).forEach((url: string) => {
+    listOfRedirects.push({
+      label: url,
+      href: url,
+      iconType: 'sortDown',
+      size: 's',
+      target: '_blank',
+      extraAction: {
+        color: 'subdued',
+        iconType: 'popout',
+        iconSize: 's',
+        'aria-label': i18n.translate('xpack.uptime.monitorList.redirects.openWindow', {
+          defaultMessage: 'Link will open in new window.',
+        }),
+        alwaysShow: true,
+      },
+    });
+  });
+
+  const Panel = showTitle ? EuiPanel : 'div';
+
+  return list ? (
+    <Panel data-test-subj="uptimeMonitorPingListRedirectInfo">
+      {showTitle && (
+        <EuiText size="xs">
+          <h3>
+            {i18n.translate('xpack.uptime.monitorList.redirects.title', {
+              defaultMessage: 'Redirects',
+            })}
+          </h3>
+        </EuiText>
+      )}
+      <EuiSpacer size="xs" />
+      {
+        <EuiText>
+          {i18n.translate('xpack.uptime.monitorList.redirects.description', {
+            defaultMessage: 'Heartbeat followed {number} redirects while executing ping.',
+            values: {
+              number: list?.length ?? 0,
+            },
+          })}
+        </EuiText>
+      }
+      <EuiSpacer size="s" />
+      <ListGroup gutterSize={'none'} listItems={listOfRedirects} />
+    </Panel>
+  ) : null;
+};
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/monitor_redirects.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/monitor_redirects.tsx
new file mode 100644
index 0000000000000..5129db9c2135b
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/monitor_redirects.tsx
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiPopover } from '@elastic/eui';
+import styled from 'styled-components';
+import { Ping } from '../../../../../common/runtime_types';
+import { PingRedirects } from '../../ping_list/ping_redirects';
+import { MonListDescription, MonListTitle } from './status_bar';
+
+interface Props {
+  monitorStatus: Ping | null;
+}
+
+const RedirectBtn = styled.span`
+  cursor: pointer;
+`;
+
+export const MonitorRedirects: React.FC<Props> = ({ monitorStatus }) => {
+  const list = monitorStatus?.http?.response?.redirects;
+
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+
+  const button = (
+    <MonListDescription>
+      <RedirectBtn
+        className="euiLink euiLink--primary"
+        onClick={() => setIsPopoverOpen(!isPopoverOpen)}
+        data-test-subj="uptimeMonitorRedirectInfo"
+      >
+        {i18n.translate('xpack.uptime.monitorList.redirects.title.number', {
+          defaultMessage: '{number}',
+          values: {
+            number: list?.length ?? 0,
+          },
+        })}
+      </RedirectBtn>
+    </MonListDescription>
+  );
+
+  return list ? (
+    <>
+      <MonListTitle>Redirects</MonListTitle>
+      <EuiPopover
+        button={button}
+        isOpen={isPopoverOpen}
+        anchorPosition="downLeft"
+        closePopover={() => setIsPopoverOpen(false)}
+      >
+        <PingRedirects monitorStatus={monitorStatus} />
+      </EuiPopover>
+    </>
+  ) : null;
+};
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/status_bar.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/status_bar.tsx
index afcc8fae7a8ac..4ea383567d71c 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/status_bar.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/status_bar.tsx
@@ -23,6 +23,7 @@ import { MonitorIDLabel, OverallAvailability } from '../translations';
 import { URL_LABEL } from '../../../common/translations';
 import { MonitorLocations } from '../../../../../common/runtime_types/monitor';
 import { formatAvailabilityValue } from '../availability_reporting/availability_reporting';
+import { MonitorRedirects } from './monitor_redirects';
 
 export const MonListTitle = styled(EuiDescriptionListTitle)`
   &&& {
@@ -76,6 +77,7 @@ export const MonitorStatusBar: React.FC = () => {
         <MonListTitle>{MonitorIDLabel}</MonListTitle>
         <MonListDescription data-test-subj="monitor-page-title">{monitorId}</MonListDescription>
         <MonitorSSLCertificate tls={monitorStatus?.tls} />
+        <MonitorRedirects monitorStatus={monitorStatus} />
       </EuiDescriptionList>
     </>
   );
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
index 01384ec145236..669033fc6524a 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
@@ -32,7 +32,7 @@ describe('getLatestMonitor', () => {
           },
         },
         size: 1,
-        _source: ['url', 'monitor', 'observer', '@timestamp', 'tls.*'],
+        _source: ['url', 'monitor', 'observer', '@timestamp', 'tls.*', 'http'],
         sort: {
           '@timestamp': { order: 'desc' },
         },
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
index a58208fc2bb96..3b4aeaf92c508 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
@@ -45,7 +45,7 @@ export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Pi
         },
       },
       size: 1,
-      _source: ['url', 'monitor', 'observer', '@timestamp', 'tls.*'],
+      _source: ['url', 'monitor', 'observer', '@timestamp', 'tls.*', 'http'],
       sort: {
         '@timestamp': { order: 'desc' },
       },
diff --git a/x-pack/test/api_integration/apis/lens/telemetry.ts b/x-pack/test/api_integration/apis/lens/telemetry.ts
index 2c05b02cf470f..0ae4753cd2967 100644
--- a/x-pack/test/api_integration/apis/lens/telemetry.ts
+++ b/x-pack/test/api_integration/apis/lens/telemetry.ts
@@ -191,8 +191,9 @@ export default ({ getService }: FtrProviderContext) => {
       expect(results.saved_overall).to.eql({
         lnsMetric: 1,
         bar_stacked: 1,
+        lnsPie: 1,
       });
-      expect(results.saved_overall_total).to.eql(2);
+      expect(results.saved_overall_total).to.eql(3);
 
       await esArchiver.unload('lens/basic');
     });
diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json
index 9a33be807670e..f2927af172062 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json
+++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json
@@ -7,6 +7,32 @@
     "hostname": "avc-x1x"
   },
   "@timestamp": "2019-09-11T03:40:34.371Z",
+  "http": {
+    "rtt": {
+      "response_header": {
+        "us": 262
+      },
+      "total": {
+        "us": 20331
+      },
+      "write_request": {
+        "us": 82
+      },
+      "content": {
+        "us": 57
+      },
+      "validate": {
+        "us": 319
+      }
+    },
+    "response": {
+      "status_code": 200,
+      "body": {
+        "bytes": 3,
+        "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf"
+      }
+    }
+  },
   "monitor": {
     "duration": {
       "us": 24627
@@ -28,4 +54,4 @@
   },
   "docId": "h5toHm0B0I9WX_CznN_V",
   "timestamp": "2019-09-11T03:40:34.371Z"
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/functional/apps/dashboard/_async_dashboard.ts b/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
index cc30a7a7e640f..8851c83dea1ff 100644
--- a/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
+++ b/x-pack/test/functional/apps/dashboard/_async_dashboard.ts
@@ -27,8 +27,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     'timePicker',
   ]);
 
-  // Flakky: https://github.com/elastic/kibana/issues/65949
-  describe.skip('sample data dashboard', function describeIndexTests() {
+  describe('sample data dashboard', function describeIndexTests() {
     before(async () => {
       await PageObjects.common.sleep(5000);
       await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
@@ -36,8 +35,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.home.addSampleDataSet('flights');
-      const isInstalled = await PageObjects.home.isSampleDataSetInstalled('flights');
-      expect(isInstalled).to.be(true);
+      await retry.tryForTime(10000, async () => {
+        const isInstalled = await PageObjects.home.isSampleDataSetInstalled('flights');
+        expect(isInstalled).to.be(true);
+      });
+
       // add the range of the sample data so we can pick it in the quick pick list
       const SAMPLE_DATA_RANGE = `[
         {
diff --git a/x-pack/test/functional/apps/dashboard/drilldowns/index.ts b/x-pack/test/functional/apps/dashboard/drilldowns/index.ts
index 4cdb33c06947f..ff604b18e1d51 100644
--- a/x-pack/test/functional/apps/dashboard/drilldowns/index.ts
+++ b/x-pack/test/functional/apps/dashboard/drilldowns/index.ts
@@ -24,6 +24,9 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./dashboard_drilldowns'));
     loadTestFile(require.resolve('./explore_data_panel_action'));
-    loadTestFile(require.resolve('./explore_data_chart_action'));
+
+    // Disabled for now as it requires xpack.discoverEnhanced.actions.exploreDataInChart.enabled
+    // setting set in kibana.yml to work. Once that is enabled by default, we can re-enable this test suite.
+    // loadTestFile(require.resolve('./explore_data_chart_action'));
   });
 }
diff --git a/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js b/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js
index 62e07a08d1762..bd35374643e9b 100644
--- a/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js
+++ b/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js
@@ -27,7 +27,7 @@ export default function ({ getPageObjects, getService }) {
       await PageObjects.dashboard.gotoDashboardLandingPage();
     });
 
-    async function createAndAddLens(title) {
+    async function createAndAddLens(title, saveAsNew = false, redirectToOrigin = true) {
       log.debug(`createAndAddLens(${title})`);
       const inViewMode = await PageObjects.dashboard.getIsInViewMode();
       if (inViewMode) {
@@ -52,7 +52,7 @@ export default function ({ getPageObjects, getService }) {
         operation: 'terms',
         field: 'ip',
       });
-      await PageObjects.lens.save(title, false, true);
+      await PageObjects.lens.save(title, saveAsNew, redirectToOrigin);
     }
 
     it('adds Lens visualization to empty dashboard', async () => {
@@ -100,6 +100,8 @@ export default function ({ getPageObjects, getService }) {
     });
 
     it('loses originatingApp connection after save as when redirectToOrigin is false', async () => {
+      await PageObjects.dashboard.saveDashboard('empty dashboard test');
+      await PageObjects.dashboard.switchToEditMode();
       const newTitle = 'wowee, my title just got cooler again';
       await PageObjects.dashboard.waitForRenderComplete();
       await dashboardPanelActions.openContextMenu();
@@ -108,5 +110,17 @@ export default function ({ getPageObjects, getService }) {
       await PageObjects.lens.notLinkedToOriginatingApp();
       await PageObjects.common.navigateToApp('dashboard');
     });
+
+    it('loses originatingApp connection after first save when redirectToOrigin is false', async () => {
+      const title = 'non-dashboard Test Lens';
+      await PageObjects.dashboard.loadSavedDashboard('empty dashboard test');
+      await PageObjects.dashboard.switchToEditMode();
+      await testSubjects.exists('dashboardAddNewPanelButton');
+      await testSubjects.click('dashboardAddNewPanelButton');
+      await dashboardVisualizations.ensureNewVisualizationDialogIsShowing();
+      await createAndAddLens(title, false, false);
+      await PageObjects.lens.notLinkedToOriginatingApp();
+      await PageObjects.common.navigateToApp('dashboard');
+    });
   });
 }
diff --git a/x-pack/test/functional/apps/lens/dashboard.ts b/x-pack/test/functional/apps/lens/dashboard.ts
new file mode 100644
index 0000000000000..ccf2f88a9d0ed
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/dashboard.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['header', 'common', 'dashboard', 'timePicker', 'lens']);
+
+  const find = getService('find');
+  const dashboardAddPanel = getService('dashboardAddPanel');
+  const elasticChart = getService('elasticChart');
+  const browser = getService('browser');
+  const retry = getService('retry');
+  const testSubjects = getService('testSubjects');
+  const filterBar = getService('filterBar');
+
+  async function clickInChart(x: number, y: number) {
+    const el = await elasticChart.getCanvas();
+    await browser.getActions().move({ x, y, origin: el._webElement }).click().perform();
+  }
+
+  describe('lens dashboard tests', () => {
+    it('metric should be embeddable', async () => {
+      await PageObjects.common.navigateToApp('dashboard');
+      await PageObjects.dashboard.clickNewDashboard();
+      await dashboardAddPanel.clickOpenAddPanel();
+      await dashboardAddPanel.filterEmbeddableNames('Artistpreviouslyknownaslens');
+      await find.clickByButtonText('Artistpreviouslyknownaslens');
+      await dashboardAddPanel.closeAddPanel();
+      await PageObjects.lens.goToTimeRange();
+      await PageObjects.lens.assertMetric('Maximum of bytes', '19,986');
+    });
+
+    it('should be able to add filters/timerange by clicking in XYChart', async () => {
+      await PageObjects.common.navigateToApp('dashboard');
+      await PageObjects.dashboard.clickNewDashboard();
+      await dashboardAddPanel.clickOpenAddPanel();
+      await dashboardAddPanel.filterEmbeddableNames('lnsXYvis');
+      await find.clickByButtonText('lnsXYvis');
+      await dashboardAddPanel.closeAddPanel();
+      await PageObjects.lens.goToTimeRange();
+      await clickInChart(5, 5); // hardcoded position of bar
+
+      await retry.try(async () => {
+        await testSubjects.click('applyFiltersPopoverButton');
+        await testSubjects.missingOrFail('applyFiltersPopoverButton');
+      });
+
+      await PageObjects.lens.assertExactText(
+        '[data-test-subj="embeddablePanelHeading-lnsXYvis"]',
+        'lnsXYvis'
+      );
+      const time = await PageObjects.timePicker.getTimeConfig();
+      expect(time.start).to.equal('Sep 21, 2015 @ 09:00:00.000');
+      expect(time.end).to.equal('Sep 21, 2015 @ 12:00:00.000');
+      const hasIpFilter = await filterBar.hasFilter('ip', '97.220.3.248');
+      expect(hasIpFilter).to.be(true);
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/lens/index.ts b/x-pack/test/functional/apps/lens/index.ts
index b17b7d856841c..f2dcf28c01743 100644
--- a/x-pack/test/functional/apps/lens/index.ts
+++ b/x-pack/test/functional/apps/lens/index.ts
@@ -28,6 +28,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       this.tags(['ciGroup4', 'skipFirefox']);
 
       loadTestFile(require.resolve('./smokescreen'));
+      loadTestFile(require.resolve('./dashboard'));
       loadTestFile(require.resolve('./persistent_context'));
       loadTestFile(require.resolve('./lens_reporting'));
     });
diff --git a/x-pack/test/functional/apps/lens/smokescreen.ts b/x-pack/test/functional/apps/lens/smokescreen.ts
index 1e93636161067..77b9aa1e25edd 100644
--- a/x-pack/test/functional/apps/lens/smokescreen.ts
+++ b/x-pack/test/functional/apps/lens/smokescreen.ts
@@ -8,115 +8,20 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
-  const PageObjects = getPageObjects([
-    'header',
-    'common',
-    'visualize',
-    'dashboard',
-    'header',
-    'timePicker',
-    'lens',
-  ]);
+  const PageObjects = getPageObjects(['visualize', 'lens']);
   const find = getService('find');
-  const dashboardAddPanel = getService('dashboardAddPanel');
-  const elasticChart = getService('elasticChart');
-  const browser = getService('browser');
-  const retry = getService('retry');
-  const testSubjects = getService('testSubjects');
-  const filterBar = getService('filterBar');
   const listingTable = getService('listingTable');
 
-  async function assertExpectedMetric(metricCount: string = '19,986') {
-    await PageObjects.lens.assertExactText(
-      '[data-test-subj="lns_metric_title"]',
-      'Maximum of bytes'
-    );
-    await PageObjects.lens.assertExactText('[data-test-subj="lns_metric_value"]', metricCount);
-  }
-
-  async function assertExpectedTable() {
-    await PageObjects.lens.assertExactText(
-      '[data-test-subj="lnsDataTable"] thead .euiTableCellContent__text',
-      'Maximum of bytes'
-    );
-    await PageObjects.lens.assertExactText(
-      '[data-test-subj="lnsDataTable"] [data-test-subj="lnsDataTableCellValue"]',
-      '19,986'
-    );
-  }
-
-  async function assertExpectedChart() {
-    await PageObjects.lens.assertExactText(
-      '[data-test-subj="embeddablePanelHeading-lnsXYvis"]',
-      'lnsXYvis'
-    );
-  }
-
-  async function assertExpectedTimerange() {
-    const time = await PageObjects.timePicker.getTimeConfig();
-    expect(time.start).to.equal('Sep 21, 2015 @ 09:00:00.000');
-    expect(time.end).to.equal('Sep 21, 2015 @ 12:00:00.000');
-  }
-
-  async function clickOnBarHistogram() {
-    const el = await elasticChart.getCanvas();
-    await browser.getActions().move({ x: 5, y: 5, origin: el._webElement }).click().perform();
-  }
-
   describe('lens smokescreen tests', () => {
     it('should allow editing saved visualizations', async () => {
       await PageObjects.visualize.gotoVisualizationLandingPage();
       await listingTable.searchForItemWithName('Artistpreviouslyknownaslens');
       await PageObjects.lens.clickVisualizeListItemTitle('Artistpreviouslyknownaslens');
       await PageObjects.lens.goToTimeRange();
-      await assertExpectedMetric();
-    });
-
-    it('metric should be embeddable in dashboards', async () => {
-      await PageObjects.common.navigateToApp('dashboard');
-      await PageObjects.dashboard.clickNewDashboard();
-      await dashboardAddPanel.clickOpenAddPanel();
-      await dashboardAddPanel.filterEmbeddableNames('Artistpreviouslyknownaslens');
-      await find.clickByButtonText('Artistpreviouslyknownaslens');
-      await dashboardAddPanel.closeAddPanel();
-      await PageObjects.lens.goToTimeRange();
-      await assertExpectedMetric();
+      await PageObjects.lens.assertMetric('Maximum of bytes', '19,986');
     });
 
-    it('click on the bar in XYChart adds proper filters/timerange in dashboard', async () => {
-      await PageObjects.common.navigateToApp('dashboard');
-      await PageObjects.dashboard.clickNewDashboard();
-      await dashboardAddPanel.clickOpenAddPanel();
-      await dashboardAddPanel.filterEmbeddableNames('lnsXYvis');
-      await find.clickByButtonText('lnsXYvis');
-      await dashboardAddPanel.closeAddPanel();
-      await PageObjects.lens.goToTimeRange();
-      await clickOnBarHistogram();
-
-      await retry.try(async () => {
-        await testSubjects.click('applyFiltersPopoverButton');
-        await testSubjects.missingOrFail('applyFiltersPopoverButton');
-      });
-
-      await assertExpectedChart();
-      await assertExpectedTimerange();
-      const hasIpFilter = await filterBar.hasFilter('ip', '97.220.3.248');
-      expect(hasIpFilter).to.be(true);
-    });
-
-    it('should allow seamless transition to and from table view', async () => {
-      await PageObjects.visualize.gotoVisualizationLandingPage();
-      await listingTable.searchForItemWithName('Artistpreviouslyknownaslens');
-      await PageObjects.lens.clickVisualizeListItemTitle('Artistpreviouslyknownaslens');
-      await PageObjects.lens.goToTimeRange();
-      await assertExpectedMetric();
-      await PageObjects.lens.switchToVisualization('lnsDatatable');
-      await assertExpectedTable();
-      await PageObjects.lens.switchToVisualization('lnsMetric');
-      await assertExpectedMetric();
-    });
-
-    it('should allow creation of lens visualizations', async () => {
+    it('should allow creation of lens xy chart', async () => {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickVisType('lens');
       await PageObjects.lens.goToTimeRange();
@@ -165,6 +70,19 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(await find.allByCssSelector('.echLegendItem')).to.have.length(3);
     });
 
+    it('should allow seamless transition to and from table view', async () => {
+      await PageObjects.visualize.gotoVisualizationLandingPage();
+      await listingTable.searchForItemWithName('Artistpreviouslyknownaslens');
+      await PageObjects.lens.clickVisualizeListItemTitle('Artistpreviouslyknownaslens');
+      await PageObjects.lens.goToTimeRange();
+      await PageObjects.lens.assertMetric('Maximum of bytes', '19,986');
+      await PageObjects.lens.switchToVisualization('lnsDatatable');
+      expect(await PageObjects.lens.getDatatableHeaderText()).to.eql('Maximum of bytes');
+      expect(await PageObjects.lens.getDatatableCellText(0, 0)).to.eql('19,986');
+      await PageObjects.lens.switchToVisualization('lnsMetric');
+      await PageObjects.lens.assertMetric('Maximum of bytes', '19,986');
+    });
+
     it('should switch from a multi-layer stacked bar to a multi-layer line chart', async () => {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickVisType('lens');
@@ -190,5 +108,94 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       expect(await PageObjects.lens.getLayerCount()).to.eql(2);
     });
+
+    it('should allow transition from line chart to donut chart and to bar chart', async () => {
+      await PageObjects.visualize.gotoVisualizationLandingPage();
+      await listingTable.searchForItemWithName('lnsXYvis');
+      await PageObjects.lens.clickVisualizeListItemTitle('lnsXYvis');
+      await PageObjects.lens.goToTimeRange();
+      expect(await PageObjects.lens.hasChartSwitchWarning('donut')).to.eql(true);
+      await PageObjects.lens.switchToVisualization('donut');
+
+      expect(await PageObjects.lens.getTitle()).to.eql('lnsXYvis');
+      expect(await PageObjects.lens.getDimensionTriggerText('lnsPie_sliceByDimensionPanel')).to.eql(
+        'Top values of ip'
+      );
+      expect(await PageObjects.lens.getDimensionTriggerText('lnsPie_sizeByDimensionPanel')).to.eql(
+        'Average of bytes'
+      );
+
+      expect(await PageObjects.lens.hasChartSwitchWarning('bar')).to.eql(false);
+      await PageObjects.lens.switchToVisualization('bar');
+      expect(await PageObjects.lens.getTitle()).to.eql('lnsXYvis');
+      expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_xDimensionPanel')).to.eql(
+        'Top values of ip'
+      );
+      expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
+        'Average of bytes'
+      );
+    });
+
+    it('should allow seamless transition from bar chart to line chart using layer chart switch', async () => {
+      await PageObjects.visualize.gotoVisualizationLandingPage();
+      await listingTable.searchForItemWithName('lnsXYvis');
+      await PageObjects.lens.clickVisualizeListItemTitle('lnsXYvis');
+      await PageObjects.lens.goToTimeRange();
+      await PageObjects.lens.switchLayerSeriesType('line');
+      expect(await PageObjects.lens.getTitle()).to.eql('lnsXYvis');
+      expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_xDimensionPanel')).to.eql(
+        '@timestamp'
+      );
+      expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
+        'Average of bytes'
+      );
+      expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_splitDimensionPanel')).to.eql(
+        'Top values of ip'
+      );
+    });
+
+    it('should allow seamless transition from pie chart to treemap chart', async () => {
+      await PageObjects.visualize.gotoVisualizationLandingPage();
+      await listingTable.searchForItemWithName('lnsPieVis');
+      await PageObjects.lens.clickVisualizeListItemTitle('lnsPieVis');
+      await PageObjects.lens.goToTimeRange();
+      expect(await PageObjects.lens.hasChartSwitchWarning('treemap')).to.eql(false);
+      await PageObjects.lens.switchToVisualization('treemap');
+      expect(
+        await PageObjects.lens.getDimensionTriggerText('lnsPie_groupByDimensionPanel', 0)
+      ).to.eql('Top values of geo.dest');
+      expect(
+        await PageObjects.lens.getDimensionTriggerText('lnsPie_groupByDimensionPanel', 1)
+      ).to.eql('Top values of geo.src');
+      expect(await PageObjects.lens.getDimensionTriggerText('lnsPie_sizeByDimensionPanel')).to.eql(
+        'Average of bytes'
+      );
+    });
+
+    it('should allow creating a pie chart and switching to datatable', async () => {
+      await PageObjects.visualize.navigateToNewVisualization();
+      await PageObjects.visualize.clickVisType('lens');
+      await PageObjects.lens.goToTimeRange();
+      await PageObjects.lens.switchToVisualization('pie');
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsPie_sliceByDimensionPanel > lns-empty-dimension',
+        operation: 'date_histogram',
+        field: '@timestamp',
+      });
+
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsPie_sizeByDimensionPanel > lns-empty-dimension',
+        operation: 'avg',
+        field: 'bytes',
+      });
+
+      expect(await PageObjects.lens.hasChartSwitchWarning('lnsDatatable')).to.eql(false);
+      await PageObjects.lens.switchToVisualization('lnsDatatable');
+
+      expect(await PageObjects.lens.getDatatableHeaderText()).to.eql('@timestamp per 3 hours');
+      expect(await PageObjects.lens.getDatatableCellText(0, 0)).to.eql('2015-09-20 00:00');
+      expect(await PageObjects.lens.getDatatableHeaderText(1)).to.eql('Average of bytes');
+      expect(await PageObjects.lens.getDatatableCellText(0, 1)).to.eql('6,011.351');
+    });
   });
 }
diff --git a/x-pack/test/functional/apps/ml/pages.ts b/x-pack/test/functional/apps/ml/pages.ts
index e2c80c8dab558..3691e6b1afcdc 100644
--- a/x-pack/test/functional/apps/ml/pages.ts
+++ b/x-pack/test/functional/apps/ml/pages.ts
@@ -53,5 +53,17 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.dataVisualizer.assertDataVisualizerImportDataCardExists();
       await ml.dataVisualizer.assertDataVisualizerIndexDataCardExists();
     });
+
+    it('should load the stack management with the ML menu item being present', async () => {
+      await ml.navigation.navigateToStackManagement();
+    });
+
+    it('should load the jobs list page in stack management', async () => {
+      await ml.navigation.navigateToStackManagementJobsListPage();
+    });
+
+    it('should load the analytics jobs list page in stack management', async () => {
+      await ml.navigation.navigateToStackManagementJobsListPageAnalyticsTab();
+    });
   });
 }
diff --git a/x-pack/test/functional/apps/uptime/certificates.ts b/x-pack/test/functional/apps/uptime/certificates.ts
index 7e9a2cd85935e..a27317dccee8d 100644
--- a/x-pack/test/functional/apps/uptime/certificates.ts
+++ b/x-pack/test/functional/apps/uptime/certificates.ts
@@ -25,7 +25,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     });
 
     it('can navigate to cert page', async () => {
-      await uptimeService.cert.isUptimeDataMissing();
+      await uptimeService.common.waitUntilDataIsLoaded();
       await uptimeService.cert.hasViewCertButton();
       await uptimeService.navigation.goToCertificates();
     });
diff --git a/x-pack/test/functional/apps/uptime/index.ts b/x-pack/test/functional/apps/uptime/index.ts
index 6b2b61cba2b64..261f685eeb9cc 100644
--- a/x-pack/test/functional/apps/uptime/index.ts
+++ b/x-pack/test/functional/apps/uptime/index.ts
@@ -56,6 +56,10 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
       loadTestFile(require.resolve('./certificates'));
     });
 
+    describe('with generated data but no data reset', () => {
+      loadTestFile(require.resolve('./ping_redirects'));
+    });
+
     describe('with real-world data', () => {
       before(async () => {
         await esArchiver.unload(ARCHIVE);
diff --git a/x-pack/test/functional/apps/uptime/locations.ts b/x-pack/test/functional/apps/uptime/locations.ts
index 8aefca6a70195..6bfa19c6ef578 100644
--- a/x-pack/test/functional/apps/uptime/locations.ts
+++ b/x-pack/test/functional/apps/uptime/locations.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import moment from 'moment';
 import { makeChecksWithStatus } from '../../../api_integration/apis/uptime/rest/helper/make_checks';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
@@ -40,8 +39,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   };
 
   describe('Observer location', () => {
-    const start = moment().subtract('15', 'm').toISOString();
-    const end = moment().toISOString();
+    const start = '~ 15 minutes ago';
+    const end = 'now';
 
     before(async () => {
       await addMonitorWithNoLocation();
diff --git a/x-pack/test/functional/apps/uptime/ping_redirects.ts b/x-pack/test/functional/apps/uptime/ping_redirects.ts
new file mode 100644
index 0000000000000..b87e8c1748c82
--- /dev/null
+++ b/x-pack/test/functional/apps/uptime/ping_redirects.ts
@@ -0,0 +1,74 @@
+/*
+ * 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 { makeChecksWithStatus } from '../../../api_integration/apis/uptime/rest/helper/make_checks';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
+  const { uptime: uptimePage, header } = getPageObjects(['uptime', 'header']);
+  const uptime = getService('uptime');
+  const esArchiver = getService('esArchiver');
+
+  const archive = 'uptime/blank';
+
+  const monitor = () => uptime.monitor;
+
+  describe('Ping redirects', () => {
+    const start = '~ 15 minutes ago';
+    const end = 'now';
+
+    const MONITOR_ID = 'redirect-testing-id';
+
+    before(async () => {
+      await esArchiver.loadIfNeeded(archive);
+    });
+
+    after('unload', async () => {
+      await esArchiver.unload(archive);
+    });
+
+    beforeEach(async () => {
+      await makeChecksWithStatus(
+        getService('legacyEs'),
+        MONITOR_ID,
+        5,
+        2,
+        10000,
+        {
+          http: {
+            rtt: { total: { us: 157784 } },
+            response: {
+              status_code: 200,
+              redirects: ['http://localhost:3000/first', 'https://www.washingtonpost.com/'],
+              body: {
+                bytes: 642102,
+                hash: '597a8cfb33ff8e09bff16283306553c3895282aaf5386e1843d466d44979e28a',
+              },
+            },
+          },
+        },
+        'up'
+      );
+      await delay(1000);
+    });
+
+    it('loads and goes to details page', async () => {
+      await uptime.navigation.goToUptime();
+      await uptimePage.loadDataAndGoToMonitorPage(start, end, MONITOR_ID);
+    });
+
+    it('display redirect info in detail panel', async () => {
+      await header.waitUntilLoadingHasFinished();
+      await monitor().hasRedirectInfo();
+    });
+
+    it('displays redirects in ping list expand row', async () => {
+      await monitor().hasRedirectInfoInPingList();
+    });
+  });
+};
diff --git a/x-pack/test/functional/es_archives/fleet/agents/mappings.json b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
index 23b404a53703f..12d3be3e2a971 100644
--- a/x-pack/test/functional/es_archives/fleet/agents/mappings.json
+++ b/x-pack/test/functional/es_archives/fleet/agents/mappings.json
@@ -1870,9 +1870,9 @@
                     "config": {
                       "type": "flattened"
                     },
-                    "dataset": {
+                    "data_stream": {
                       "properties": {
-                        "name": {
+                        "dataset": {
                           "type": "keyword"
                         },
                         "type": {
diff --git a/x-pack/test/functional/es_archives/lens/basic/data.json.gz b/x-pack/test/functional/es_archives/lens/basic/data.json.gz
index 4ed7c29f7391e..ddf4a27289dff 100644
Binary files a/x-pack/test/functional/es_archives/lens/basic/data.json.gz and b/x-pack/test/functional/es_archives/lens/basic/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/lists/mappings.json b/x-pack/test/functional/es_archives/lists/mappings.json
index 3b4d915cc1ca5..ba4e1b276d45e 100644
--- a/x-pack/test/functional/es_archives/lists/mappings.json
+++ b/x-pack/test/functional/es_archives/lists/mappings.json
@@ -1310,9 +1310,9 @@
                     "config": {
                       "type": "flattened"
                     },
-                    "dataset": {
+                    "data_stream": {
                       "properties": {
-                        "name": {
+                        "dataset": {
                           "type": "keyword"
                         },
                         "type": {
diff --git a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
index 3519103d06814..2380154277e55 100644
--- a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
@@ -1246,9 +1246,9 @@
                     "config": {
                       "type": "flattened"
                     },
-                    "dataset": {
+                    "data_stream": {
                       "properties": {
-                        "name": {
+                        "dataset": {
                           "type": "keyword"
                         },
                         "type": {
diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index 79548db0e2630..bed0e3a159e23 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -176,9 +176,26 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
      */
     async hasChartSwitchWarning(subVisualizationId: string) {
       await this.openChartSwitchPopover();
-
       const element = await testSubjects.find(`lnsChartSwitchPopover_${subVisualizationId}`);
-      return await testSubjects.descendantExists('euiKeyPadMenuItem__betaBadgeWrapper', element);
+      return await find.descendantExistsByCssSelector(
+        '.euiKeyPadMenuItem__betaBadgeWrapper',
+        element
+      );
+    },
+
+    /**
+     * Uses the Lens layer switcher to switch seriesType for xy charts.
+     *
+     * @param subVisualizationId - the ID of the sub-visualization to switch to, such as
+     * line,
+     */
+    async switchLayerSeriesType(seriesType: string) {
+      await retry.try(async () => {
+        await testSubjects.click('lns_layer_settings');
+        await testSubjects.exists(`lnsXY_seriesType-${seriesType}`);
+      });
+
+      return await testSubjects.click(`lnsXY_seriesType-${seriesType}`);
     },
 
     /**
@@ -205,5 +222,60 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       await PageObjects.header.waitUntilLoadingHasFinished();
       await testSubjects.missingOrFail('lnsApp_saveAndReturnButton');
     },
+    /**
+     * Gets label of dimension trigger in dimension panel
+     *
+     * @param dimension - the selector of the dimension
+     */
+    async getDimensionTriggerText(dimension: string, index = 0) {
+      const dimensionElements = await testSubjects.findAll(dimension);
+      const trigger = await testSubjects.findDescendant(
+        'lns-dimensionTrigger',
+        dimensionElements[index]
+      );
+      return await trigger.getVisibleText();
+    },
+
+    /**
+     * Gets text of the specified datatable header cell
+     *
+     * @param index - index of th element in datatable
+     */
+    async getDatatableHeaderText(index = 0) {
+      return find
+        .byCssSelector(
+          `[data-test-subj="lnsDataTable"] thead th:nth-child(${
+            index + 1
+          }) .euiTableCellContent__text`
+        )
+        .then((el) => el.getVisibleText());
+    },
+
+    /**
+     * Gets text of the specified datatable cell
+     *
+     * @param rowIndex - index of row of the cell
+     * @param colIndex - index of column of the cell
+     */
+    async getDatatableCellText(rowIndex = 0, colIndex = 0) {
+      return find
+        .byCssSelector(
+          `[data-test-subj="lnsDataTable"] tr:nth-child(${rowIndex + 1}) td:nth-child(${
+            colIndex + 1
+          })`
+        )
+        .then((el) => el.getVisibleText());
+    },
+
+    /**
+     * Asserts that metric has expected title and count
+     *
+     * @param title - expected title
+     * @param count - expected count of metric
+     */
+    async assertMetric(title: string, count: string) {
+      await this.assertExactText('[data-test-subj="lns_metric_title"]', title);
+      await this.assertExactText('[data-test-subj="lns_metric_value"]', count);
+    },
   });
 }
diff --git a/x-pack/test/functional/page_objects/uptime_page.ts b/x-pack/test/functional/page_objects/uptime_page.ts
index 074a2d598be8a..8102d8b95680e 100644
--- a/x-pack/test/functional/page_objects/uptime_page.ts
+++ b/x-pack/test/functional/page_objects/uptime_page.ts
@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export function UptimePageProvider({ getPageObjects, getService }: FtrProviderContext) {
-  const pageObjects = getPageObjects(['common', 'timePicker']);
+  const pageObjects = getPageObjects(['common', 'timePicker', 'header']);
   const { common: commonService, monitor, navigation } = getService('uptime');
   const retry = getService('retry');
 
@@ -42,6 +42,7 @@ export function UptimePageProvider({ getPageObjects, getService }: FtrProviderCo
     }
 
     public async loadDataAndGoToMonitorPage(dateStart: string, dateEnd: string, monitorId: string) {
+      await pageObjects.header.waitUntilLoadingHasFinished();
       await this.setDateRange(dateStart, dateEnd);
       await navigation.goToMonitor(monitorId);
     }
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
index a49febfe68f61..d8df2fb869ed7 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts
@@ -46,14 +46,16 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
     },
 
     async assertJobTypeSelection(expectedSelection: string) {
-      const actualSelection = await testSubjects.getAttribute(
-        'mlAnalyticsCreateJobWizardJobTypeSelect',
-        'value'
-      );
-      expect(actualSelection).to.eql(
-        expectedSelection,
-        `Job type selection should be '${expectedSelection}' (got '${actualSelection}')`
-      );
+      await retry.tryForTime(5000, async () => {
+        const actualSelection = await testSubjects.getAttribute(
+          'mlAnalyticsCreateJobWizardJobTypeSelect',
+          'value'
+        );
+        expect(actualSelection).to.eql(
+          expectedSelection,
+          `Job type selection should be '${expectedSelection}' (got '${actualSelection}')`
+        );
+      });
     },
 
     async selectJobType(jobType: string) {
diff --git a/x-pack/test/functional/services/ml/navigation.ts b/x-pack/test/functional/services/ml/navigation.ts
index 9b67a369f055f..f52197d4b2256 100644
--- a/x-pack/test/functional/services/ml/navigation.ts
+++ b/x-pack/test/functional/services/ml/navigation.ts
@@ -23,6 +23,13 @@ export function MachineLearningNavigationProvider({
       });
     },
 
+    async navigateToStackManagement() {
+      await retry.tryForTime(60 * 1000, async () => {
+        await PageObjects.common.navigateToApp('management');
+        await testSubjects.existOrFail('jobsListLink', { timeout: 2000 });
+      });
+    },
+
     async assertTabsExist(tabTypeSubject: string, areaSubjects: string[]) {
       await retry.tryForTime(10000, async () => {
         const allTabs = await testSubjects.findAll(`~${tabTypeSubject}`, 3);
@@ -76,5 +83,25 @@ export function MachineLearningNavigationProvider({
     async navigateToSettings() {
       await this.navigateToArea('~mlMainTab & ~settings', 'mlPageSettings');
     },
+
+    async navigateToStackManagementJobsListPage() {
+      // clicks the jobsListLink and loads the jobs list page
+      await testSubjects.click('jobsListLink');
+      await retry.tryForTime(60 * 1000, async () => {
+        // verify that the overall page is present
+        await testSubjects.existOrFail('mlPageStackManagementJobsList');
+        // verify that the default tab with the anomaly detection jobs list got loaded
+        await testSubjects.existOrFail('ml-jobs-list');
+      });
+    },
+
+    async navigateToStackManagementJobsListPageAnalyticsTab() {
+      // clicks the `Analytics` tab and loads the analytics list page
+      await testSubjects.click('mlStackManagementJobsListAnalyticsTab');
+      await retry.tryForTime(60 * 1000, async () => {
+        // verify that the empty prompt for analytics jobs list got loaded
+        await testSubjects.existOrFail('mlNoDataFrameAnalyticsFound');
+      });
+    },
   };
 }
diff --git a/x-pack/test/functional/services/uptime/certificates.ts b/x-pack/test/functional/services/uptime/certificates.ts
index 06de9be5af7e9..ab43604786282 100644
--- a/x-pack/test/functional/services/uptime/certificates.ts
+++ b/x-pack/test/functional/services/uptime/certificates.ts
@@ -24,14 +24,6 @@ export function UptimeCertProvider({ getService, getPageObjects }: FtrProviderCo
   };
 
   return {
-    async isUptimeDataMissing() {
-      return retry.tryForTime(60 * 1000, async () => {
-        if (await testSubjects.exists('data-missing', { timeout: 0 })) {
-          await refreshApp();
-        }
-        await testSubjects.missingOrFail('data-missing');
-      });
-    },
     async hasViewCertButton() {
       return retry.tryForTime(15000, async () => {
         await testSubjects.existOrFail('uptimeCertificatesLink');
diff --git a/x-pack/test/functional/services/uptime/common.ts b/x-pack/test/functional/services/uptime/common.ts
index 5f544b5e46010..13c9ead89d09d 100644
--- a/x-pack/test/functional/services/uptime/common.ts
+++ b/x-pack/test/functional/services/uptime/common.ts
@@ -91,5 +91,13 @@ export function UptimeCommonProvider({ getService }: FtrProviderContext) {
         5000
       );
     },
+    async waitUntilDataIsLoaded() {
+      return retry.tryForTime(60 * 1000, async () => {
+        if (await testSubjects.exists('data-missing')) {
+          await testSubjects.click('superDatePickerApplyTimeButton');
+        }
+        await testSubjects.missingOrFail('data-missing');
+      });
+    },
   };
 }
diff --git a/x-pack/test/functional/services/uptime/monitor.ts b/x-pack/test/functional/services/uptime/monitor.ts
index 593950fbb7619..c45454e731696 100644
--- a/x-pack/test/functional/services/uptime/monitor.ts
+++ b/x-pack/test/functional/services/uptime/monitor.ts
@@ -7,11 +7,13 @@
 import expect from '@kbn/expect/expect.js';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-export function UptimeMonitorProvider({ getService }: FtrProviderContext) {
+export function UptimeMonitorProvider({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
   const find = getService('find');
 
+  const PageObjects = getPageObjects(['header']);
+
   return {
     async locationMissingExists() {
       return await testSubjects.existOrFail('xpack.uptime.locationMap.locationMissing', {
@@ -56,5 +58,29 @@ export function UptimeMonitorProvider({ getService }: FtrProviderContext) {
     async toggleToMapView() {
       await testSubjects.click('uptimeMonitorToggleMapBtn');
     },
+    async hasRedirectInfo() {
+      return retry.tryForTime(30000, async () => {
+        await testSubjects.existOrFail('uptimeMonitorRedirectInfo');
+      });
+    },
+    async expandPingRow() {
+      return retry.tryForTime(
+        60 * 3000,
+        async () => {
+          await testSubjects.existOrFail('uptimePingListExpandBtn', { timeout: 5000 });
+          await testSubjects.click('uptimePingListExpandBtn');
+        },
+        async () => {
+          await testSubjects.click('superDatePickerApplyTimeButton');
+          await PageObjects.header.waitUntilLoadingHasFinished();
+        }
+      );
+    },
+    async hasRedirectInfoInPingList() {
+      await this.expandPingRow();
+      return retry.tryForTime(60 * 1000, async () => {
+        await testSubjects.existOrFail('uptimeMonitorPingListRedirectInfo');
+      });
+    },
   };
 }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/data_stream.ts b/x-pack/test/ingest_manager_api_integration/apis/epm/data_stream.ts
new file mode 100644
index 0000000000000..68a4812d4af40
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/epm/data_stream.ts
@@ -0,0 +1,130 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../../helpers';
+
+export default function (providerContext: FtrProviderContext) {
+  const { getService } = providerContext;
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const pkgName = 'datastreams';
+  const pkgVersion = '0.1.0';
+  const pkgUpdateVersion = '0.2.0';
+  const pkgKey = `${pkgName}-${pkgVersion}`;
+  const pkgUpdateKey = `${pkgName}-${pkgUpdateVersion}`;
+  const logsTemplateName = `logs-${pkgName}.test_logs`;
+  const metricsTemplateName = `metrics-${pkgName}.test_metrics`;
+
+  const uninstallPackage = async (pkg: string) => {
+    await supertest.delete(`/api/ingest_manager/epm/packages/${pkg}`).set('kbn-xsrf', 'xxxx');
+  };
+  const installPackage = async (pkg: string) => {
+    await supertest
+      .post(`/api/ingest_manager/epm/packages/${pkg}`)
+      .set('kbn-xsrf', 'xxxx')
+      .send({ force: true });
+  };
+
+  describe('datastreams', async () => {
+    skipIfNoDockerRegistry(providerContext);
+    before(async () => {
+      await installPackage(pkgKey);
+      await es.transport.request({
+        method: 'POST',
+        path: `/${logsTemplateName}-default/_doc`,
+        body: {
+          '@timestamp': '2015-01-01',
+          logs_test_name: 'test',
+          data_stream: {
+            dataset: `${pkgName}.test_logs`,
+            namespace: 'default',
+            type: 'logs',
+          },
+        },
+      });
+      await es.transport.request({
+        method: 'POST',
+        path: `/${metricsTemplateName}-default/_doc`,
+        body: {
+          '@timestamp': '2015-01-01',
+          logs_test_name: 'test',
+          data_stream: {
+            dataset: `${pkgName}.test_metrics`,
+            namespace: 'default',
+            type: 'metrics',
+          },
+        },
+      });
+    });
+    after(async () => {
+      await uninstallPackage(pkgUpdateKey);
+      await es.transport.request({
+        method: 'DELETE',
+        path: `/_data_stream/${logsTemplateName}-default`,
+      });
+      await es.transport.request({
+        method: 'DELETE',
+        path: `/_data_stream/${metricsTemplateName}-default`,
+      });
+    });
+    describe('get datastreams after data sent', async () => {
+      skipIfNoDockerRegistry(providerContext);
+      let resLogsDatastream: any;
+      let resMetricsDatastream: any;
+      before(async () => {
+        resLogsDatastream = await es.transport.request({
+          method: 'GET',
+          path: `/_data_stream/${logsTemplateName}-default`,
+        });
+        resMetricsDatastream = await es.transport.request({
+          method: 'GET',
+          path: `/_data_stream/${metricsTemplateName}-default`,
+        });
+      });
+      it('should list the logs datastream', async function () {
+        expect(resLogsDatastream.body.data_streams.length).equal(1);
+        expect(resLogsDatastream.body.data_streams[0].indices.length).equal(1);
+        expect(resLogsDatastream.body.data_streams[0].indices[0].index_name).equal(
+          `.ds-${logsTemplateName}-default-000001`
+        );
+      });
+      it('should list the metrics datastream', async function () {
+        expect(resMetricsDatastream.body.data_streams.length).equal(1);
+        expect(resMetricsDatastream.body.data_streams[0].indices.length).equal(1);
+        expect(resMetricsDatastream.body.data_streams[0].indices[0].index_name).equal(
+          `.ds-${metricsTemplateName}-default-000001`
+        );
+      });
+    });
+    describe('rollover datastream when mappings are not compatible', async () => {
+      skipIfNoDockerRegistry(providerContext);
+      let resLogsDatastream: any;
+      let resMetricsDatastream: any;
+      before(async () => {
+        await installPackage(pkgUpdateKey);
+        resLogsDatastream = await es.transport.request({
+          method: 'GET',
+          path: `/_data_stream/${logsTemplateName}-default`,
+        });
+        resMetricsDatastream = await es.transport.request({
+          method: 'GET',
+          path: `/_data_stream/${metricsTemplateName}-default`,
+        });
+      });
+      it('should have rolled over logs datastream', async function () {
+        expect(resLogsDatastream.body.data_streams[0].indices.length).equal(2);
+        expect(resLogsDatastream.body.data_streams[0].indices[1].index_name).equal(
+          `.ds-${logsTemplateName}-default-000002`
+        );
+      });
+      it('should have not rolled over metrics datastream', async function () {
+        expect(resMetricsDatastream.body.data_streams[0].indices.length).equal(1);
+      });
+    });
+  });
+}
diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/index.js b/x-pack/test/ingest_manager_api_integration/apis/epm/index.js
index 1582f72dd1cd8..0f32d2b4ae703 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/epm/index.js
+++ b/x-pack/test/ingest_manager_api_integration/apis/epm/index.js
@@ -13,5 +13,7 @@ export default function loadTests({ loadTestFile }) {
     loadTestFile(require.resolve('./install_overrides'));
     loadTestFile(require.resolve('./install_remove_assets'));
     loadTestFile(require.resolve('./install_update'));
+    loadTestFile(require.resolve('./update_assets'));
+    loadTestFile(require.resolve('./data_stream'));
   });
 }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/install_remove_assets.ts b/x-pack/test/ingest_manager_api_integration/apis/epm/install_remove_assets.ts
index 35058de0684b2..03d0b6abb4802 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/epm/install_remove_assets.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/epm/install_remove_assets.ts
@@ -23,7 +23,10 @@ export default function (providerContext: FtrProviderContext) {
     await supertest.delete(`/api/ingest_manager/epm/packages/${pkg}`).set('kbn-xsrf', 'xxxx');
   };
   const installPackage = async (pkg: string) => {
-    await supertest.post(`/api/ingest_manager/epm/packages/${pkg}`).set('kbn-xsrf', 'xxxx');
+    await supertest
+      .post(`/api/ingest_manager/epm/packages/${pkg}`)
+      .set('kbn-xsrf', 'xxxx')
+      .send({ force: true });
   };
 
   describe('installs and uninstalls all assets', async () => {
diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/list.ts b/x-pack/test/ingest_manager_api_integration/apis/epm/list.ts
index 0b6a37d77387e..bfe1954e46c9f 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/epm/list.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/epm/list.ts
@@ -29,7 +29,7 @@ export default function ({ getService }: FtrProviderContext) {
           return response.body;
         };
         const listResponse = await fetchPackageList();
-        expect(listResponse.response.length).to.be(8);
+        expect(listResponse.response.length).not.to.be(0);
       } else {
         warnAndSkipTest(this, log);
       }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/epm/update_assets.ts b/x-pack/test/ingest_manager_api_integration/apis/epm/update_assets.ts
new file mode 100644
index 0000000000000..59ad7a9744ae1
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/epm/update_assets.ts
@@ -0,0 +1,299 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../../helpers';
+
+export default function (providerContext: FtrProviderContext) {
+  const { getService } = providerContext;
+  const kibanaServer = getService('kibanaServer');
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const pkgName = 'all_assets';
+  const pkgVersion = '0.1.0';
+  const pkgUpdateVersion = '0.2.0';
+  const pkgKey = `${pkgName}-${pkgVersion}`;
+  const pkgUpdateKey = `${pkgName}-${pkgUpdateVersion}`;
+  const logsTemplateName = `logs-${pkgName}.test_logs`;
+  const logsTemplateName2 = `logs-${pkgName}.test_logs2`;
+  const metricsTemplateName = `metrics-${pkgName}.test_metrics`;
+
+  const uninstallPackage = async (pkg: string) => {
+    await supertest.delete(`/api/ingest_manager/epm/packages/${pkg}`).set('kbn-xsrf', 'xxxx');
+  };
+  const installPackage = async (pkg: string) => {
+    await supertest
+      .post(`/api/ingest_manager/epm/packages/${pkg}`)
+      .set('kbn-xsrf', 'xxxx')
+      .send({ force: true });
+  };
+
+  describe('updates all assets when updating a package to a different version', async () => {
+    skipIfNoDockerRegistry(providerContext);
+    before(async () => {
+      await installPackage(pkgKey);
+      await installPackage(pkgUpdateKey);
+    });
+    after(async () => {
+      await uninstallPackage(pkgUpdateKey);
+    });
+    it('should have updated the ILM policy', async function () {
+      const resPolicy = await es.transport.request({
+        method: 'GET',
+        path: `/_ilm/policy/all_assets`,
+      });
+      expect(resPolicy.body.all_assets.policy).eql({
+        phases: {
+          hot: {
+            min_age: '1ms',
+            actions: {
+              rollover: {
+                max_size: '50gb',
+                max_age: '31d',
+              },
+            },
+          },
+        },
+      });
+    });
+    it('should have updated the index templates', async function () {
+      const resLogsTemplate = await es.transport.request({
+        method: 'GET',
+        path: `/_index_template/${logsTemplateName}`,
+      });
+      expect(resLogsTemplate.statusCode).equal(200);
+      expect(
+        resLogsTemplate.body.index_templates[0].index_template.template.mappings.properties
+      ).eql({
+        '@timestamp': {
+          type: 'date',
+        },
+        logs_test_name: {
+          type: 'text',
+        },
+        new_field_name: {
+          ignore_above: 1024,
+          type: 'keyword',
+        },
+        data_stream: {
+          properties: {
+            dataset: {
+              type: 'constant_keyword',
+            },
+            namespace: {
+              type: 'constant_keyword',
+            },
+            type: {
+              type: 'constant_keyword',
+            },
+          },
+        },
+      });
+      const resMetricsTemplate = await es.transport.request({
+        method: 'GET',
+        path: `/_index_template/${metricsTemplateName}`,
+      });
+      expect(resMetricsTemplate.statusCode).equal(200);
+      expect(
+        resMetricsTemplate.body.index_templates[0].index_template.template.mappings.properties
+      ).eql({
+        '@timestamp': {
+          type: 'date',
+        },
+        metrics_test_name2: {
+          ignore_above: 1024,
+          type: 'keyword',
+        },
+        data_stream: {
+          properties: {
+            dataset: {
+              type: 'constant_keyword',
+            },
+            namespace: {
+              type: 'constant_keyword',
+            },
+            type: {
+              type: 'constant_keyword',
+            },
+          },
+        },
+      });
+    });
+    it('should have installed the new index template', async function () {
+      const resLogsTemplate = await es.transport.request({
+        method: 'GET',
+        path: `/_index_template/${logsTemplateName2}`,
+      });
+      expect(resLogsTemplate.statusCode).equal(200);
+      expect(
+        resLogsTemplate.body.index_templates[0].index_template.template.mappings.properties
+      ).eql({
+        '@timestamp': {
+          type: 'date',
+        },
+        test_logs2: {
+          ignore_above: 1024,
+          type: 'keyword',
+        },
+        data_stream: {
+          properties: {
+            dataset: {
+              type: 'constant_keyword',
+            },
+            namespace: {
+              type: 'constant_keyword',
+            },
+            type: {
+              type: 'constant_keyword',
+            },
+          },
+        },
+      });
+    });
+    it('should have installed the new versionized pipeline', async function () {
+      const res = await es.transport.request({
+        method: 'GET',
+        path: `/_ingest/pipeline/${logsTemplateName}-${pkgUpdateVersion}`,
+      });
+      expect(res.statusCode).equal(200);
+    });
+    it('should have removed the old versionized pipelines', async function () {
+      let res;
+      try {
+        res = await es.transport.request({
+          method: 'GET',
+          path: `/_ingest/pipeline/${logsTemplateName}-${pkgVersion}`,
+        });
+      } catch (err) {
+        res = err;
+      }
+      expect(res.statusCode).equal(404);
+    });
+    it('should have updated the template components', async function () {
+      const res = await es.transport.request({
+        method: 'GET',
+        path: `/_component_template/${logsTemplateName}-mappings`,
+      });
+      expect(res.statusCode).equal(200);
+      expect(res.body.component_templates[0].component_template.template.mappings).eql({
+        dynamic: true,
+        properties: { '@timestamp': { type: 'date' } },
+      });
+      const resSettings = await es.transport.request({
+        method: 'GET',
+        path: `/_component_template/${logsTemplateName}-settings`,
+      });
+      expect(res.statusCode).equal(200);
+      expect(resSettings.body.component_templates[0].component_template.template.settings).eql({
+        index: { lifecycle: { name: 'reference2' } },
+      });
+    });
+    it('should have updated the index patterns', async function () {
+      const resIndexPatternLogs = await kibanaServer.savedObjects.get({
+        type: 'index-pattern',
+        id: 'logs-*',
+      });
+      const fields = JSON.parse(resIndexPatternLogs.attributes.fields);
+      const updated = fields.filter((field: { name: string }) => field.name === 'new_field_name');
+      expect(!!updated.length).equal(true);
+      const resIndexPatternMetrics = await kibanaServer.savedObjects.get({
+        type: 'index-pattern',
+        id: 'metrics-*',
+      });
+      const fieldsMetrics = JSON.parse(resIndexPatternMetrics.attributes.fields);
+      const updatedMetrics = fieldsMetrics.filter(
+        (field: { name: string }) => field.name === 'metrics_test_name2'
+      );
+      expect(!!updatedMetrics.length).equal(true);
+    });
+    it('should have updated the kibana assets', async function () {
+      const resDashboard = await kibanaServer.savedObjects.get({
+        type: 'dashboard',
+        id: 'sample_dashboard',
+      });
+      expect(resDashboard.id).equal('sample_dashboard');
+      let resDashboard2;
+      try {
+        resDashboard2 = await kibanaServer.savedObjects.get({
+          type: 'dashboard',
+          id: 'sample_dashboard2',
+        });
+      } catch (err) {
+        resDashboard2 = err;
+      }
+      expect(resDashboard2.response.data.statusCode).equal(404);
+      const resVis = await kibanaServer.savedObjects.get({
+        type: 'visualization',
+        id: 'sample_visualization',
+      });
+      expect(resVis.attributes.description).equal('sample visualization 0.2.0');
+      let resSearch;
+      try {
+        resSearch = await kibanaServer.savedObjects.get({
+          type: 'search',
+          id: 'sample_search',
+        });
+      } catch (err) {
+        resSearch = err;
+      }
+      expect(resSearch.response.data.statusCode).equal(404);
+      const resSearch2 = await kibanaServer.savedObjects.get({
+        type: 'search',
+        id: 'sample_search2',
+      });
+      expect(resSearch2.id).equal('sample_search2');
+    });
+    it('should have updated the saved object', async function () {
+      const res = await kibanaServer.savedObjects.get({
+        type: 'epm-packages',
+        id: 'all_assets',
+      });
+      expect(res.attributes).eql({
+        installed_kibana: [
+          {
+            id: 'sample_dashboard',
+            type: 'dashboard',
+          },
+          {
+            id: 'sample_search2',
+            type: 'search',
+          },
+          {
+            id: 'sample_visualization',
+            type: 'visualization',
+          },
+        ],
+        installed_es: [
+          {
+            id: 'logs-all_assets.test_logs-0.2.0',
+            type: 'ingest_pipeline',
+          },
+          {
+            id: 'logs-all_assets.test_logs',
+            type: 'index_template',
+          },
+          {
+            id: 'logs-all_assets.test_logs2',
+            type: 'index_template',
+          },
+          {
+            id: 'metrics-all_assets.test_metrics',
+            type: 'index_template',
+          },
+        ],
+        es_index_patterns: {
+          test_logs: 'logs-all_assets.test_logs-*',
+          test_metrics: 'metrics-all_assets.test_metrics-*',
+        },
+        name: 'all_assets',
+        version: '0.2.0',
+        internal: false,
+        removable: true,
+      });
+    });
+  });
+}
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_logs/fields/ecs.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_logs/fields/ecs.yml
new file mode 100644
index 0000000000000..3d88fe5dfefb6
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_logs/fields/ecs.yml
@@ -0,0 +1,3 @@
+- name: logs_test_name
+  title: logs_test_title
+  type: keyword
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_metrics/fields/ecs.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_metrics/fields/ecs.yml
new file mode 100644
index 0000000000000..a30e3c7a87856
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_metrics/fields/ecs.yml
@@ -0,0 +1,3 @@
+- name: metrics_test_name
+  title: metrics_test_title
+  type: keyword
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/kibana/visualization/sample_visualization.json b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/kibana/visualization/sample_visualization.json
index e814b83bbf324..917479fd7d120 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/kibana/visualization/sample_visualization.json
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/kibana/visualization/sample_visualization.json
@@ -1,6 +1,6 @@
 {
   "attributes": {
-    "description": "sample visualization",
+    "description": "sample visualization update",
     "title": "sample vis title",
     "uiStateJSON": "{}",
     "version": 1,
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/elasticsearch/ilm_policy/all_assets.json b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/elasticsearch/ilm_policy/all_assets.json
new file mode 100644
index 0000000000000..d8bab8a75f680
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/elasticsearch/ilm_policy/all_assets.json
@@ -0,0 +1,15 @@
+{
+    "policy": {
+        "phases": {
+            "hot": {
+                "min_age": "1ms",
+                "actions": {
+                    "rollover": {
+                        "max_size": "50gb",
+                        "max_age": "31d"
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/elasticsearch/ingest_pipeline/default.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/elasticsearch/ingest_pipeline/default.yml
new file mode 100644
index 0000000000000..580db049d0d5d
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/elasticsearch/ingest_pipeline/default.yml
@@ -0,0 +1,7 @@
+---
+description: Pipeline for parsing test logs
+  plugins.
+processors:
+- set:
+    field: error.message
+    value: '{{ _ingest.on_failure_message }}'
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/fields/ecs.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/fields/ecs.yml
new file mode 100644
index 0000000000000..7df52cc11fd20
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/fields/ecs.yml
@@ -0,0 +1,6 @@
+- name: logs_test_name
+  title: logs_test_title
+  type: text
+- name: new_field_name
+  title: new_field_title
+  type: keyword
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/fields/fields.yml
new file mode 100644
index 0000000000000..6e003ed0ad147
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/fields/fields.yml
@@ -0,0 +1,16 @@
+- name: data_stream.type
+  type: constant_keyword
+  description: >
+    Data stream type.
+- name: data_stream.dataset
+  type: constant_keyword
+  description: >
+    Data stream dataset.
+- name: data_stream.namespace
+  type: constant_keyword
+  description: >
+    Data stream namespace.
+- name: '@timestamp'
+  type: date
+  description: >
+    Event timestamp.
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/manifest.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/manifest.yml
new file mode 100644
index 0000000000000..8a53f9e26e827
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs/manifest.yml
@@ -0,0 +1,9 @@
+title: Test Dataset
+
+type: logs
+
+elasticsearch:
+  index_template.mappings:
+    dynamic: true
+  index_template.settings:
+    index.lifecycle.name: reference2
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs2/fields/ecs.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs2/fields/ecs.yml
new file mode 100644
index 0000000000000..c5819deb1ee37
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs2/fields/ecs.yml
@@ -0,0 +1,3 @@
+- name: test_logs2
+  title: test_logs2
+  type: keyword
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs2/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs2/fields/fields.yml
new file mode 100644
index 0000000000000..6e003ed0ad147
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs2/fields/fields.yml
@@ -0,0 +1,16 @@
+- name: data_stream.type
+  type: constant_keyword
+  description: >
+    Data stream type.
+- name: data_stream.dataset
+  type: constant_keyword
+  description: >
+    Data stream dataset.
+- name: data_stream.namespace
+  type: constant_keyword
+  description: >
+    Data stream namespace.
+- name: '@timestamp'
+  type: date
+  description: >
+    Event timestamp.
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs2/manifest.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs2/manifest.yml
new file mode 100644
index 0000000000000..e12f454657ea2
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_logs2/manifest.yml
@@ -0,0 +1,3 @@
+title: Test Dataset
+
+type: logs
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_metrics/fields/ecs.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_metrics/fields/ecs.yml
new file mode 100644
index 0000000000000..9529c3a8eaf1a
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_metrics/fields/ecs.yml
@@ -0,0 +1,3 @@
+- name: metrics_test_name2
+  title: metrics_test_title2
+  type: keyword
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_metrics/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_metrics/fields/fields.yml
new file mode 100644
index 0000000000000..6e003ed0ad147
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_metrics/fields/fields.yml
@@ -0,0 +1,16 @@
+- name: data_stream.type
+  type: constant_keyword
+  description: >
+    Data stream type.
+- name: data_stream.dataset
+  type: constant_keyword
+  description: >
+    Data stream dataset.
+- name: data_stream.namespace
+  type: constant_keyword
+  description: >
+    Data stream namespace.
+- name: '@timestamp'
+  type: date
+  description: >
+    Event timestamp.
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_metrics/manifest.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_metrics/manifest.yml
new file mode 100644
index 0000000000000..6bc20442bd432
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/dataset/test_metrics/manifest.yml
@@ -0,0 +1,3 @@
+title: Test Dataset
+
+type: metrics
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/docs/README.md b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/docs/README.md
new file mode 100644
index 0000000000000..2617f1fcabe11
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/docs/README.md
@@ -0,0 +1,3 @@
+# Test package
+
+For testing that a package installs its elasticsearch assets when installed for the first time (not updating) and removing the package
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/img/logo_overrides_64_color.svg b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/img/logo_overrides_64_color.svg
new file mode 100644
index 0000000000000..b03007a76ffcc
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/img/logo_overrides_64_color.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F04E98" d="M29,32.0001 L15.935,9.4321 C13.48,5.1941 7,6.9351 7,11.8321 L7,52.1681 C7,57.0651 13.48,58.8061 15.935,54.5671 L29,32.0001 Z"/>
+    <path fill="#FA744E" d="M34.7773,32.0001 L33.3273,34.5051 L20.2613,57.0731 C19.8473,57.7871 19.3533,58.4271 18.8023,59.0001 L34.9273,59.0001 C38.7073,59.0001 42.2213,57.0601 44.2363,53.8611 L58.0003,32.0001 L34.7773,32.0001 Z"/>
+    <path fill="#343741" d="M44.2363,10.1392 C42.2213,6.9402 38.7073,5.0002 34.9273,5.0002 L18.8023,5.0002 C19.3533,5.5732 19.8473,6.2122 20.2613,6.9272 L33.3273,29.4942 L34.7773,32.0002 L58.0003,32.0002 L44.2363,10.1392 Z"/>
+  </g>
+</svg>
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/kibana/dashboard/sample_dashboard.json b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/kibana/dashboard/sample_dashboard.json
new file mode 100644
index 0000000000000..ef08d69324210
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/kibana/dashboard/sample_dashboard.json
@@ -0,0 +1,16 @@
+{
+  "attributes": {
+    "description": "Sample dashboard",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"highlightAll\":true,\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"version\":true}"
+    },
+    "optionsJSON": "{\"darkTheme\":false}",
+    "panelsJSON": "[{\"embeddableConfig\":{},\"gridData\":{\"h\":12,\"i\":\"1\",\"w\":24,\"x\":0,\"y\":0},\"panelIndex\":\"1\",\"panelRefName\":\"panel_0\",\"version\":\"7.3.0\"},{\"embeddableConfig\":{\"columns\":[\"kafka.log.class\",\"kafka.log.trace.class\",\"kafka.log.trace.full\"],\"sort\":[\"@timestamp\",\"desc\"]},\"gridData\":{\"h\":12,\"i\":\"2\",\"w\":24,\"x\":24,\"y\":0},\"panelIndex\":\"2\",\"panelRefName\":\"panel_1\",\"version\":\"7.3.0\"},{\"embeddableConfig\":{\"columns\":[\"log.level\",\"kafka.log.component\",\"message\"],\"sort\":[\"@timestamp\",\"desc\"]},\"gridData\":{\"h\":20,\"i\":\"3\",\"w\":48,\"x\":0,\"y\":20},\"panelIndex\":\"3\",\"panelRefName\":\"panel_2\",\"version\":\"7.3.0\"},{\"embeddableConfig\":{},\"gridData\":{\"h\":8,\"i\":\"4\",\"w\":48,\"x\":0,\"y\":12},\"panelIndex\":\"4\",\"panelRefName\":\"panel_3\",\"version\":\"7.3.0\"}]",
+    "timeRestore": false,
+    "title": "[Logs Sample] Overview ECS",
+    "version": 1
+  },
+  "id": "sample_dashboard",
+  "type": "dashboard"
+}
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/kibana/search/sample_search2.json b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/kibana/search/sample_search2.json
new file mode 100644
index 0000000000000..aa5cea19208a4
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/kibana/search/sample_search2.json
@@ -0,0 +1,24 @@
+{
+  "attributes": {
+    "columns": [
+      "log.level",
+      "kafka.log.component",
+      "message"
+    ],
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"disabled\":false,\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\",\"key\":\"dataset.name\",\"negate\":false,\"params\":{\"query\":\"kafka.log\",\"type\":\"phrase\"},\"type\":\"phrase\",\"value\":\"log\"},\"query\":{\"match\":{\"dataset.name\":{\"query\":\"kafka.log\",\"type\":\"phrase\"}}}}],\"highlightAll\":true,\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\",\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"version\":true}"
+    },
+    "sort": [
+      [
+        "@timestamp",
+        "desc"
+      ]
+    ],
+    "title": "All logs [Logs Kafka] ECS",
+    "version": 1
+  },
+  "id": "sample_search2",
+  "type": "search"
+}
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/kibana/visualization/sample_visualization.json b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/kibana/visualization/sample_visualization.json
new file mode 100644
index 0000000000000..626f1f787f421
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/kibana/visualization/sample_visualization.json
@@ -0,0 +1,11 @@
+{
+  "attributes": {
+    "description": "sample visualization 0.2.0",
+    "title": "sample vis title",
+    "uiStateJSON": "{}",
+    "version": 1,
+    "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"extended_bounds\":{},\"field\":\"@timestamp\",\"interval\":\"auto\",\"min_doc_count\":1},\"schema\":\"segment\",\"type\":\"date_histogram\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Log Level\",\"field\":\"log.level\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"@timestamp per day\"},\"type\":\"category\"}],\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"legendPosition\":\"right\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"times\":[],\"type\":\"histogram\",\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"title\":\"Log levels over time [Logs Kafka] ECS\",\"type\":\"histogram\"}"
+  },
+  "id": "sample_visualization",
+  "type": "visualization"
+}
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/manifest.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/manifest.yml
new file mode 100644
index 0000000000000..70da51a14bce8
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/manifest.yml
@@ -0,0 +1,20 @@
+format_version: 1.0.0
+name: all_assets 
+title: All Assets Updated
+description: tests that all assets are updated 
+version: 0.2.0
+categories: []
+release: beta
+type: integration
+license: basic
+
+requirement:
+  elasticsearch:
+    versions: '>7.7.0'
+  kibana:
+    versions: '>7.7.0'
+
+icons:
+  - src: '/img/logo_overrides_64_color.svg'
+    size: '16x16'
+    type: 'image/svg+xml'
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/elasticsearch/ilm_policy/all_assets.json b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/elasticsearch/ilm_policy/all_assets.json
new file mode 100644
index 0000000000000..7cf62e890f865
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/elasticsearch/ilm_policy/all_assets.json
@@ -0,0 +1,15 @@
+{
+    "policy": {
+        "phases": {
+            "hot": {
+                "min_age": "0ms",
+                "actions": {
+                    "rollover": {
+                        "max_size": "50gb",
+                        "max_age": "30d"
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/elasticsearch/ingest_pipeline/default.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/elasticsearch/ingest_pipeline/default.yml
new file mode 100644
index 0000000000000..580db049d0d5d
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/elasticsearch/ingest_pipeline/default.yml
@@ -0,0 +1,7 @@
+---
+description: Pipeline for parsing test logs
+  plugins.
+processors:
+- set:
+    field: error.message
+    value: '{{ _ingest.on_failure_message }}'
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/fields/ecs.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/fields/ecs.yml
new file mode 100644
index 0000000000000..3d88fe5dfefb6
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/fields/ecs.yml
@@ -0,0 +1,3 @@
+- name: logs_test_name
+  title: logs_test_title
+  type: keyword
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/fields/fields.yml
new file mode 100644
index 0000000000000..6e003ed0ad147
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/fields/fields.yml
@@ -0,0 +1,16 @@
+- name: data_stream.type
+  type: constant_keyword
+  description: >
+    Data stream type.
+- name: data_stream.dataset
+  type: constant_keyword
+  description: >
+    Data stream dataset.
+- name: data_stream.namespace
+  type: constant_keyword
+  description: >
+    Data stream namespace.
+- name: '@timestamp'
+  type: date
+  description: >
+    Event timestamp.
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/manifest.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/manifest.yml
new file mode 100644
index 0000000000000..8cd522e2845bb
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_logs/manifest.yml
@@ -0,0 +1,9 @@
+title: Test Dataset
+
+type: logs
+
+elasticsearch:
+  index_template.mappings:
+    dynamic: false
+  index_template.settings:
+    index.lifecycle.name: reference
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_metrics/fields/ecs.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_metrics/fields/ecs.yml
new file mode 100644
index 0000000000000..a30e3c7a87856
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_metrics/fields/ecs.yml
@@ -0,0 +1,3 @@
+- name: metrics_test_name
+  title: metrics_test_title
+  type: keyword
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_metrics/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_metrics/fields/fields.yml
new file mode 100644
index 0000000000000..6e003ed0ad147
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_metrics/fields/fields.yml
@@ -0,0 +1,16 @@
+- name: data_stream.type
+  type: constant_keyword
+  description: >
+    Data stream type.
+- name: data_stream.dataset
+  type: constant_keyword
+  description: >
+    Data stream dataset.
+- name: data_stream.namespace
+  type: constant_keyword
+  description: >
+    Data stream namespace.
+- name: '@timestamp'
+  type: date
+  description: >
+    Event timestamp.
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_metrics/manifest.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_metrics/manifest.yml
new file mode 100644
index 0000000000000..6bc20442bd432
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/dataset/test_metrics/manifest.yml
@@ -0,0 +1,3 @@
+title: Test Dataset
+
+type: metrics
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/docs/README.md b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/docs/README.md
new file mode 100644
index 0000000000000..34b1f08a55cbe
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/docs/README.md
@@ -0,0 +1,3 @@
+# Test package
+
+For testing that datastream rolls over when mappings are not compatible 
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/manifest.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/manifest.yml
new file mode 100644
index 0000000000000..0ab43760b7ee8
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.1.0/manifest.yml
@@ -0,0 +1,20 @@
+format_version: 1.0.0
+name: datastreams 
+title: datastream test
+description: This is a test package for testing that datastreams rollover when mappings are incompatible
+version: 0.1.0
+categories: []
+release: beta
+type: integration
+license: basic
+
+requirement:
+  elasticsearch:
+    versions: '>7.7.0'
+  kibana:
+    versions: '>7.7.0'
+
+icons:
+  - src: '/img/logo_overrides_64_color.svg'
+    size: '16x16'
+    type: 'image/svg+xml'
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/elasticsearch/ilm_policy/all_assets.json b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/elasticsearch/ilm_policy/all_assets.json
new file mode 100644
index 0000000000000..d8bab8a75f680
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/elasticsearch/ilm_policy/all_assets.json
@@ -0,0 +1,15 @@
+{
+    "policy": {
+        "phases": {
+            "hot": {
+                "min_age": "1ms",
+                "actions": {
+                    "rollover": {
+                        "max_size": "50gb",
+                        "max_age": "31d"
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/elasticsearch/ingest_pipeline/default.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/elasticsearch/ingest_pipeline/default.yml
new file mode 100644
index 0000000000000..580db049d0d5d
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/elasticsearch/ingest_pipeline/default.yml
@@ -0,0 +1,7 @@
+---
+description: Pipeline for parsing test logs
+  plugins.
+processors:
+- set:
+    field: error.message
+    value: '{{ _ingest.on_failure_message }}'
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/fields/ecs.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/fields/ecs.yml
new file mode 100644
index 0000000000000..7df52cc11fd20
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/fields/ecs.yml
@@ -0,0 +1,6 @@
+- name: logs_test_name
+  title: logs_test_title
+  type: text
+- name: new_field_name
+  title: new_field_title
+  type: keyword
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/fields/fields.yml
new file mode 100644
index 0000000000000..6e003ed0ad147
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/fields/fields.yml
@@ -0,0 +1,16 @@
+- name: data_stream.type
+  type: constant_keyword
+  description: >
+    Data stream type.
+- name: data_stream.dataset
+  type: constant_keyword
+  description: >
+    Data stream dataset.
+- name: data_stream.namespace
+  type: constant_keyword
+  description: >
+    Data stream namespace.
+- name: '@timestamp'
+  type: date
+  description: >
+    Event timestamp.
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/manifest.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/manifest.yml
new file mode 100644
index 0000000000000..8a53f9e26e827
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_logs/manifest.yml
@@ -0,0 +1,9 @@
+title: Test Dataset
+
+type: logs
+
+elasticsearch:
+  index_template.mappings:
+    dynamic: true
+  index_template.settings:
+    index.lifecycle.name: reference2
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_metrics/fields/ecs.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_metrics/fields/ecs.yml
new file mode 100644
index 0000000000000..8fb3ccd3de8fd
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_metrics/fields/ecs.yml
@@ -0,0 +1,6 @@
+- name: metrics_test_name
+  title: metrics_test_title
+  type: keyword
+- name: metrics_test_name2
+  title: metrics_test_title2
+  type: keyword
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_metrics/fields/fields.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_metrics/fields/fields.yml
new file mode 100644
index 0000000000000..6e003ed0ad147
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_metrics/fields/fields.yml
@@ -0,0 +1,16 @@
+- name: data_stream.type
+  type: constant_keyword
+  description: >
+    Data stream type.
+- name: data_stream.dataset
+  type: constant_keyword
+  description: >
+    Data stream dataset.
+- name: data_stream.namespace
+  type: constant_keyword
+  description: >
+    Data stream namespace.
+- name: '@timestamp'
+  type: date
+  description: >
+    Event timestamp.
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_metrics/manifest.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_metrics/manifest.yml
new file mode 100644
index 0000000000000..6bc20442bd432
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/dataset/test_metrics/manifest.yml
@@ -0,0 +1,3 @@
+title: Test Dataset
+
+type: metrics
\ No newline at end of file
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/docs/README.md b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/docs/README.md
new file mode 100644
index 0000000000000..34b1f08a55cbe
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/docs/README.md
@@ -0,0 +1,3 @@
+# Test package
+
+For testing that datastream rolls over when mappings are not compatible 
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/manifest.yml b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/manifest.yml
new file mode 100644
index 0000000000000..1aa1410bd0aef
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/datastreams/0.2.0/manifest.yml
@@ -0,0 +1,20 @@
+format_version: 1.0.0
+name: datastreams
+title: datastream test
+description: This is a test package for testing that datastreams rollover when mappings are incompatible
+version: 0.2.0
+categories: []
+release: beta
+type: integration
+license: basic
+
+requirement:
+  elasticsearch:
+    versions: '>7.7.0'
+  kibana:
+    versions: '>7.7.0'
+
+icons:
+  - src: '/img/logo_overrides_64_color.svg'
+    size: '16x16'
+    type: 'image/svg+xml'
diff --git a/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json b/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json
index bb63d29503663..249b03981386d 100644
--- a/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json
+++ b/x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json
@@ -1320,9 +1320,9 @@
                     "config": {
                       "type": "flattened"
                     },
-                    "dataset": {
+                    "data_stream": {
                       "properties": {
-                        "name": {
+                        "dataset": {
                           "type": "keyword"
                         },
                         "type": {
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index d4947222a6cc0..02f893029f819 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -108,7 +108,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           inputs: [
             {
               id: policyInfo.packageConfig.id,
-              dataset: { namespace: 'default' },
+              data_stream: { namespace: 'default' },
               name: 'Protect East Coast',
               meta: {
                 package: {
diff --git a/yarn.lock b/yarn.lock
index 7aff34fab23ce..33083667a3c5e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,16 +2,16 @@
 # yarn lockfile v1
 
 
-"@babel/cli@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.10.1.tgz#b6e5cd43a17b8f639442ab027976408ebe6d79a0"
-  integrity sha512-cVB+dXeGhMOqViIaZs3A9OUAe4pKw4SBNdMw6yHJMYR7s4TB+Cei7ThquV/84O19PdIFWuwe03vxxES0BHUm5g==
+"@babel/cli@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.10.5.tgz#57df2987c8cf89d0fc7d4b157ec59d7619f1b77a"
+  integrity sha512-j9H9qSf3kLdM0Ao3aGPbGZ73mEA9XazuupcS6cDGWuiyAcANoguhP0r2Lx32H5JGw4sSSoHG3x/mxVnHgvOoyA==
   dependencies:
     commander "^4.0.1"
     convert-source-map "^1.1.0"
     fs-readdir-recursive "^1.1.0"
     glob "^7.0.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
     make-dir "^2.1.0"
     slash "^2.0.0"
     source-map "^0.5.0"
@@ -32,17 +32,17 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/code-frame@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff"
-  integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==
+"@babel/code-frame@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
   dependencies:
-    "@babel/highlight" "^7.10.1"
+    "@babel/highlight" "^7.10.4"
 
-"@babel/compat-data@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz#b1085ffe72cd17bf2c0ee790fc09f9626011b2db"
-  integrity sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==
+"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c"
+  integrity sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==
   dependencies:
     browserslist "^4.12.0"
     invariant "^2.2.4"
@@ -79,24 +79,24 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.10.2":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a"
-  integrity sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/generator" "^7.10.2"
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helpers" "^7.10.1"
-    "@babel/parser" "^7.10.2"
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.2"
+"@babel/core@^7.11.1":
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.1.tgz#2c55b604e73a40dc21b0e52650b11c65cf276643"
+  integrity sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.0"
+    "@babel/helper-module-transforms" "^7.11.0"
+    "@babel/helpers" "^7.10.4"
+    "@babel/parser" "^7.11.1"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.11.0"
+    "@babel/types" "^7.11.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
@@ -111,14 +111,13 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.10.1", "@babel/generator@^7.10.2":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"
-  integrity sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==
+"@babel/generator@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.0.tgz#4b90c78d8c12825024568cbe83ee6c9af193585c"
+  integrity sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==
   dependencies:
-    "@babel/types" "^7.10.2"
+    "@babel/types" "^7.11.0"
     jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
 "@babel/generator@^7.9.5":
@@ -138,20 +137,20 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-annotate-as-pure@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz#f6d08acc6f70bbd59b436262553fb2e259a1a268"
-  integrity sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==
+"@babel/helper-annotate-as-pure@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
+  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz#0ec7d9be8174934532661f87783eb18d72290059"
-  integrity sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
+  integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-explode-assignable-expression" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
   version "7.8.3"
@@ -161,14 +160,14 @@
     "@babel/helper-explode-assignable-expression" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-builder-react-jsx-experimental@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.1.tgz#9a7d58ad184d3ac3bafb1a452cec2bad7e4a0bc8"
-  integrity sha512-irQJ8kpQUV3JasXPSFQ+LCCtJSc5ceZrPFVj6TElR6XCHssi3jV8ch3odIrNtjJFRZZVbrOEfJMI79TPU/h1pQ==
+"@babel/helper-builder-react-jsx-experimental@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.5.tgz#f35e956a19955ff08c1258e44a515a6d6248646b"
+  integrity sha512-Buewnx6M4ttG+NLkKyt7baQn7ScC/Td+e99G914fRU8fGIUivDDgVIQeDHFa5e4CRSJQt58WpNHhsAZgtzVhsg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/types" "^7.10.5"
 
 "@babel/helper-builder-react-jsx-experimental@^7.9.0":
   version "7.9.0"
@@ -179,13 +178,13 @@
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/types" "^7.9.0"
 
-"@babel/helper-builder-react-jsx@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.1.tgz#a327f0cf983af5554701b1215de54a019f09b532"
-  integrity sha512-KXzzpyWhXgzjXIlJU1ZjIXzUPdej1suE6vzqgImZ/cpAsR/CC8gUcX4EWRmDfWz/cs6HOCPMBIJ3nKoXt3BFuw==
+"@babel/helper-builder-react-jsx@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz#8095cddbff858e6fa9c326daee54a2f2732c1d5d"
+  integrity sha512-5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-builder-react-jsx@^7.9.0":
   version "7.9.0"
@@ -195,12 +194,12 @@
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/types" "^7.9.0"
 
-"@babel/helper-compilation-targets@^7.10.2":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz#a17d9723b6e2c750299d2a14d4637c76936d8285"
-  integrity sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==
+"@babel/helper-compilation-targets@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz#804ae8e3f04376607cc791b9d47d540276332bd2"
+  integrity sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==
   dependencies:
-    "@babel/compat-data" "^7.10.1"
+    "@babel/compat-data" "^7.10.4"
     browserslist "^4.12.0"
     invariant "^2.2.4"
     levenary "^1.1.1"
@@ -217,17 +216,17 @@
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.10.1":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz#7474295770f217dbcf288bf7572eb213db46ee67"
-  integrity sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==
+"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d"
+  integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-member-expression-to-functions" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.10.5"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
 
 "@babel/helper-create-class-features-plugin@^7.8.3":
   version "7.8.6"
@@ -241,13 +240,13 @@
     "@babel/helper-replace-supers" "^7.8.6"
     "@babel/helper-split-export-declaration" "^7.8.3"
 
-"@babel/helper-create-regexp-features-plugin@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz#1b8feeab1594cbcfbf3ab5a3bbcabac0468efdbd"
-  integrity sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==
+"@babel/helper-create-regexp-features-plugin@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
+  integrity sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-regex" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
     regexpu-core "^4.7.0"
 
 "@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
@@ -259,14 +258,14 @@
     "@babel/helper-regex" "^7.8.3"
     regexpu-core "^4.7.0"
 
-"@babel/helper-define-map@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz#5e69ee8308648470dd7900d159c044c10285221d"
-  integrity sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==
+"@babel/helper-define-map@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
+  integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/types" "^7.10.5"
+    lodash "^4.17.19"
 
 "@babel/helper-define-map@^7.8.3":
   version "7.8.3"
@@ -277,13 +276,13 @@
     "@babel/types" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/helper-explode-assignable-expression@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz#e9d76305ee1162ca467357ae25df94f179af2b7e"
-  integrity sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==
+"@babel/helper-explode-assignable-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz#40a1cd917bff1288f699a94a75b37a1a2dbd8c7c"
+  integrity sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==
   dependencies:
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-explode-assignable-expression@^7.8.3":
   version "7.8.3"
@@ -293,14 +292,14 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-function-name@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz#92bd63829bfc9215aca9d9defa85f56b539454f4"
-  integrity sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==
+"@babel/helper-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-function-name@^7.8.3":
   version "7.8.3"
@@ -320,12 +319,12 @@
     "@babel/template" "^7.8.3"
     "@babel/types" "^7.9.5"
 
-"@babel/helper-get-function-arity@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d"
-  integrity sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==
+"@babel/helper-get-function-arity@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
+  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
@@ -334,12 +333,12 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-hoist-variables@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz#7e77c82e5dcae1ebf123174c385aaadbf787d077"
-  integrity sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==
+"@babel/helper-hoist-variables@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
+  integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-hoist-variables@^7.8.3":
   version "7.8.3"
@@ -348,12 +347,12 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-member-expression-to-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz#432967fd7e12a4afef66c4687d4ca22bc0456f15"
-  integrity sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==
+"@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df"
+  integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.11.0"
 
 "@babel/helper-member-expression-to-functions@^7.8.3":
   version "7.8.3"
@@ -369,25 +368,25 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-module-imports@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876"
-  integrity sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==
+"@babel/helper-module-imports@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
+  integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-module-transforms@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622"
-  integrity sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==
+"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
+  integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-simple-access" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.11.0"
+    lodash "^4.17.19"
 
 "@babel/helper-module-transforms@^7.9.0":
   version "7.9.0"
@@ -402,12 +401,12 @@
     "@babel/types" "^7.9.0"
     lodash "^4.17.13"
 
-"@babel/helper-optimise-call-expression@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543"
-  integrity sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==
+"@babel/helper-optimise-call-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
+  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-optimise-call-expression@^7.8.3":
   version "7.8.3"
@@ -421,17 +420,17 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
   integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
 
-"@babel/helper-plugin-utils@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz#ec5a5cf0eec925b66c60580328b122c01230a127"
-  integrity sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==
+"@babel/helper-plugin-utils@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
+  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
-"@babel/helper-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.1.tgz#021cf1a7ba99822f993222a001cc3fec83255b96"
-  integrity sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==
+"@babel/helper-regex@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
+  integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
   dependencies:
-    lodash "^4.17.13"
+    lodash "^4.17.19"
 
 "@babel/helper-regex@^7.8.3":
   version "7.8.3"
@@ -440,16 +439,16 @@
   dependencies:
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz#bad6aaa4ff39ce8d4b82ccaae0bfe0f7dbb5f432"
-  integrity sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==
+"@babel/helper-remap-async-to-generator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz#fce8bea4e9690bbe923056ded21e54b4e8b68ed5"
+  integrity sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-wrap-function" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-wrap-function" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-remap-async-to-generator@^7.8.3":
   version "7.8.3"
@@ -462,15 +461,15 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-replace-supers@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz#ec6859d20c5d8087f6a2dc4e014db7228975f13d"
-  integrity sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==
+"@babel/helper-replace-supers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
+  integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-member-expression-to-functions" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
   version "7.8.6"
@@ -482,13 +481,13 @@
     "@babel/traverse" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/helper-simple-access@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz#08fb7e22ace9eb8326f7e3920a1c2052f13d851e"
-  integrity sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==
+"@babel/helper-simple-access@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
+  integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==
   dependencies:
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-simple-access@^7.8.3":
   version "7.8.3"
@@ -498,12 +497,19 @@
     "@babel/template" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-split-export-declaration@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"
-  integrity sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==
+"@babel/helper-skip-transparent-expression-wrappers@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729"
+  integrity sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.11.0"
+
+"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+  dependencies:
+    "@babel/types" "^7.11.0"
 
 "@babel/helper-split-export-declaration@^7.8.3":
   version "7.8.3"
@@ -512,10 +518,10 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-validator-identifier@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5"
-  integrity sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
 "@babel/helper-validator-identifier@^7.9.0":
   version "7.9.0"
@@ -527,15 +533,15 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
   integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
 
-"@babel/helper-wrap-function@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz#956d1310d6696257a7afd47e4c42dfda5dfcedc9"
-  integrity sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==
+"@babel/helper-wrap-function@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz#8a6f701eab0ff39f765b5a1cfef409990e624b87"
+  integrity sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helper-wrap-function@^7.8.3":
   version "7.8.3"
@@ -547,14 +553,14 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz#a6827b7cb975c9d9cef5fd61d919f60d8844a973"
-  integrity sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==
+"@babel/helpers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
+  integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==
   dependencies:
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/helpers@^7.9.0":
   version "7.9.2"
@@ -574,12 +580,12 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0"
-  integrity sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.1"
+    "@babel/helper-validator-identifier" "^7.10.4"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
@@ -588,18 +594,18 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
   integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
 
-"@babel/parser@^7.10.1", "@babel/parser@^7.10.2":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0"
-  integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==
+"@babel/parser@^7.10.4", "@babel/parser@^7.11.0", "@babel/parser@^7.11.1", "@babel/parser@^7.11.2":
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.2.tgz#0882ab8a455df3065ea2dcb4c753b2460a24bead"
+  integrity sha512-Vuj/+7vLo6l1Vi7uuO+1ngCDNeVmNbTngcJFKCR/oEtz8tKz0CJxZEGmPt9KcIloZhOZ3Zit6xbpXT2MDlS9Vw==
 
-"@babel/plugin-proposal-async-generator-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz#6911af5ba2e615c4ff3c497fe2f47b35bf6d7e55"
-  integrity sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==
+"@babel/plugin-proposal-async-generator-functions@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz#3491cabf2f7c179ab820606cec27fed15e0e8558"
+  integrity sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-remap-async-to-generator" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
@@ -611,13 +617,13 @@
     "@babel/helper-remap-async-to-generator" "^7.8.3"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz#046bc7f6550bb08d9bd1d4f060f5f5a4f1087e01"
-  integrity sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw==
+"@babel/plugin-proposal-class-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807"
+  integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-proposal-class-properties@^7.7.0":
   version "7.8.3"
@@ -627,12 +633,12 @@
     "@babel/helper-create-class-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-proposal-dynamic-import@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz#e36979dc1dc3b73f6d6816fc4951da2363488ef0"
-  integrity sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==
+"@babel/plugin-proposal-dynamic-import@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz#ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"
+  integrity sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
 "@babel/plugin-proposal-dynamic-import@^7.8.3":
@@ -643,20 +649,20 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-export-namespace-from@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.1.tgz#512ee069cd866256600bdf89639cf7e1b51fbfe9"
-  integrity sha512-eR4CoYb6mh5y9LWjnb4CyUatuhtZ8pNLXLDi46GkqtF7WPafFqXycHdvF5qWviozZVGRSAmHzdayc8wUReCdjA==
+"@babel/plugin-proposal-export-namespace-from@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54"
+  integrity sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz#b1e691ee24c651b5a5e32213222b2379734aff09"
-  integrity sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==
+"@babel/plugin-proposal-json-strings@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
+  integrity sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
 "@babel/plugin-proposal-json-strings@^7.8.3":
@@ -667,12 +673,20 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz#02dca21673842ff2fe763ac253777f235e9bbf78"
-  integrity sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==
+"@babel/plugin-proposal-logical-assignment-operators@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8"
+  integrity sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
+  integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
@@ -683,13 +697,13 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz#a9a38bc34f78bdfd981e791c27c6fdcec478c123"
-  integrity sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==
+"@babel/plugin-proposal-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz#ce1590ff0a65ad12970a609d78855e9a4c1aef06"
+  integrity sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
 "@babel/plugin-proposal-numeric-separator@^7.8.3":
   version "7.8.3"
@@ -699,14 +713,14 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-numeric-separator" "^7.8.3"
 
-"@babel/plugin-proposal-object-rest-spread@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz#cba44908ac9f142650b4a65b8aa06bf3478d5fb6"
-  integrity sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==
+"@babel/plugin-proposal-object-rest-spread@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af"
+  integrity sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.10.1"
+    "@babel/plugin-transform-parameters" "^7.10.4"
 
 "@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.9.0":
   version "7.9.0"
@@ -716,12 +730,12 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz#c9f86d99305f9fa531b568ff5ab8c964b8b223d2"
-  integrity sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==
+"@babel/plugin-proposal-optional-catch-binding@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd"
+  integrity sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.8.3":
@@ -732,12 +746,13 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz#15f5d6d22708629451a91be28f8facc55b0e818c"
-  integrity sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==
+"@babel/plugin-proposal-optional-chaining@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076"
+  integrity sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
 "@babel/plugin-proposal-optional-chaining@^7.9.0":
@@ -748,21 +763,21 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-private-methods@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz#ed85e8058ab0fe309c3f448e5e1b73ca89cdb598"
-  integrity sha512-RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg==
+"@babel/plugin-proposal-private-methods@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz#b160d972b8fdba5c7d111a145fc8c421fc2a6909"
+  integrity sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz#dc04feb25e2dd70c12b05d680190e138fa2c0c6f"
-  integrity sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==
+"@babel/plugin-proposal-unicode-property-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
+  integrity sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
   version "7.8.8"
@@ -786,12 +801,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz#d5bc0645913df5b17ad7eda0fa2308330bde34c5"
-  integrity sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ==
+"@babel/plugin-syntax-class-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"
+  integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-class-properties@^7.8.3":
   version "7.8.3"
@@ -828,12 +843,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.1.tgz#0ae371134a42b91d5418feb3c8c8d43e1565d2da"
-  integrity sha512-+OxyOArpVFXQeXKLO9o+r2I4dIoVoy6+Uu0vKELrlweDM3QJADZj+Z+5ERansZqIZBcLj42vHnDI8Rz9BnRIuQ==
+"@babel/plugin-syntax-jsx@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz#39abaae3cbf710c4373d8429484e6ba21340166c"
+  integrity sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-jsx@^7.8.3":
   version "7.8.3"
@@ -842,6 +857,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz#3995d7d7ffff432f6ddc742b47e730c054599897"
@@ -856,12 +878,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz#25761ee7410bc8cf97327ba741ee94e4a61b7d99"
-  integrity sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg==
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.8.3"
@@ -891,12 +913,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz#8b8733f8c57397b3eaa47ddba8841586dcaef362"
-  integrity sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==
+"@babel/plugin-syntax-top-level-await@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz#4bbeb8917b54fcf768364e0a81f560e33a3ef57d"
+  integrity sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.8.3"
@@ -905,19 +927,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-typescript@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.1.tgz#5e82bc27bb4202b93b949b029e699db536733810"
-  integrity sha512-X/d8glkrAtra7CaQGMiGs/OGa6XgUzqPcBXCIGFCpCqnfGlT0Wfbzo/B89xHhnInTaItPK8LALblVXcUOEh95Q==
+"@babel/plugin-syntax-typescript@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz#2f55e770d3501e83af217d782cb7517d7bb34d25"
+  integrity sha512-oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz#cb5ee3a36f0863c06ead0b409b4cc43a889b295b"
-  integrity sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==
+"@babel/plugin-transform-arrow-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
+  integrity sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-arrow-functions@^7.8.3":
   version "7.8.3"
@@ -926,14 +948,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-async-to-generator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz#e5153eb1a3e028f79194ed8a7a4bf55f862b2062"
-  integrity sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==
+"@babel/plugin-transform-async-to-generator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz#41a5017e49eb6f3cda9392a51eef29405b245a37"
+  integrity sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-remap-async-to-generator" "^7.10.1"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
 
 "@babel/plugin-transform-async-to-generator@^7.8.3":
   version "7.8.3"
@@ -944,12 +966,12 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-remap-async-to-generator" "^7.8.3"
 
-"@babel/plugin-transform-block-scoped-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz#146856e756d54b20fff14b819456b3e01820b85d"
-  integrity sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==
+"@babel/plugin-transform-block-scoped-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz#1afa595744f75e43a91af73b0d998ecfe4ebc2e8"
+  integrity sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-block-scoped-functions@^7.8.3":
   version "7.8.3"
@@ -958,13 +980,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-block-scoping@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz#47092d89ca345811451cd0dc5d91605982705d5e"
-  integrity sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==
+"@babel/plugin-transform-block-scoping@^7.10.4":
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz#5b7efe98852bef8d652c0b28144cd93a9e4b5215"
+  integrity sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-block-scoping@^7.8.3":
   version "7.8.3"
@@ -974,18 +995,18 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz#6e11dd6c4dfae70f540480a4702477ed766d733f"
-  integrity sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-define-map" "^7.10.1"
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
+"@babel/plugin-transform-classes@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz#405136af2b3e218bc4a1926228bc917ab1a0adc7"
+  integrity sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-define-map" "^7.10.4"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
 "@babel/plugin-transform-classes@^7.9.0":
@@ -1002,12 +1023,12 @@
     "@babel/helper-split-export-declaration" "^7.8.3"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz#59aa399064429d64dce5cf76ef9b90b7245ebd07"
-  integrity sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==
+"@babel/plugin-transform-computed-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz#9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"
+  integrity sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-computed-properties@^7.8.3":
   version "7.8.3"
@@ -1016,12 +1037,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-destructuring@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz#abd58e51337815ca3a22a336b85f62b998e71907"
-  integrity sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==
+"@babel/plugin-transform-destructuring@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"
+  integrity sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-destructuring@^7.8.3":
   version "7.8.8"
@@ -1030,13 +1051,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-dotall-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz#920b9fec2d78bb57ebb64a644d5c2ba67cc104ee"
-  integrity sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==
+"@babel/plugin-transform-dotall-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
+  integrity sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
   version "7.8.3"
@@ -1046,12 +1067,12 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-duplicate-keys@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz#c900a793beb096bc9d4d0a9d0cde19518ffc83b9"
-  integrity sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==
+"@babel/plugin-transform-duplicate-keys@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz#697e50c9fee14380fe843d1f306b295617431e47"
+  integrity sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-duplicate-keys@^7.8.3":
   version "7.8.3"
@@ -1060,13 +1081,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-exponentiation-operator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz#279c3116756a60dd6e6f5e488ba7957db9c59eb3"
-  integrity sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==
+"@babel/plugin-transform-exponentiation-operator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz#5ae338c57f8cf4001bdb35607ae66b92d665af2e"
+  integrity sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-exponentiation-operator@^7.8.3":
   version "7.8.3"
@@ -1084,12 +1105,12 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-flow" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz#ff01119784eb0ee32258e8646157ba2501fcfda5"
-  integrity sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==
+"@babel/plugin-transform-for-of@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz#c08892e8819d3a5db29031b115af511dbbfebae9"
+  integrity sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-for-of@^7.9.0":
   version "7.9.0"
@@ -1098,13 +1119,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-function-name@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz#4ed46fd6e1d8fde2a2ec7b03c66d853d2c92427d"
-  integrity sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==
+"@babel/plugin-transform-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz#6a467880e0fc9638514ba369111811ddbe2644b7"
+  integrity sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-function-name@^7.8.3":
   version "7.8.3"
@@ -1114,12 +1135,12 @@
     "@babel/helper-function-name" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz#5794f8da82846b22e4e6631ea1658bce708eb46a"
-  integrity sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==
+"@babel/plugin-transform-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz#9f42ba0841100a135f22712d0e391c462f571f3c"
+  integrity sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-literals@^7.8.3":
   version "7.8.3"
@@ -1128,12 +1149,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-member-expression-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz#90347cba31bca6f394b3f7bd95d2bbfd9fce2f39"
-  integrity sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==
+"@babel/plugin-transform-member-expression-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz#b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"
+  integrity sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-member-expression-literals@^7.8.3":
   version "7.8.3"
@@ -1142,13 +1163,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-modules-amd@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz#65950e8e05797ebd2fe532b96e19fc5482a1d52a"
-  integrity sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==
+"@babel/plugin-transform-modules-amd@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"
+  integrity sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-amd@^7.9.0":
@@ -1160,14 +1181,14 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz#d5ff4b4413ed97ffded99961056e1fb980fb9301"
-  integrity sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==
+"@babel/plugin-transform-modules-commonjs@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0"
+  integrity sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-simple-access" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-commonjs@^7.9.0":
@@ -1180,14 +1201,14 @@
     "@babel/helper-simple-access" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz#9962e4b0ac6aaf2e20431ada3d8ec72082cbffb6"
-  integrity sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==
+"@babel/plugin-transform-modules-systemjs@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz#6270099c854066681bae9e05f87e1b9cadbe8c85"
+  integrity sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.10.1"
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-hoist-variables" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-systemjs@^7.9.0":
@@ -1200,13 +1221,13 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-umd@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz#ea080911ffc6eb21840a5197a39ede4ee67b1595"
-  integrity sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==
+"@babel/plugin-transform-modules-umd@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz#9a8481fe81b824654b3a0b65da3df89f3d21839e"
+  integrity sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-modules-umd@^7.9.0":
   version "7.9.0"
@@ -1216,6 +1237,13 @@
     "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz#78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"
+  integrity sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+
 "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
@@ -1223,12 +1251,12 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
 
-"@babel/plugin-transform-new-target@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz#6ee41a5e648da7632e22b6fb54012e87f612f324"
-  integrity sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==
+"@babel/plugin-transform-new-target@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz#9097d753cb7b024cb7381a3b2e52e9513a9c6888"
+  integrity sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-new-target@^7.8.3":
   version "7.8.3"
@@ -1237,13 +1265,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-object-super@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz#2e3016b0adbf262983bf0d5121d676a5ed9c4fde"
-  integrity sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==
+"@babel/plugin-transform-object-super@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz#d7146c4d139433e7a6526f888c667e314a093894"
+  integrity sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
 
 "@babel/plugin-transform-object-super@^7.8.3":
   version "7.8.3"
@@ -1253,13 +1281,13 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz#b25938a3c5fae0354144a720b07b32766f683ddd"
-  integrity sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==
+"@babel/plugin-transform-parameters@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a"
+  integrity sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-parameters@^7.8.7":
   version "7.9.3"
@@ -1269,12 +1297,12 @@
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-property-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz#cffc7315219230ed81dc53e4625bf86815b6050d"
-  integrity sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==
+"@babel/plugin-transform-property-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz#f6fe54b6590352298785b83edd815d214c42e3c0"
+  integrity sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-property-literals@^7.8.3":
   version "7.8.3"
@@ -1290,12 +1318,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-display-name@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.1.tgz#e6a33f6d48dfb213dda5e007d0c7ff82b6a3d8ef"
-  integrity sha512-rBjKcVwjk26H3VX8pavMxGf33LNlbocMHdSeldIEswtQ/hrjyTG8fKKILW1cSkODyRovckN/uZlGb2+sAV9JUQ==
+"@babel/plugin-transform-react-display-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz#b5795f4e3e3140419c3611b7a2a3832b9aef328d"
+  integrity sha512-Zd4X54Mu9SBfPGnEcaGcOrVAYOtjT2on8QZkLKEq1S/tHexG39d9XXGZv19VfRrDjPJzFmPfTAqOQS1pfFOujw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-react-display-name@^7.8.3":
   version "7.8.3"
@@ -1304,14 +1332,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-development@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.1.tgz#1ac6300d8b28ef381ee48e6fec430cc38047b7f3"
-  integrity sha512-XwDy/FFoCfw9wGFtdn5Z+dHh6HXKHkC6DwKNWpN74VWinUagZfDcEJc3Y8Dn5B3WMVnAllX8Kviaw7MtC5Epwg==
+"@babel/plugin-transform-react-jsx-development@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.4.tgz#6ec90f244394604623880e15ebc3c34c356258ba"
+  integrity sha512-RM3ZAd1sU1iQ7rI2dhrZRZGv0aqzNQMbkIUCS1txYpi9wHQ2ZHNjo5TwX+UD6pvFW4AbWqLVYvKy5qJSAyRGjQ==
   dependencies:
-    "@babel/helper-builder-react-jsx-experimental" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-jsx" "^7.10.1"
+    "@babel/helper-builder-react-jsx-experimental" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-jsx" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx-development@^7.9.0":
   version "7.9.0"
@@ -1322,13 +1350,13 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-self@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.1.tgz#22143e14388d72eb88649606bb9e46f421bc3821"
-  integrity sha512-4p+RBw9d1qV4S749J42ZooeQaBomFPrSxa9JONLHJ1TxCBo3TzJ79vtmG2S2erUT8PDDrPdw4ZbXGr2/1+dILA==
+"@babel/plugin-transform-react-jsx-self@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz#cd301a5fed8988c182ed0b9d55e9bd6db0bd9369"
+  integrity sha512-yOvxY2pDiVJi0axdTWHSMi5T0DILN+H+SaeJeACHKjQLezEzhLx9nEF9xgpBLPtkZsks9cnb5P9iBEi21En3gg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-jsx" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-jsx" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx-self@^7.9.0":
   version "7.9.0"
@@ -1338,13 +1366,13 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-source@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.1.tgz#30db3d4ee3cdebbb26a82a9703673714777a4273"
-  integrity sha512-neAbaKkoiL+LXYbGDvh6PjPG+YeA67OsZlE78u50xbWh2L1/C81uHiNP5d1fw+uqUIoiNdCC8ZB+G4Zh3hShJA==
+"@babel/plugin-transform-react-jsx-source@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz#34f1779117520a779c054f2cdd9680435b9222b4"
+  integrity sha512-wTeqHVkN1lfPLubRiZH3o73f4rfon42HpgxUSs86Nc+8QIcm/B9s8NNVXu/gwGcOyd7yDib9ikxoDLxJP0UiDA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-jsx" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-jsx" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx-source@^7.9.0":
   version "7.9.0"
@@ -1354,15 +1382,15 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.1.tgz#91f544248ba131486decb5d9806da6a6e19a2896"
-  integrity sha512-MBVworWiSRBap3Vs39eHt+6pJuLUAaK4oxGc8g+wY+vuSJvLiEQjW1LSTqKb8OUPtDvHCkdPhk7d6sjC19xyFw==
+"@babel/plugin-transform-react-jsx@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz#673c9f913948764a4421683b2bef2936968fddf2"
+  integrity sha512-L+MfRhWjX0eI7Js093MM6MacKU4M6dnCRa/QPDwYMxjljzSCzzlzKzj9Pk4P3OtrPcxr2N3znR419nr3Xw+65A==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.10.1"
-    "@babel/helper-builder-react-jsx-experimental" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-jsx" "^7.10.1"
+    "@babel/helper-builder-react-jsx" "^7.10.4"
+    "@babel/helper-builder-react-jsx-experimental" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-jsx" "^7.10.4"
 
 "@babel/plugin-transform-react-jsx@^7.9.4":
   version "7.9.4"
@@ -1374,18 +1402,18 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-jsx" "^7.8.3"
 
-"@babel/plugin-transform-react-pure-annotations@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.1.tgz#f5e7c755d3e7614d4c926e144f501648a5277b70"
-  integrity sha512-mfhoiai083AkeewsBHUpaS/FM1dmUENHBMpS/tugSJ7VXqXO5dCN1Gkint2YvM1Cdv1uhmAKt1ZOuAjceKmlLA==
+"@babel/plugin-transform-react-pure-annotations@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz#3eefbb73db94afbc075f097523e445354a1c6501"
+  integrity sha512-+njZkqcOuS8RaPakrnR9KvxjoG1ASJWpoIv/doyWngId88JoFlPlISenGXjrVacZUIALGUr6eodRs1vmPnF23A==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-regenerator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz#10e175cbe7bdb63cc9b39f9b3f823c5c7c5c5490"
-  integrity sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==
+"@babel/plugin-transform-regenerator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63"
+  integrity sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==
   dependencies:
     regenerator-transform "^0.14.2"
 
@@ -1396,12 +1424,12 @@
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz#0fc1027312b4d1c3276a57890c8ae3bcc0b64a86"
-  integrity sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==
+"@babel/plugin-transform-reserved-words@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz#8f2682bcdcef9ed327e1b0861585d7013f8a54dd"
+  integrity sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-reserved-words@^7.8.3":
   version "7.8.3"
@@ -1410,22 +1438,22 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-runtime@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.1.tgz#fd1887f749637fb2ed86dc278e79eb41df37f4b1"
-  integrity sha512-4w2tcglDVEwXJ5qxsY++DgWQdNJcCCsPxfT34wCUwIf2E7dI7pMpH8JczkMBbgBTNzBX62SZlNJ9H+De6Zebaw==
+"@babel/plugin-transform-runtime@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz#e27f78eb36f19448636e05c33c90fd9ad9b8bccf"
+  integrity sha512-LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz#e8b54f238a1ccbae482c4dce946180ae7b3143f3"
-  integrity sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==
+"@babel/plugin-transform-shorthand-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"
+  integrity sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-shorthand-properties@^7.8.3":
   version "7.8.3"
@@ -1434,12 +1462,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-spread@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz#0c6d618a0c4461a274418460a28c9ccf5239a7c8"
-  integrity sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==
+"@babel/plugin-transform-spread@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"
+  integrity sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
 
 "@babel/plugin-transform-spread@^7.8.3":
   version "7.8.3"
@@ -1448,13 +1477,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-sticky-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz#90fc89b7526228bed9842cff3588270a7a393b00"
-  integrity sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==
+"@babel/plugin-transform-sticky-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz#8f3889ee8657581130a29d9cc91d7c73b7c4a28d"
+  integrity sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-regex" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
 
 "@babel/plugin-transform-sticky-regex@^7.8.3":
   version "7.8.3"
@@ -1464,13 +1493,13 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-regex" "^7.8.3"
 
-"@babel/plugin-transform-template-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz#914c7b7f4752c570ea00553b4284dad8070e8628"
-  integrity sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==
+"@babel/plugin-transform-template-literals@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz#78bc5d626a6642db3312d9d0f001f5e7639fde8c"
+  integrity sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-template-literals@^7.8.3":
   version "7.8.3"
@@ -1480,12 +1509,12 @@
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typeof-symbol@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz#60c0239b69965d166b80a84de7315c1bc7e0bb0e"
-  integrity sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==
+"@babel/plugin-transform-typeof-symbol@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz#9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"
+  integrity sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-typeof-symbol@^7.8.4":
   version "7.8.4"
@@ -1494,29 +1523,29 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typescript@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.1.tgz#2c54daea231f602468686d9faa76f182a94507a6"
-  integrity sha512-v+QWKlmCnsaimLeqq9vyCsVRMViZG1k2SZTlcZvB+TqyH570Zsij8nvVUZzOASCRiQFUxkLrn9Wg/kH0zgy5OQ==
+"@babel/plugin-transform-typescript@^7.10.4":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz#2b4879676af37342ebb278216dd090ac67f13abb"
+  integrity sha512-edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-typescript" "^7.10.1"
+    "@babel/helper-create-class-features-plugin" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-typescript" "^7.10.4"
 
-"@babel/plugin-transform-unicode-escapes@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz#add0f8483dab60570d9e03cecef6c023aa8c9940"
-  integrity sha512-zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw==
+"@babel/plugin-transform-unicode-escapes@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz#feae523391c7651ddac115dae0a9d06857892007"
+  integrity sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz#6b58f2aea7b68df37ac5025d9c88752443a6b43f"
-  integrity sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==
+"@babel/plugin-transform-unicode-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz#e56d71f9282fac6db09c82742055576d5e6d80a8"
+  integrity sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-unicode-regex@^7.8.3":
   version "7.8.3"
@@ -1592,70 +1621,74 @@
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/preset-env@^7.10.2":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.2.tgz#715930f2cf8573b0928005ee562bed52fb65fdfb"
-  integrity sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA==
-  dependencies:
-    "@babel/compat-data" "^7.10.1"
-    "@babel/helper-compilation-targets" "^7.10.2"
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-proposal-async-generator-functions" "^7.10.1"
-    "@babel/plugin-proposal-class-properties" "^7.10.1"
-    "@babel/plugin-proposal-dynamic-import" "^7.10.1"
-    "@babel/plugin-proposal-json-strings" "^7.10.1"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.1"
-    "@babel/plugin-proposal-numeric-separator" "^7.10.1"
-    "@babel/plugin-proposal-object-rest-spread" "^7.10.1"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.10.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.10.1"
-    "@babel/plugin-proposal-private-methods" "^7.10.1"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.10.1"
+"@babel/preset-env@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.0.tgz#860ee38f2ce17ad60480c2021ba9689393efb796"
+  integrity sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==
+  dependencies:
+    "@babel/compat-data" "^7.11.0"
+    "@babel/helper-compilation-targets" "^7.10.4"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
+    "@babel/plugin-proposal-class-properties" "^7.10.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.10.4"
+    "@babel/plugin-proposal-export-namespace-from" "^7.10.4"
+    "@babel/plugin-proposal-json-strings" "^7.10.4"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
+    "@babel/plugin-proposal-numeric-separator" "^7.10.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.11.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
+    "@babel/plugin-proposal-optional-chaining" "^7.11.0"
+    "@babel/plugin-proposal-private-methods" "^7.10.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.10.1"
+    "@babel/plugin-syntax-class-properties" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.1"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.10.1"
-    "@babel/plugin-transform-arrow-functions" "^7.10.1"
-    "@babel/plugin-transform-async-to-generator" "^7.10.1"
-    "@babel/plugin-transform-block-scoped-functions" "^7.10.1"
-    "@babel/plugin-transform-block-scoping" "^7.10.1"
-    "@babel/plugin-transform-classes" "^7.10.1"
-    "@babel/plugin-transform-computed-properties" "^7.10.1"
-    "@babel/plugin-transform-destructuring" "^7.10.1"
-    "@babel/plugin-transform-dotall-regex" "^7.10.1"
-    "@babel/plugin-transform-duplicate-keys" "^7.10.1"
-    "@babel/plugin-transform-exponentiation-operator" "^7.10.1"
-    "@babel/plugin-transform-for-of" "^7.10.1"
-    "@babel/plugin-transform-function-name" "^7.10.1"
-    "@babel/plugin-transform-literals" "^7.10.1"
-    "@babel/plugin-transform-member-expression-literals" "^7.10.1"
-    "@babel/plugin-transform-modules-amd" "^7.10.1"
-    "@babel/plugin-transform-modules-commonjs" "^7.10.1"
-    "@babel/plugin-transform-modules-systemjs" "^7.10.1"
-    "@babel/plugin-transform-modules-umd" "^7.10.1"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.10.1"
-    "@babel/plugin-transform-object-super" "^7.10.1"
-    "@babel/plugin-transform-parameters" "^7.10.1"
-    "@babel/plugin-transform-property-literals" "^7.10.1"
-    "@babel/plugin-transform-regenerator" "^7.10.1"
-    "@babel/plugin-transform-reserved-words" "^7.10.1"
-    "@babel/plugin-transform-shorthand-properties" "^7.10.1"
-    "@babel/plugin-transform-spread" "^7.10.1"
-    "@babel/plugin-transform-sticky-regex" "^7.10.1"
-    "@babel/plugin-transform-template-literals" "^7.10.1"
-    "@babel/plugin-transform-typeof-symbol" "^7.10.1"
-    "@babel/plugin-transform-unicode-escapes" "^7.10.1"
-    "@babel/plugin-transform-unicode-regex" "^7.10.1"
+    "@babel/plugin-syntax-top-level-await" "^7.10.4"
+    "@babel/plugin-transform-arrow-functions" "^7.10.4"
+    "@babel/plugin-transform-async-to-generator" "^7.10.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.10.4"
+    "@babel/plugin-transform-block-scoping" "^7.10.4"
+    "@babel/plugin-transform-classes" "^7.10.4"
+    "@babel/plugin-transform-computed-properties" "^7.10.4"
+    "@babel/plugin-transform-destructuring" "^7.10.4"
+    "@babel/plugin-transform-dotall-regex" "^7.10.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.10.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.10.4"
+    "@babel/plugin-transform-for-of" "^7.10.4"
+    "@babel/plugin-transform-function-name" "^7.10.4"
+    "@babel/plugin-transform-literals" "^7.10.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.10.4"
+    "@babel/plugin-transform-modules-amd" "^7.10.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.10.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.10.4"
+    "@babel/plugin-transform-modules-umd" "^7.10.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4"
+    "@babel/plugin-transform-new-target" "^7.10.4"
+    "@babel/plugin-transform-object-super" "^7.10.4"
+    "@babel/plugin-transform-parameters" "^7.10.4"
+    "@babel/plugin-transform-property-literals" "^7.10.4"
+    "@babel/plugin-transform-regenerator" "^7.10.4"
+    "@babel/plugin-transform-reserved-words" "^7.10.4"
+    "@babel/plugin-transform-shorthand-properties" "^7.10.4"
+    "@babel/plugin-transform-spread" "^7.11.0"
+    "@babel/plugin-transform-sticky-regex" "^7.10.4"
+    "@babel/plugin-transform-template-literals" "^7.10.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.10.4"
+    "@babel/plugin-transform-unicode-escapes" "^7.10.4"
+    "@babel/plugin-transform-unicode-regex" "^7.10.4"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.10.2"
+    "@babel/types" "^7.11.0"
     browserslist "^4.12.0"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
@@ -1693,34 +1726,34 @@
     "@babel/plugin-transform-react-jsx-self" "^7.9.0"
     "@babel/plugin-transform-react-jsx-source" "^7.9.0"
 
-"@babel/preset-react@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.1.tgz#e2ab8ae9a363ec307b936589f07ed753192de041"
-  integrity sha512-Rw0SxQ7VKhObmFjD/cUcKhPTtzpeviEFX1E6PgP+cYOhQ98icNqtINNFANlsdbQHrmeWnqdxA4Tmnl1jy5tp3Q==
+"@babel/preset-react@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz#92e8a66d816f9911d11d4cc935be67adfc82dbcf"
+  integrity sha512-BrHp4TgOIy4M19JAfO1LhycVXOPWdDbTRep7eVyatf174Hff+6Uk53sDyajqZPu8W1qXRBiYOfIamek6jA7YVw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-transform-react-display-name" "^7.10.1"
-    "@babel/plugin-transform-react-jsx" "^7.10.1"
-    "@babel/plugin-transform-react-jsx-development" "^7.10.1"
-    "@babel/plugin-transform-react-jsx-self" "^7.10.1"
-    "@babel/plugin-transform-react-jsx-source" "^7.10.1"
-    "@babel/plugin-transform-react-pure-annotations" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-transform-react-display-name" "^7.10.4"
+    "@babel/plugin-transform-react-jsx" "^7.10.4"
+    "@babel/plugin-transform-react-jsx-development" "^7.10.4"
+    "@babel/plugin-transform-react-jsx-self" "^7.10.4"
+    "@babel/plugin-transform-react-jsx-source" "^7.10.4"
+    "@babel/plugin-transform-react-pure-annotations" "^7.10.4"
 
-"@babel/preset-typescript@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.10.1.tgz#a8d8d9035f55b7d99a2461a0bdc506582914d07e"
-  integrity sha512-m6GV3y1ShiqxnyQj10600ZVOFrSSAa8HQ3qIUk2r+gcGtHTIRw0dJnFLt1WNXpKjtVw7yw1DAPU/6ma2ZvgJuA==
+"@babel/preset-typescript@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz#7d5d052e52a682480d6e2cc5aa31be61c8c25e36"
+  integrity sha512-SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-transform-typescript" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-transform-typescript" "^7.10.4"
 
-"@babel/register@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.10.1.tgz#b6567c5cb5049f44bbf8c35d6ff68ca3c43238ed"
-  integrity sha512-sl96+kB3IA2B9EzpwwBmYadOT14vw3KaXOknGDbJaZCOj52GDA4Tivudq9doCJcB+bEIKCEARZYwRgBBsCGXyg==
+"@babel/register@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.10.5.tgz#354f3574895f1307f79efe37a51525e52fd38d89"
+  integrity sha512-eYHdLv43nyvmPn9bfNfrcC4+iYNwdQ8Pxk1MFJuU/U5LpSYl/PH4dFMazCYZDFVi8ueG3shvO+AQfLrxpYulQw==
   dependencies:
     find-cache-dir "^2.0.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
     make-dir "^2.1.0"
     pirates "^4.0.0"
     source-map-support "^0.5.16"
@@ -1747,10 +1780,10 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.2":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
-  integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==
+"@babel/runtime@^7.11.2":
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
+  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -1775,14 +1808,14 @@
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/template@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
-  integrity sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==
+"@babel/template@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
+  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
   dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/parser" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
 "@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.4.5", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
   version "7.9.0"
@@ -1799,20 +1832,20 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/traverse@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27"
-  integrity sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/generator" "^7.10.1"
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/parser" "^7.10.1"
-    "@babel/types" "^7.10.1"
+"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.0.tgz#9b996ce1b98f53f7c3e4175115605d56ed07dd24"
+  integrity sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.0"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/parser" "^7.11.0"
+    "@babel/types" "^7.11.0"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
 
 "@babel/traverse@^7.7.4":
   version "7.9.5"
@@ -1838,13 +1871,13 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.10.1", "@babel/types@^7.10.2":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d"
-  integrity sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==
+"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.0.tgz#2ae6bf1ba9ae8c3c43824e5861269871b206e90d"
+  integrity sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
 "@babel/types@^7.3.3":
@@ -4306,11 +4339,6 @@
   resolved "https://registry.yarnpkg.com/@types/boom/-/boom-7.2.0.tgz#19c36cbb5811a7493f0f2e37f31d42b28df1abc1"
   integrity sha512-HonbGsHFbskh9zRAzA6tabcw18mCOsSEOL2ibGAuVqk6e7nElcRmWO5L4UfIHpDbWBWw+eZYFdsQ1+MEGgpcVA==
 
-"@types/browserslist-useragent@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/browserslist-useragent/-/browserslist-useragent-3.0.0.tgz#d425c9818182ce71ce53866798cee9c7d41d6e53"
-  integrity sha512-ZBvKzg3yyWNYEkwxAzdmUzp27sFvw+1m080/+2lwrt+eltNefn1f4fnpMyrjOla31p8zLleCYqQXw+3EETfn0w==
-
 "@types/cacheable-request@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.1.tgz#5d22f3dded1fd3a84c0bbeb5039a7419c2c91976"
@@ -8601,15 +8629,6 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist-useragent@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/browserslist-useragent/-/browserslist-useragent-3.0.2.tgz#f0e209b2742baa5de0e451b52e678e8b4402617c"
-  integrity sha512-/UPzK9xZnk5mwwWx4wcuBKAKx/mD3MNY8sUuZ2NPqnr4RVFWZogX+8mOP0cQEYo8j78sHk0hiDNaVXZ1U3hM9A==
-  dependencies:
-    browserslist "^4.6.6"
-    semver "^6.3.0"
-    useragent "^2.3.0"
-
 browserslist@4.6.6:
   version "4.6.6"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz#6e4bf467cde520bc9dbdf3747dafa03531cec453"
@@ -8629,7 +8648,7 @@ browserslist@^4.12.0:
     node-releases "^1.1.53"
     pkg-up "^2.0.0"
 
-browserslist@^4.6.6, browserslist@^4.8.3:
+browserslist@^4.8.3:
   version "4.8.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.5.tgz#691af4e327ac877b25e7a3f7ee869c4ef36cdea3"
   integrity sha512-4LMHuicxkabIB+n9874jZX/az1IaZ5a+EUuvD7KFOu9x/Bd5YHyO0DIz2ls/Kl8g0ItS4X/ilEgf4T1Br0lgSg==
@@ -20344,7 +20363,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.11, lodash@4.17.19, lodash@>4.17.4, lodash@^4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.10.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5:
+lodash@4.17.11, lodash@4.17.19, lodash@>4.17.4, lodash@^4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.10.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5:
   version "4.17.19"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
   integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
@@ -29564,13 +29583,6 @@ tmp@0.0.30:
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@0.0.x, tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 tmp@0.1.0, tmp@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
@@ -29585,6 +29597,13 @@ tmp@^0.0.29:
   dependencies:
     os-tmpdir "~1.0.1"
 
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -30711,14 +30730,6 @@ user-home@^2.0.0:
   dependencies:
     os-homedir "^1.0.0"
 
-useragent@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
-  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
-  dependencies:
-    lru-cache "4.1.x"
-    tmp "0.0.x"
-
 utif@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/utif/-/utif-2.0.1.tgz#9e1582d9bbd20011a6588548ed3266298e711759"