diff --git a/configs/webpack.config.web.prod.babel.js b/configs/webpack.config.web.prod.babel.js
index 214fc4773d..bffe500985 100644
--- a/configs/webpack.config.web.prod.babel.js
+++ b/configs/webpack.config.web.prod.babel.js
@@ -25,9 +25,10 @@ export default merge(commonConfig, {
   target: 'web',
   entry: ['regenerator-runtime/runtime', './index.tsx'],
   output: {
-    filename: 'js/bundle.[fullhash].min.js',
+    filename: 'js/bundle.[name].min.js',
     path: resolve(__dirname, '../redisinsight/ui/dist'),
     publicPath: '/',
+    chunkFilename: '[id].[chunkhash].js'
   },
   optimization: {
     minimize: true,
@@ -37,6 +38,34 @@ export default merge(commonConfig, {
       }),
       new CssMinimizerPlugin(),
     ],
+    runtimeChunk: 'single',
+    splitChunks: {
+      chunks: 'all',
+      maxInitialRequests: Infinity,
+      minSize: 0,
+      cacheGroups: {
+        reactVendor: {
+          test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/,
+          name: "reactVendor"
+        },
+        elasticVendor: {
+          test: /[\\/]node_modules[\\/](@elastic)[\\/]/,
+          name: "elasticVendor"
+        },
+        monacoVendor: {
+          test: /[\\/]node_modules[\\/](monaco-editor)[\\/]/,
+          name: "monacoVendor"
+        },
+        utilityVendor: {
+          test: /[\\/]node_modules[\\/](lodash)[\\/]/,
+          name: "utilityVendor"
+        },
+        vendor: {
+          test: /[\\/]node_modules[\\/](!@elastic)(!monaco-editor)(!lodash)[\\/]/,
+          name: "vendor"
+        },
+      },
+    },
   },
   plugins: [
     new MiniCssExtractPlugin({
diff --git a/redisinsight/ui/src/assets/img/workbench/vis_tag_cloud.svg b/redisinsight/ui/src/assets/img/workbench/vis_tag_cloud.svg
new file mode 100644
index 0000000000..22259f5eab
--- /dev/null
+++ b/redisinsight/ui/src/assets/img/workbench/vis_tag_cloud.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path d="M1.5002,9.04663086 C1.22405763,9.04663086 1.0002,9.27048848 1.0002,9.54663086 C1.0002,9.82277323 1.22405763,10.0466309 1.5002,10.0466309 L14.5002,10.0466309 C14.7763424,10.0466309 15.0002,9.82277323 15.0002,9.54663086 C15.0002,9.27048848 14.7763424,9.04663086 14.5002,9.04663086 L1.5002,9.04663086 Z M1.5002,8.04663086 L14.5002,8.04663086 C15.3286271,8.04663086 16.0002,8.71820373 16.0002,9.54663086 C16.0002,10.375058 15.3286271,11.0466309 14.5002,11.0466309 L1.5002,11.0466309 C0.671772875,11.0466309 0.0002,10.375058 0.0002,9.54663086 C0.0002,8.71820373 0.671772875,8.04663086 1.5002,8.04663086 Z M10,13 C10.2761424,13 10.5,13.2238576 10.5,13.5 C10.5,13.7761424 10.2761424,14 10,14 L4,14 C3.72385763,14 3.5,13.7761424 3.5,13.5 C3.5,13.2238576 3.72385763,13 4,13 L10,13 Z M8.00145269,2.01452848 C8.2775939,2.01533078 8.50080019,2.23983785 8.49999789,2.51597906 C8.49919559,2.79212027 8.27468852,3.01532655 7.99854731,3.01452426 L2.99874731,2.99999789 C2.7226061,2.99919559 2.49939981,2.77468852 2.50020211,2.49854731 C2.50100441,2.2224061 2.72551148,1.99919981 3.00165269,2.00000211 L8.00145269,2.01452848 Z M14,5 C14.2761424,5 14.5,5.22385763 14.5,5.5 C14.5,5.77614237 14.2761424,6 14,6 L6.0002,6 C5.72405763,6 5.5002,5.77614237 5.5002,5.5 C5.5002,5.22385763 5.72405763,5 6.0002,5 L14,5 Z"/>
+</svg>
diff --git a/redisinsight/ui/src/components/query-card/QueryCard.tsx b/redisinsight/ui/src/components/query-card/QueryCard.tsx
index 166fe60835..694ed6187b 100644
--- a/redisinsight/ui/src/components/query-card/QueryCard.tsx
+++ b/redisinsight/ui/src/components/query-card/QueryCard.tsx
@@ -4,7 +4,7 @@ import cx from 'classnames'
 import { EuiLoadingContent, keys } from '@elastic/eui'
 import { useParams } from 'react-router-dom'
 
-import { WBQueryType } from 'uiSrc/pages/workbench/constants'
+import { WBQueryType, ProfileQueryType } from 'uiSrc/pages/workbench/constants'
 import { RunQueryMode, ResultsMode, ResultsSummary } from 'uiSrc/slices/interfaces/workbench'
 import {
   getWBQueryType,
@@ -44,6 +44,7 @@ export interface Props {
   onQueryDelete: () => void
   onQueryReRun: () => void
   onQueryOpen: () => void
+  onQueryProfile: (type: ProfileQueryType) => void
 }
 
 const getDefaultPlugin = (views: IPluginVisualization[], query: string) =>
@@ -75,6 +76,7 @@ const QueryCard = (props: Props) => {
     createdAt,
     onQueryOpen,
     onQueryDelete,
+    onQueryProfile,
     onQueryReRun,
     loading,
     emptyCommand,
@@ -186,6 +188,7 @@ const QueryCard = (props: Props) => {
           setSelectedValue={changeViewTypeSelected}
           onQueryDelete={onQueryDelete}
           onQueryReRun={onQueryReRun}
+          onQueryProfile={onQueryProfile}
         />
         {isOpen && (
           <>
diff --git a/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx b/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx
index 9aeb779b54..09de6cefa7 100644
--- a/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx
+++ b/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx
@@ -32,7 +32,7 @@ import { numberWithSpaces } from 'uiSrc/utils/numbers'
 import { ThemeContext } from 'uiSrc/contexts/themeContext'
 import { appPluginsSelector } from 'uiSrc/slices/app/plugins'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
-import { getViewTypeOptions, WBQueryType } from 'uiSrc/pages/workbench/constants'
+import { getViewTypeOptions, WBQueryType, getProfileViewTypeOptions, ProfileQueryType, isCommandAllowedForProfile } from 'uiSrc/pages/workbench/constants'
 import { IPluginVisualization } from 'uiSrc/slices/interfaces'
 import { RunQueryMode, ResultsMode, ResultsSummary } from 'uiSrc/slices/interfaces/workbench'
 import { appRedisCommandsSelector } from 'uiSrc/slices/app/redis-commands'
@@ -70,6 +70,7 @@ export interface Props {
   setSelectedValue: (type: WBQueryType, value: string) => void
   onQueryDelete: () => void
   onQueryReRun: () => void
+  onQueryProfile: (type: ProfileQueryType) => void
 }
 
 const getExecutionTimeString = (value: number): string => {
@@ -109,6 +110,7 @@ const QueryCardHeader = (props: Props) => {
     setSelectedValue,
     onQueryDelete,
     onQueryReRun,
+    onQueryProfile,
     db,
   } = props
 
@@ -237,6 +239,30 @@ const QueryCardHeader = (props: Props) => {
     }
   })
 
+  const profileOptions: EuiSuperSelectOption<any>[] = (getProfileViewTypeOptions() as any[]).map((item) => {
+    const { value, id, text } = item
+    return {
+      value: id ?? value,
+      inputDisplay: (
+        <div className={cx(styles.dropdownOption, styles.dropdownProfileOption)}>
+          <EuiIcon
+            className={styles.iconDropdownOption}
+            type="visTagCloud"
+            data-testid={`view-type-selected-${value}-${id}`}
+          />
+        </div>
+      ),
+      dropdownDisplay: (
+        <div className={cx(styles.dropdownOption, styles.dropdownProfileOption)}>
+          <span>{truncateText(text, 20)}</span>
+        </div>
+      ),
+      'data-test-subj': `profile-type-option-${value}-${id}`,
+    }
+  })
+
+  const canCommandProfile = isCommandAllowedForProfile(query)
+
   const indexForSeparator = findIndex(pluginsOptions, (option) => !option.internal)
   if (indexForSeparator > -1) {
     modifiedOptions.splice(indexForSeparator + 1, 0, {
@@ -320,6 +346,26 @@ const QueryCardHeader = (props: Props) => {
             </EuiToolTip>
           )}
         </EuiFlexItem>
+        {isOpen && canCommandProfile && !summaryText && (
+          <EuiFlexItem
+            grow={false}
+            className={cx(styles.buttonIcon, styles.viewTypeIcon)}
+            onClick={onDropDownViewClick}
+          >
+            <div className={styles.dropdownWrapper}>
+              <div className={styles.dropdown}>
+                <EuiSuperSelect
+                  options={profileOptions}
+                  itemClassName={cx(styles.changeViewItem, styles.dropdownProfileItem)}
+                  className={cx(styles.changeView, styles.dropdownProfileIcon)}
+                  valueOfSelected={ProfileQueryType.Profile}
+                  onChange={(value: ProfileQueryType) => onQueryProfile(value)}
+                  data-testid="run-profile-type"
+                />
+              </div>
+            </div>
+          </EuiFlexItem>
+        )}
         <EuiFlexItem
           grow={false}
           className={cx(styles.buttonIcon, styles.viewTypeIcon)}
diff --git a/redisinsight/ui/src/components/query-card/QueryCardHeader/styles.module.scss b/redisinsight/ui/src/components/query-card/QueryCardHeader/styles.module.scss
index ab0914e231..c34d2a147a 100644
--- a/redisinsight/ui/src/components/query-card/QueryCardHeader/styles.module.scss
+++ b/redisinsight/ui/src/components/query-card/QueryCardHeader/styles.module.scss
@@ -127,6 +127,27 @@ $marginIcon: 12px;
   height: 40px;
 }
 
+.dropdownProfileIcon {
+  padding: inherit !important;
+  :global {
+    .euiSuperSelectControl.euiFormControlLayoutIcons {
+      display: none !important;
+    }
+  }
+}
+
+.dropdownProfileOption {
+  display: inherit !important;
+}
+
+.dropdownProfileItem {
+  :global {
+    .euiContextMenu__icon {
+      display: none !important;
+    }
+  }
+}
+
 .dropdown {
   width: 168px;
   position: absolute;
diff --git a/redisinsight/ui/src/components/uploadFile/UploadFile.spec.tsx b/redisinsight/ui/src/components/upload-file/UploadFile.spec.tsx
similarity index 100%
rename from redisinsight/ui/src/components/uploadFile/UploadFile.spec.tsx
rename to redisinsight/ui/src/components/upload-file/UploadFile.spec.tsx
diff --git a/redisinsight/ui/src/components/uploadFile/UploadFile.tsx b/redisinsight/ui/src/components/upload-file/UploadFile.tsx
similarity index 84%
rename from redisinsight/ui/src/components/uploadFile/UploadFile.tsx
rename to redisinsight/ui/src/components/upload-file/UploadFile.tsx
index 203fafa6af..38d5786b6b 100644
--- a/redisinsight/ui/src/components/uploadFile/UploadFile.tsx
+++ b/redisinsight/ui/src/components/upload-file/UploadFile.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { EuiButtonEmpty, EuiText } from '@elastic/eui'
+import { EuiButtonEmpty, EuiText, EuiIcon } from '@elastic/eui'
 
 import styles from './styles.module.scss'
 
@@ -10,10 +10,11 @@ export interface Props {
 
 const UploadFile = ({ onFileChange, onClick }: Props) => (
   <EuiButtonEmpty
-    iconType="folderOpen"
     className={styles.emptyBtn}
+    onClick={onClick}
   >
     <label htmlFor="upload-input-file" className={styles.uploadBtn}>
+      <EuiIcon className={styles.icon} type="folderOpen" />
       <EuiText className={styles.label}>Upload</EuiText>
       <input
         type="file"
@@ -21,7 +22,6 @@ const UploadFile = ({ onFileChange, onClick }: Props) => (
         data-testid="upload-input-file"
         accept="application/json, text/plain"
         onChange={onFileChange}
-        onClick={onClick}
         className={styles.fileDrop}
         aria-label="Select file"
       />
diff --git a/redisinsight/ui/src/components/uploadFile/index.ts b/redisinsight/ui/src/components/upload-file/index.ts
similarity index 100%
rename from redisinsight/ui/src/components/uploadFile/index.ts
rename to redisinsight/ui/src/components/upload-file/index.ts
diff --git a/redisinsight/ui/src/components/uploadFile/styles.module.scss b/redisinsight/ui/src/components/upload-file/styles.module.scss
similarity index 75%
rename from redisinsight/ui/src/components/uploadFile/styles.module.scss
rename to redisinsight/ui/src/components/upload-file/styles.module.scss
index 6d5396e6f5..1c087ddc2a 100644
--- a/redisinsight/ui/src/components/uploadFile/styles.module.scss
+++ b/redisinsight/ui/src/components/upload-file/styles.module.scss
@@ -5,6 +5,7 @@
 .uploadBtn {
   display: flex;
   cursor: pointer;
+  padding: 4px 12px;
 }
 
 .emptyBtn:global(.euiButtonEmpty) {
@@ -13,7 +14,14 @@
 }
 
 .emptyBtn:global(.euiButtonEmpty .euiButtonEmpty__content) {
-  padding: 0 12px;
+  padding: 0;
+}
+
+.emptyBtn .icon {
+  width: 14px;
+  height: 14px;
+  margin: 2px 4px 0 0;
+  color: var(--inputTextColor);
 }
 
 :global(.euiButtonEmpty.euiButtonEmpty--primary).emptyBtn .label {
diff --git a/redisinsight/ui/src/packages/clients-list/README.md b/redisinsight/ui/src/packages/clients-list/README.md
index dfb349d4e5..1c68459449 100644
--- a/redisinsight/ui/src/packages/clients-list/README.md
+++ b/redisinsight/ui/src/packages/clients-list/README.md
@@ -20,6 +20,9 @@ This command will generate the `vendor` folder with styles and fonts of the core
 inside the folder for your plugin and include appropriate styles to the `index.html` file.
 
 ```
+yarn
+yarn --cwd redisinsight/api/ install
+
 yarn build:statics - for Linux or MacOs
 yarn build:statics:win - for Windows
 ```
diff --git a/redisinsight/ui/src/packages/clients-list/package.json b/redisinsight/ui/src/packages/clients-list/package.json
index 4c0fa50114..b647c562b0 100644
--- a/redisinsight/ui/src/packages/clients-list/package.json
+++ b/redisinsight/ui/src/packages/clients-list/package.json
@@ -45,16 +45,13 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.12.0",
-    "@parcel/compressor-brotli": "^2.0.0",
-    "@parcel/compressor-gzip": "^2.0.0",
-    "@parcel/transformer-sass": "^2.0.0",
-    "@parcel/transformer-typescript-tsc": "^2.3.2",
+    "@parcel/transformer-sass": "2.3.2",
     "@types/node": "^17.0.21",
     "@types/react": "^17.0.40",
     "@types/react-dom": "^17.0.13",
     "concurrently": "^6.3.0",
     "cross-env": "^7.0.3",
-    "parcel": "^2.0.0",
+    "parcel": "2.3.2",
     "rimraf": "^3.0.2",
     "terser": "^5.9.0",
     "typescript": ">=3.0.0"
diff --git a/redisinsight/ui/src/packages/clients-list/src/index.html b/redisinsight/ui/src/packages/clients-list/src/index.html
index 2254419e39..7225fea8db 100644
--- a/redisinsight/ui/src/packages/clients-list/src/index.html
+++ b/redisinsight/ui/src/packages/clients-list/src/index.html
@@ -5,13 +5,13 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Client list plugin</title>
-  <link rel="stylesheet" href="../../../RedisInsight/vendor/global_styles.css" />
-  <link rel="stylesheet" href="../../../RedisInsight/vendor/dark_theme.css" />
-  <!-- <link rel="stylesheet" href="../../../RedisInsight/vendor/light_theme.css" /> -->
+  <link rel="stylesheet" href="../../../../../../vendor/global_styles.css" type="text/css" />
+  <link rel="stylesheet" href="../../../../../../vendor/dark_theme.css" type="text/css" />
+  <!-- <link rel="stylesheet" href="../../../../../../vendor/light_theme.css" /> -->
   <link rel="stylesheet" href="./styles/styles.scss" />
 </head>
 <body>
   <div id="app"></div>
-  <script src="./main.tsx"></script>
+  <script type="module" src="./main.tsx"></script>
 </body>
 </html>
diff --git a/redisinsight/ui/src/packages/redisearch/package.json b/redisinsight/ui/src/packages/redisearch/package.json
index 3cee132061..20bb91824c 100644
--- a/redisinsight/ui/src/packages/redisearch/package.json
+++ b/redisinsight/ui/src/packages/redisearch/package.json
@@ -43,6 +43,18 @@
       "iconLight": "./dist/table_view_icon_light.svg",
       "description": "RediSearch default plugin",
       "default": true
+    },
+    {
+      "id": "redisearch-profile",
+      "name": "Table",
+      "activationMethod": "renderRediSearch",
+      "matchCommands": [
+        "FT.PROFILE"
+      ],
+      "iconDark": "./dist/table_view_icon_dark.svg",
+      "iconLight": "./dist/table_view_icon_light.svg",
+      "description": "RediSearch default plugin",
+      "default": false
     }
   ],
   "devDependencies": {
diff --git a/redisinsight/ui/src/packages/redisearch/src/App.tsx b/redisinsight/ui/src/packages/redisearch/src/App.tsx
index 5b2ceab1db..ed0b710e71 100644
--- a/redisinsight/ui/src/packages/redisearch/src/App.tsx
+++ b/redisinsight/ui/src/packages/redisearch/src/App.tsx
@@ -9,7 +9,7 @@ import {
   parseSearchRawResponse,
   parseAggregateRawResponse
 } from './utils'
-import { Command } from './constants'
+import { Command, ProfileType } from './constants'
 import { TableInfoResult, TableResult } from './components'
 
 interface Props {
@@ -35,16 +35,25 @@ const App = (props: Props) => {
     return <TableInfoResult query={command} result={result} />
   }
 
-  if (commandUpper.startsWith(Command.Aggregate)) {
-    const [matched, ...arrayResponse] = response
+  const isProfileCommand = commandUpper.startsWith(Command.Profile)
+  const profileQueryType = command?.split(' ')?.[2]
+
+  if (
+    commandUpper.startsWith(Command.Aggregate)
+    || (isProfileCommand && profileQueryType.toUpperCase() === ProfileType.Aggregate)
+  ) {
+    const [matched, ...arrayResponse] = isProfileCommand ? response[0] : response
     setHeaderText(`Matched:${matched}`)
 
     const result = parseAggregateRawResponse(arrayResponse)
     return <TableResult query={command} result={result} matched={matched} />
   }
 
-  if (commandUpper.startsWith(Command.Search)) {
-    const [matched, ...arrayResponse] = response
+  if (
+    commandUpper.startsWith(Command.Search)
+    || (isProfileCommand && profileQueryType.toUpperCase() === ProfileType.Search)
+  ) {
+    const [matched, ...arrayResponse] = isProfileCommand ? response[0] : response
     setHeaderText(`Matched:${matched}`)
 
     const result = parseSearchRawResponse(command, arrayResponse)
diff --git a/redisinsight/ui/src/packages/redisearch/src/constants/constants.ts b/redisinsight/ui/src/packages/redisearch/src/constants/constants.ts
index 021c8b9e06..76aa3e490e 100644
--- a/redisinsight/ui/src/packages/redisearch/src/constants/constants.ts
+++ b/redisinsight/ui/src/packages/redisearch/src/constants/constants.ts
@@ -4,6 +4,12 @@ export enum Command {
   Search = 'FT.SEARCH',
   Aggregate = 'FT.AGGREGATE',
   Info = 'FT.INFO',
+  Profile = 'FT.PROFILE',
+}
+
+export enum ProfileType {
+  Search = 'SEARCH',
+  Aggregate = 'AGGREGATE',
 }
 
 export enum CommandArgument {
diff --git a/redisinsight/ui/src/packages/ri-explain/README.md b/redisinsight/ui/src/packages/ri-explain/README.md
new file mode 100644
index 0000000000..d5b2221dd1
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/README.md
@@ -0,0 +1 @@
+# RI-Explain plugin
\ No newline at end of file
diff --git a/redisinsight/ui/src/packages/ri-explain/package.json b/redisinsight/ui/src/packages/ri-explain/package.json
new file mode 100644
index 0000000000..8fb14c1f79
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/package.json
@@ -0,0 +1,72 @@
+{
+  "author": {
+    "name": "Redis Ltd.",
+    "email": "support@redis.com",
+    "url": "https://redis.com/redis-enterprise/redis-insight"
+  },
+  "bugs": {
+    "url": "https://github.com/"
+  },
+  "description": "Show Profile/Explain Visualization",
+  "source": "./src/main.tsx",
+  "styles": "./dist/styles.css",
+  "main": "./dist/index.js",
+  "name": "explain-plugin",
+  "version": "0.0.1",
+  "scripts": {
+    "start": "cross-env NODE_ENV=development parcel serve src/index.html",
+    "build": "rimraf dist && cross-env NODE_ENV=production concurrently \"yarn build:js && yarn minify:js\" \"yarn build:css\" \"yarn build:assets\"",
+    "build-lite": "rm dist/*.js && cross-env NODE_ENV=production concurrently \"yarn build:js && yarn minify:js\"",
+    "build:js": "parcel build src/main.tsx --dist-dir dist",
+    "build:css": "parcel build src/styles/styles.less --dist-dir dist",
+    "build:assets": "parcel build src/assets/**/* --dist-dir dist",
+    "minify:js": "terser -- dist/main.js > dist/index.js && rimraf dist/main.js"
+  },
+  "targets": {
+    "main": false,
+    "module": {
+      "includeNodeModules": true
+    }
+  },
+  "visualizations": [
+    {
+      "id": "profile-explain-viz",
+      "name": "Visualization",
+      "activationMethod": "renderCore",
+      "matchCommands": [
+        "FT.EXPLAIN",
+        "FT.EXPLAINCLI",
+        "FT.PROFILE",
+        "GRAPH.EXPLAIN",
+        "GRAPH.PROFILE"
+      ],
+      "iconDark": "./dist/profile_icon_dark.svg",
+      "iconLight": "./dist/profile_icon_light.svg",
+      "description": "Profile/Explain plugin Visualization",
+      "default": true
+    }
+  ],
+  "devDependencies": {
+    "@parcel/compressor-brotli": "^2.0.0",
+    "@parcel/compressor-gzip": "^2.0.0",
+    "@parcel/transformer-less": "^2.3.2",
+    "concurrently": "^6.3.0",
+    "cross-env": "^7.0.3",
+    "parcel": "^2.0.0",
+    "rimraf": "^3.0.2",
+    "terser": "^5.9.0"
+  },
+  "dependencies": {
+    "@antv/hierarchy": "^0.6.8",
+    "@antv/x6": "^2.1.3",
+    "@antv/x6-react-shape": "^2.1.0",
+    "@elastic/eui": "34.6.0",
+    "@emotion/react": "^11.7.1",
+    "classnames": "^2.3.1",
+    "prop-types": "^15.8.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "redisinsight-plugin-sdk": "^1.1.0",
+    "uuid": "^9.0.0"
+  }
+}
diff --git a/redisinsight/ui/src/packages/ri-explain/src/App.tsx b/redisinsight/ui/src/packages/ri-explain/src/App.tsx
new file mode 100644
index 0000000000..8fd8eaeb5c
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/App.tsx
@@ -0,0 +1,25 @@
+import React from 'react'
+import Explain from './Explain'
+
+export function App(props: { command?: string, data: any }) {
+
+  const ErrorResponse = HandleError(props)
+
+  if (ErrorResponse !== null) return ErrorResponse
+
+  return (
+    <div id="mainApp" style={{ height: "100%", width: '100%', overflow: 'hidden'}}>
+      <Explain command={props.command || ''} data={props.data}/>
+    </div>
+  )
+}
+
+function HandleError(props: { command?: string, data: any }): JSX.Element  | null {
+  const { data: [{ response = '', status = '' } = {}] = [] } = props
+
+  if (status === 'fail') {
+    return <div className="responseFail">{JSON.stringify(response)}</div>
+  }
+
+  return null
+}
diff --git a/redisinsight/ui/src/packages/ri-explain/src/Explain.tsx b/redisinsight/ui/src/packages/ri-explain/src/Explain.tsx
new file mode 100644
index 0000000000..649afcbb06
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/Explain.tsx
@@ -0,0 +1,570 @@
+import React, { useEffect, useState, useRef } from 'react'
+import { Model, Graph } from '@antv/x6'
+import { register} from '@antv/x6-react-shape'
+import Hierarchy from '@antv/hierarchy'
+import { formatRedisReply } from 'redisinsight-plugin-sdk'
+
+import {
+  EuiButtonIcon,
+  EuiToolTip,
+  EuiIcon,
+} from '@elastic/eui'
+
+import {
+  EDGE_COLOR_BODY_DARK,
+  EDGE_COLOR_BODY_LIGHT,
+  NODE_COLOR_BODY_DARK,
+  NODE_COLOR_BODY_LIGHT,
+} from './constants'
+
+import {
+  CoreType,
+  ModuleType,
+  EntityInfo,
+  ParseExplain,
+  ParseGraphV2,
+  ParseProfile,
+  ParseProfileCluster,
+  GetAncestors,
+  GetTotalExecutionTime,
+} from './parser'
+import { ExplainNode, ProfileNode } from './Node'
+
+interface IExplain {
+  command: string
+  data: [{response: string[] | string | any}]
+}
+
+function getEdgeSize(c: number) {
+  return Math.floor(Math.log(c || 1) + 1)
+}
+
+function getNodeColor(isDarkTheme: boolean) {
+  return isDarkTheme ? NODE_COLOR_BODY_DARK : NODE_COLOR_BODY_LIGHT
+}
+
+function getEdgeColor(isDarkTheme: boolean) {
+  return isDarkTheme ? EDGE_COLOR_BODY_DARK : EDGE_COLOR_BODY_LIGHT
+}
+
+export default function Explain(props: IExplain): JSX.Element {
+  const command = props.command.split(' ')[0].toLowerCase()
+  if (command.startsWith('graph')) {
+    const info  = props.data[0].response
+    const resp = ParseGraphV2(info)
+
+    let profilingTime: IProfilingTime = {}
+    let t = command.endsWith('explain') ? CoreType.Explain : CoreType.Profile
+    if (t === CoreType.Profile) {
+      profilingTime = {
+        'Total Execution Time': GetTotalExecutionTime(resp)
+      }
+    }
+
+    return (
+      <ExplainDraw
+        data={resp}
+        module={ModuleType.Graph}
+        type={t}
+        profilingTime={profilingTime}
+      />
+    )
+  }
+
+  const module = ModuleType.Search
+
+  const [parsedRedisReply, setParsedRedisReply] = useState('')
+
+  useEffect(() => {
+    if (command == 'ft.profile') {
+      const getParsedResponse = async () => {
+        const formattedResponse = await formatRedisReply(props.data[0].response, props.command)
+        setParsedRedisReply(formattedResponse)
+      }
+      getParsedResponse()
+    }
+  })
+
+  if (command == 'ft.profile') {
+    const info = props.data[0].response[1]
+
+    let data: EntityInfo
+    let profilingTime: IProfilingTime = {}
+
+    if (info.length > 5 && typeof info[0] === 'string' && info[0].toLowerCase().startsWith('shard')) {
+      let [cluster, entityInfo] = ParseProfileCluster(info)
+      cluster['Coordinator'].forEach((kv: [string, string]) => profilingTime[kv[0]] = kv[1])
+      data = entityInfo
+      return (
+        <>
+          <div className="responseFail">Visualization is not supported for a clustered database.</div>
+          <div className="parsedRedisReply">{parsedRedisReply}</div>
+        </>
+      )
+    } else if (typeof info[0] === 'string' && info[0].toLowerCase().startsWith('coordinator')) {
+      const resultsProfile = info[2]
+      data = ParseProfile(resultsProfile)
+      profilingTime = {
+        'Total Coordinator time': info[4],
+        'Total profile time': resultsProfile[0][1],
+        'Parsing time': resultsProfile[1][1],
+        'Pipeline creation time': resultsProfile[2][1],
+      }
+      return (
+        <>
+          <div className="responseFail">Visualization is not supported for a clustered database.</div>
+          <div className="parsedRedisReply">{parsedRedisReply}</div>
+        </>
+      )
+    } else {
+      data = ParseProfile(info)
+      profilingTime = {
+        'Total Profile Time': info[0][1],
+        'Parsing Time': info[1][1],
+        'Pipeline Creation Time': info[2][1],
+      }
+    }
+
+    return (
+      <ExplainDraw
+        data={data}
+        module={module}
+        type={CoreType.Profile}
+        profilingTime={profilingTime}
+      />
+    )
+  }
+
+  const resp = props.data[0].response
+
+  const data = ParseExplain(
+    Array.isArray(resp) ? resp.join('\n') : resp.split('\\n').join('\n')
+  )
+  return (
+    <ExplainDraw
+      data={data}
+      module={module}
+      type={CoreType.Explain}
+    />
+  )
+}
+
+register({
+  shape: 'react-explain-node',
+  width: 100,
+  height: 100,
+  component: ExplainNode as any
+})
+
+register({
+  shape: 'react-profile-node',
+  width: 100,
+  height: 100,
+  component: ProfileNode as any,
+})
+
+const isDarkTheme = document.body.classList.contains('theme_DARK')
+
+interface IProfilingTime {
+  [key: string]: string
+}
+
+function ExplainDraw({data, type, module, profilingTime}: {data: any, type: CoreType, module: ModuleType, profilingTime?: IProfilingTime}): JSX.Element {
+  const container = useRef<HTMLDivElement | null>(null)
+
+  const [done, setDone] = useState(false)
+  const [collapse, setCollapse] = useState(type !== CoreType.Profile)
+  const [isFullScreen, setIsFullScreen] = useState(false)
+  const [core, setCore] = useState<Graph>()
+
+  function resize() {
+    const isFullScreen = parent.document.body.getElementsByClassName('fullscreen').length > 0
+    const b = core?.getAllCellsBBox()
+    const width = Math.max((b?.width || 1080) + 100, document.body.offsetWidth)
+    if (isFullScreen) {
+      setIsFullScreen(true)
+      const height = Math.max((b?.height || 585) + 100, parent.document.body.offsetHeight)
+      if (type !== CoreType.Profile && collapse) {
+        core?.resize(width, window.outerHeight - 250)
+        core?.positionContent("top")
+      } else {
+        core?.resize(width, height)
+      }
+    } else {
+      setIsFullScreen(false)
+      if (type !== CoreType.Profile && collapse) {
+        core?.resize(width, 400)
+        core?.positionContent("top")
+      } else {
+        core?.resize(width, (b?.height || 585) + 100)
+      }
+    }
+  }
+
+  window.addEventListener('resize', resize)
+  useEffect(() => {
+
+    if (done) return
+    setDone(true)
+
+    const graph = new Graph({
+      container: container?.current as HTMLElement,
+      autoResize: false,
+      interacting: false,
+      background: {
+        color: isDarkTheme ? 'black' : 'white',
+      },
+      translating: {
+        restrict: true,
+      },
+      async: true,
+      virtual: true,
+    })
+
+    setCore(graph)
+
+    graph.on("resize", () => graph.centerContent())
+    graph.on("node:mouseenter", x => {
+      const {id} = x.node.getData()
+      // Find ancestors of a node
+      const ancestors = GetAncestors(data, id, {found: false, pairs: []})
+      ancestors.pairs.forEach(p => {
+        // Highlight ancestor and their ancestor
+        document.querySelector(`#node-${p[0]}`)?.setAttribute("style", "outline: 1px solid #85A2FE !important;")
+        // Get edge size of parent ancestor to apply the right edge stroke
+        const edge = graph.getCellById(`${p[0]}-${p[1]}`)
+        const edgeColor = '#85A2FE'
+        edge.setAttrs({
+          line: {
+            stroke: edgeColor,
+            strokeWidth: (edge.getAttrs() as any)?.line?.strokeWidth,
+          },
+        })
+      })
+    })
+
+    graph.on("node:mouseleave", x => {
+      const {id} = x.node.getData()
+      const ancestors = GetAncestors(data, id, {found: false, pairs: []})
+      ancestors.pairs.forEach(p => {
+        document.querySelector(`#node-${p[0]}`)?.setAttribute("style", "")
+        const edge = graph.getCellById(`${p[0]}-${p[1]}`)
+        const edgeColor = getEdgeColor(isDarkTheme)
+        edge.setAttrs({
+          line: {
+            stroke: edgeColor,
+            strokeWidth: (edge.getAttrs() as any)?.line?.strokeWidth,
+          },
+        })
+      })
+    })
+
+    resize()
+
+    const result = Hierarchy.compactBox(data, {
+      direction: 'BT',
+      getHeight() {
+        return 200
+      },
+      getWidth() {
+        return 250
+      },
+      getHGap() {
+        return 50
+      },
+      getVGap() {
+        return 0
+      },
+      nodeSep: type === CoreType.Explain ? 250 : 350,
+      rankSep: 150,
+      subTreeSep: 0,
+    })
+
+    const model: Model.FromJSONData = { nodes: [], edges: [] }
+    const traverse = (data: any) => {
+      if (data) {
+        const info = data.data as EntityInfo
+
+        // snippet if prefix with parent suffix will always be followed by ':'.
+        //
+        // Currently snippets are passed to child only for TAG
+        // expressions which has ':' at the center.
+        //
+        // Example child data with parent snippet: <PARENT_SNIPPET>:<DATA>
+        if (!info.snippet && info.parentSnippet && info.data?.startsWith(`${info.parentSnippet}:`)) {
+          info.data = info.data.substr(info.parentSnippet.length + 1)
+          info.snippet = info.parentSnippet
+        }
+
+        if (module === ModuleType.Graph) {
+          info.recordsProduced = info.counter
+          delete info.counter
+          delete info.size
+        }
+
+        let nodeProps = {
+          shape: 'react-explain-node',
+          width: 240,
+          height: (info.snippet ? 64 : 42),
+        }
+        if (type === CoreType.Profile) {
+          nodeProps = {
+            shape: 'react-profile-node',
+            width: 320,
+            height: (info.snippet ? 114 : 86),
+          }
+        }
+
+
+        const portId = data.id + '-source'
+        let targetPort = {}
+        const targetItem: any = []
+        if (info.parentId) {
+          targetItem.push({id: `${info.id}-${info.parentId}-target`, group: `${info.parentId}-target`})
+          targetPort[info.parentId+'-target'] = {
+            position: { name: 'bottom' },
+            attrs: {
+              circle: {
+                r: 0
+              }
+            }
+          }
+        }
+        model.nodes?.push({
+          id: data.id,
+          x: (data.x || 0) + document.body.clientWidth / 2,
+          y: (data.y || 0) + document.body.clientHeight,
+          ...nodeProps,
+          data: info,
+          attrs: {
+            body: {
+              fill: getNodeColor(isDarkTheme),
+              stroke: 'transparent',
+            },
+          },
+          ports: {
+            groups: {
+              [portId]: {
+                position: { name: 'top' },
+                attrs: {
+                  circle: {
+                    r: 0
+                  }
+                }
+              },
+              ...targetPort,
+            },
+            items: [
+              ...data.children.map(c => ({
+                id: `${data.id}-${c.id}`, group: portId
+              })),
+              ...targetItem,
+            ],
+          },
+        })
+      }
+      if (data.children) {
+        data.children.forEach((item: any) => {
+          const itemRecords = parseInt(item.data.counter || 0)
+          const edgeColor = getEdgeColor(isDarkTheme)
+          model.edges?.push({
+            id: `${data.id}-${item.id}`,
+            source: {
+              cell: data.id,
+              port: `${data.id}-${item.id}`,
+            },
+            target: {
+              cell: item.id,
+              port: `${data.id}-${item.id}`
+            },
+            router: {
+              name: 'manhattan',
+              args: {
+                startDirections: ['top'],
+                endDirections: ['bottom'],
+                // cost: 33,
+                // step: 10,
+                padding: {
+                  top: 15,
+                  bottom: 10,
+                  right: 20,
+                  left: 10,
+                }
+              },
+            },
+            attrs: {
+              line: {
+                stroke: edgeColor,
+                strokeWidth: getEdgeSize(itemRecords),
+                targetMarker: null,
+              },
+            },
+          })
+          traverse(item)
+        })
+      }
+    }
+    traverse(result)
+
+    graph.fromJSON(model)
+
+    graph.centerContent()
+
+  }, [done])
+
+    const ele = document.querySelector("#container-parent")
+
+    let pos = { top: 0, left: 0, x: 0, y: 0 }
+
+    const mouseMoveHandler = function (e) {
+      // How far the mouse has been moved
+      const dx = e.clientX - pos.x
+      const dy = e.clientY - pos.y
+
+      // Scroll the element
+      if (ele) {
+        ele.scrollTop = pos.top - dy
+        ele.scrollLeft = pos.left - dx
+      }
+    }
+
+
+    const mouseUpHandler = function () {
+      document.removeEventListener('mousemove', mouseMoveHandler)
+      document.removeEventListener('mouseup', mouseUpHandler)
+    }
+
+
+    const mouseDownHandler = function (e) {
+      pos = {
+        // The current scroll
+        left: ele?.scrollLeft || 0,
+        top: ele?.scrollTop || 0,
+        // Get the current mouse position
+        x: e.clientX,
+        y: e.clientY,
+      }
+
+      document.addEventListener('mousemove', mouseMoveHandler)
+      setTimeout(() => document.addEventListener('mouseup', mouseUpHandler), 100)
+    }
+
+    ele?.addEventListener('mousedown', mouseDownHandler)
+
+
+  if (type !== CoreType.Profile && collapse) {
+    core?.resize(undefined, isFullScreen ? (window.outerHeight - 250) : 400)
+    core?.positionContent("top")
+  } else {
+    core?.resize(undefined, core?.getContentBBox().height + 100)
+  }
+
+  return (
+    <div>
+      { type !== CoreType.Profile && collapse && <div style={{ paddingTop: '50px' }}></div> }
+      <div
+        id="container-parent"
+        style={{
+          height: isFullScreen ? (window.outerHeight - 170) + 'px' : type !== CoreType.Profile && collapse ? '500px' : '585px',
+          width: '100%',
+          overflow: 'auto',
+        }}
+      >
+        <div style={{ margin: 0, width: '100vw' }} ref={container} id="container" />
+        { !(collapse) && (
+          <div className="ZoomMenu">
+            {
+              [
+                {
+                  name: 'Zoom In',
+                  onClick: () => {
+                    setTimeout(() => document.addEventListener('mouseup', mouseUpHandler), 100)
+                    core && Math.floor(core.zoom()) <= 3 && core?.zoom(0.5)
+                    core?.resize(undefined, core?.getContentBBox().height + 50)
+                  },
+                  icon: 'magnifyWithPlus'
+                },
+                {
+                  name: 'Zoom Out',
+                  onClick: () => {
+                    setTimeout(() => document.addEventListener('mouseup', mouseUpHandler), 100)
+                    if (Math.floor(core?.zoom() || 0) <= 0.5) {
+                      core?.centerContent()
+                    } else {
+                      core?.zoom(-0.5)
+                    }
+                    core?.resize(undefined, core?.getContentBBox().height + 50)
+                  },
+                  icon: 'magnifyWithMinus'
+                },
+                {
+                  name: 'Reset Zoom',
+                  onClick: () => {
+                    setTimeout(() => document.addEventListener('mouseup', mouseUpHandler), 100)
+                    core?.zoomTo(1)
+                    core?.resize(undefined, core?.getContentBBox().height + 50)
+                  },
+                  icon: 'bullseye'
+                },
+              ].map(item => (
+                <EuiToolTip position="left" content={item.name}>
+                  <EuiButtonIcon
+                    color='text'
+                    onClick={item.onClick}
+                    iconType={item.icon}
+                    aria-label={item.name}
+                  />
+                </EuiToolTip>
+              ))
+            }
+          </div>
+        )}
+        { type !== CoreType.Profile &&
+          <div
+            style={{ paddingBottom: (isFullScreen && profilingTime && ModuleType.Search ? '60px' : '35px')}}
+            className="CollapseButton"
+            onClick={e => {
+              e.preventDefault()
+              setTimeout(() => document.addEventListener('mouseup', mouseUpHandler), 100)
+              if (!collapse) {     // About to collapse?
+                core?.zoomTo(1)
+                core?.resize(undefined, core?.getContentBBox().height + 50)
+              }
+              setCollapse(!collapse)
+            }}
+          >
+            {
+              collapse
+                ?
+                <>
+                  <div>Expand</div>
+                  <EuiIcon className="NodeIcon" size="m" type="arrowDown" />
+                </>
+                :
+                <>
+                  <div>Collapse</div>
+                  <EuiIcon className="NodeIcon" size="m" type="arrowUp" />
+                </>
+            }
+          </div>
+        }
+        { profilingTime &&
+          (
+            module === ModuleType.Search &&
+              (
+                <div className="ProfileInfo ProfileTimeInfo">
+                  {
+                    Object.keys(profilingTime).map(key => (
+                      <div className="Item">
+                        <div className="Value">{profilingTime[key]}</div>
+                        <div className="Key">{key}</div>
+                      </div>
+                    ))
+                  }
+                </div>
+              )
+          )}
+      </div>
+    </div>
+  )
+}
diff --git a/redisinsight/ui/src/packages/ri-explain/src/Node.tsx b/redisinsight/ui/src/packages/ri-explain/src/Node.tsx
new file mode 100644
index 0000000000..c8d46fb24a
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/Node.tsx
@@ -0,0 +1,126 @@
+import React from 'react'
+import { EuiToolTip, EuiIcon } from '@elastic/eui'
+import { EntityInfo, EntityType } from './parser'
+
+interface INodeProps {
+  label: string
+  numRecords?: string
+  executionTime?: string
+  snippet?: string
+}
+
+
+function Snippet({content}: {content: string}) {
+  return (
+    <div className="FooterCommon Footer">
+      <EuiToolTip delay='long' content={content}><span>{content}</span></EuiToolTip>
+    </div>
+  )
+}
+
+export function ExplainNode(props: INodeProps) {
+  const propData: EntityInfo = (props as any).node.getData()
+  const { id, type, data, snippet, subType } = propData
+
+  const infoData = data ? data : type
+
+  return (
+    <div className="ExplainContainer" id={`node-${id}`}>
+      <div className="Main">
+        <div className="Info">
+          <div className="InfoData">
+            <EuiToolTip delay='long' content={infoData}><span>{infoData}</span></EuiToolTip>
+          </div>
+          {subType && [EntityType.GEO, EntityType.NUMERIC, EntityType.TEXT, EntityType.TAG, EntityType.FUZZY, EntityType.WILDCARD, EntityType.PREFIX, EntityType.IDS, EntityType.LEXRANGE, EntityType.NUMBER].includes(subType) && <div className="Type">{subType}</div> }
+        </div>
+      </div>
+      {
+        snippet && <Snippet content={snippet} />
+      }
+    </div>
+  )
+}
+
+
+
+interface INodeToolTip {
+  content?: string
+  items?: {[key: string]: string}
+}
+
+function NodeToolTipContent(props: INodeToolTip) {
+
+  if (props.content !== undefined) {
+    return <div className='NodeToolTip'>{props.content}</div>
+  }
+
+  if (props.items !== undefined) {
+    let items = props.items
+    return (
+      <div className="NodeToolTip">
+        {
+          Object.keys(items).map(k => (
+            <div className="NodeToolTipItem">{k}: {items[k]}</div>
+          ))
+        }
+      </div>
+    )
+  }
+
+  return null
+}
+
+export function ProfileNode(props: INodeProps) {
+  const info: EntityInfo = (props as any).node.getData()
+  const {id, data, type, snippet, time, counter, size, recordsProduced} = info
+
+  let items = {}
+
+  if (counter !== undefined) {
+    items['Counter'] = counter
+  }
+
+  if (size !== undefined) {
+    items['Size'] = size
+  }
+
+  const infoData = data ? data : type
+  return (
+    <div className="ProfileContainer" id={`node-${id}`}>
+      <div className="Main">
+        <div className="InfoData">
+          <EuiToolTip delay='long' content={infoData}><span>{infoData}</span></EuiToolTip>
+        </div>
+        <div className="Type">{[EntityType.GEO, EntityType.NUMERIC, EntityType.TEXT, EntityType.TAG].includes(type) ? type : ''}</div>
+      </div>
+      {
+        snippet && <Snippet content={snippet} />
+      }
+      <div className="MetaData">
+        <EuiToolTip content={<NodeToolTipContent content={"Execution Time"} />}>
+          <div className="Time">
+            <div className="IconContainer"><EuiIcon className="NodeIcon" size="m" type="clock" /></div>
+            <div>{time} ms</div>
+          </div>
+        </EuiToolTip>
+        <EuiToolTip
+          content={
+            <NodeToolTipContent
+              {...{
+                items: recordsProduced === undefined ? items : undefined,
+                content: recordsProduced ? 'Records produced' : undefined
+              }}
+            />
+          }
+        >
+          <div className="Size">
+            <div>{
+              counter !== undefined ? counter :
+                size !== undefined ? size : recordsProduced}</div>
+            <div className="IconContainer"><EuiIcon className="NodeIcon" size="m" type="reportingApp" /></div>
+          </div>
+        </EuiToolTip>
+      </div>
+    </div>
+  )
+}
diff --git a/redisinsight/ui/src/packages/ri-explain/src/assets/profile_icon_dark.svg b/redisinsight/ui/src/packages/ri-explain/src/assets/profile_icon_dark.svg
new file mode 100644
index 0000000000..f335f3f6cb
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/assets/profile_icon_dark.svg
@@ -0,0 +1,7 @@
+<svg width="19" height="14" viewBox="0 0 19 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="10.5" y="0.5" width="8" height="4" rx="0.5" stroke="#dfe5ef"/>
+<rect x="10.5" y="9.5" width="8" height="4" rx="0.5" stroke="#dfe5ef"/>
+<rect x="0.5" y="9.5" width="8" height="4" rx="0.5" stroke="#dfe5ef"/>
+<rect x="14" y="4" width="1" height="6" fill="#dfe5ef"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.5 7C14.7761 7 15 6.77614 15 6.5V6.5C15 6.22386 14.7761 6 14.5 6H5C4.44772 6 4 6.44772 4 7V7V9.5C4 9.77614 4.22386 10 4.5 10V10C4.77614 10 5 9.77614 5 9.5V8C5 7.44772 5.44772 7 6 7L14.5 7Z" fill="#dfe5ef"/>
+</svg>
diff --git a/redisinsight/ui/src/packages/ri-explain/src/assets/profile_icon_light.svg b/redisinsight/ui/src/packages/ri-explain/src/assets/profile_icon_light.svg
new file mode 100644
index 0000000000..c092a49e88
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/assets/profile_icon_light.svg
@@ -0,0 +1,7 @@
+<svg width="19" height="14" viewBox="0 0 19 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="10.5" y="0.5" width="8" height="4" rx="0.5" stroke="#728baf"/>
+<rect x="10.5" y="9.5" width="8" height="4" rx="0.5" stroke="#728baf"/>
+<rect x="0.5" y="9.5" width="8" height="4" rx="0.5" stroke="#728baf"/>
+<rect x="14" y="4" width="1" height="6" fill="#728baf"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.5 7C14.7761 7 15 6.77614 15 6.5V6.5C15 6.22386 14.7761 6 14.5 6H5C4.44772 6 4 6.44772 4 7V7V9.5C4 9.77614 4.22386 10 4.5 10V10C4.77614 10 5 9.77614 5 9.5V8C5 7.44772 5.44772 7 6 7L14.5 7Z" fill="#728baf"/>
+</svg>
diff --git a/redisinsight/ui/src/packages/ri-explain/src/constants.ts b/redisinsight/ui/src/packages/ri-explain/src/constants.ts
new file mode 100644
index 0000000000..2abfeaa89f
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/constants.ts
@@ -0,0 +1,6 @@
+export const NODE_COLOR_BODY_DARK = '#5F95FF'
+export const NODE_COLOR_BODY_LIGHT = '#8992B3'
+
+export const EDGE_COLOR_BODY_DARK = '#6B6B6B'
+export const EDGE_COLOR_BODY_LIGHT = '#8992B3'
+
diff --git a/redisinsight/ui/src/packages/ri-explain/src/index.html b/redisinsight/ui/src/packages/ri-explain/src/index.html
new file mode 100644
index 0000000000..ddb4447fc8
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Profile/Explain Plugin Visualization</title>
+  <script type="module" src="./main.tsx"></script>
+  <link rel="stylesheet" href="../../../../../..//global_styles.css" />
+  <link rel="stylesheet" href="./styles/dark_theme.scss" />
+  <link rel="stylesheet" href="./styles/light_theme.scss" />
+  <link rel="stylesheet" href="./styles/styles.scss" />
+
+</head>
+<body>
+  <div id="app"></div>
+</body>
+</html>
diff --git a/redisinsight/ui/src/packages/ri-explain/src/main.tsx b/redisinsight/ui/src/packages/ri-explain/src/main.tsx
new file mode 100644
index 0000000000..3fd1f2bf62
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/main.tsx
@@ -0,0 +1,42 @@
+/* eslint-disable react/jsx-filename-extension */
+import React from 'react'
+import { render } from 'react-dom'
+import { App } from './App'
+
+interface Props {
+  command?: string
+  data?: { response: any, status: string }[]
+}
+
+import { appendIconComponentCache } from '@elastic/eui/es/components/icon/icon'
+import { icon as EuiIconMagnifyWithPlus } from '@elastic/eui/es/components/icon/assets/magnifyWithPlus'
+import { icon as EuiIconMagnifyWithMinus } from '@elastic/eui/es/components/icon/assets/magnifyWithMinus'
+import { icon as EuiIconBullsEye } from '@elastic/eui/es/components/icon/assets/bullseye'
+import { icon as EuiIconEditorItemAlignCenter } from '@elastic/eui/es/components/icon/assets/editorItemAlignCenter'
+import { icon as EuiIconClock } from '@elastic/eui/es/components/icon/assets/clock'
+import { icon as EuiIconReportingApp } from '@elastic/eui/es/components/icon/assets/app_reporting'
+import { icon as EuiIconArrowUp } from '@elastic/eui/es/components/icon/assets/arrow_up'
+import { icon as EuiIconArrowDown } from '@elastic/eui/es/components/icon/assets/arrow_down'
+
+appendIconComponentCache({
+  magnifyWithPlus: EuiIconMagnifyWithPlus,
+  magnifyWithMinus: EuiIconMagnifyWithMinus,
+  bullseye: EuiIconBullsEye,
+  editorItemAlignCenter: EuiIconEditorItemAlignCenter,
+  clock: EuiIconClock,
+  reportingApp: EuiIconReportingApp,
+  arrowUp: EuiIconArrowUp,
+  arrowDown: EuiIconArrowDown,
+})
+
+const renderApp = (element: JSX.Element) => render(
+  element,
+  document.getElementById('app')
+)
+
+const renderCore = (props: Props) => renderApp(
+  <App data={props.data} command={props.command} />
+)
+
+// This is a required action - export the main function for execution of the visualization
+export default { renderCore }
diff --git a/redisinsight/ui/src/packages/ri-explain/src/parser.ts b/redisinsight/ui/src/packages/ri-explain/src/parser.ts
new file mode 100644
index 0000000000..d838163770
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/parser.ts
@@ -0,0 +1,1150 @@
+import { v4 as uuidv4 } from 'uuid'
+
+enum TokenType {
+
+  INIT = 'INIT',
+
+  EOF = 'EOF',
+  ILLEGAL = 'ILLEGAL',
+
+  UNION = 'UNION',
+  INTERSECT = 'INTERSECT',
+  NOT = 'NOT',
+  OPTIONAL = 'OPTIONAL',
+  EXACT = 'EXACT',
+  TAG = 'TAG',
+  VECTOR = 'VECTOR',
+  FUZZY = 'FUZZY',
+  WILDCARD = 'WILDCARD',
+  WILDCARD_EMPTY = 'WILDCARD_EMPTY', // <WILDCARD>}\n
+  PREFIX = 'PREFIX',
+  GEO_EXPR = 'GEO_EXPR',
+  IDS_EXPR = 'IDS_EXPR',
+  LEXRANGE_EXPR = 'LEXRANGE_EXPR',
+  NUMERIC = 'NUMERIC',
+  LBRACE = 'LBRACE',
+  RBRACE = 'RBRACE',
+  LPAREN = 'LAPAREN',
+  RPAREN = 'RAPAREN',
+  NUMBER = 'NUMBER',
+  NEW_LINE = 'NEW_LINE',
+
+  PLUS = 'PLUS',
+  MINUS = 'MINUS',
+  COMMA = 'COMMA',
+  DOT = 'DOT',
+
+  LESS = 'LESS',
+  GREATER = 'GREATER',
+
+  EQUAL = 'EQUAL',
+  LESS_EQUAL = 'LESS_EQUAL',
+  GREATER_EQUAL = 'GREATER_EQUAL',
+
+  IDENTIFIER = 'IDENTIFIER',
+}
+
+class Token {
+    T: TokenType
+    Data: string
+
+    constructor(t: TokenType, data: string) {
+        this.T = t
+        this.Data = data
+    }
+
+}
+
+const KEYWORDS = {
+  [TokenType.EOF.toString()]: TokenType.EOF,
+  [TokenType.ILLEGAL.toString()]: TokenType.ILLEGAL,
+
+  [TokenType.UNION.toString()]: TokenType.UNION,
+  [TokenType.INTERSECT.toString()]: TokenType.INTERSECT,
+  [TokenType.NOT.toString()]: TokenType.NOT,
+  [TokenType.OPTIONAL.toString()]: TokenType.OPTIONAL,
+  [TokenType.EXACT.toString()]: TokenType.EXACT,
+  [TokenType.VECTOR.toString()]: TokenType.VECTOR,
+  [TokenType.TAG.toString()]: TokenType.TAG,
+  [TokenType.NUMERIC.toString()]: TokenType.NUMERIC,
+
+  'inf': TokenType.NUMBER,
+}
+
+class Lexer {
+  Input: string
+  Position: number
+  ReadPosition: number
+
+  C?: string
+
+  constructor(input: string) {
+    this.Input = input
+    this.Position = 0
+    this.ReadPosition = 0
+    this.C = undefined
+
+    this.ReadChar()
+  }
+
+  ReadChar() {
+    if (this.ReadPosition >= this.Input.length) {
+      this.C = undefined
+    } else {
+      this.C = this.Input[this.ReadPosition]
+    }
+    this.Position = this.ReadPosition++
+  }
+  
+  PeekChar() {
+    if (this.ReadPosition >= this.Input.length) {
+      return null
+    } else {
+      return this.Input[this.ReadPosition]
+    }
+  }
+
+  SkipWhitespace() {
+    while (this.C == ' ' || this.C == '\t' || this.C == '\r') {
+      this.ReadChar()
+    }
+  }
+
+  ReadIdentifier(): string {
+    let str = ''
+
+    // variable identifiers start with @
+    // For the below expression, we can parse the identifier "@t1" successfully
+    // @t1:INTERSECT
+    //
+    // Sample Query - `FT.EXPLAIN idx @t1:hello world @t2:howdy`
+    const startsWithAt = this.C === '@'
+
+    // If a '/' was found, next char can be escaped.
+    //
+    // Sample Query - `FT.EXPLAIN rs:recipes 'very simple | @t:hello @t2:{ free\\world } (@n:[1 2]|@n:[3 4]) (@g:[1.5 0.5 0.5 km] -@g:[2.5 1.5 0.5 km])'`
+    let prevEscape = false
+    while (
+      this.C !== undefined
+        && (
+          isLetter(this.C) ||
+            ['@', ':', '\\'].includes(this.C) ||
+            (startsWithAt && isDigit(this.C)) ||
+
+            // Text can be searched in multiple schemas via '|'
+            //
+            // Example:
+            // FT.CREATE idx SCHEMA t1 TEXT t2 TEXT
+            // FT.EXPLAIN idx '@t1|t2:(text value)'
+            (startsWithAt && this.C === '|') ||
+            str.startsWith('TAG:@') && isDigit(this.C) ||
+            prevEscape
+        )
+    ) {
+      str = str + this.C
+      if (this.C === '\\' && this.PeekChar() === '\\') {
+        // '\' appears twice query result when escaped a character.
+        //
+        // For example, if space has to be escaped, instead of '\ ', you will find '\\ '.
+        this.ReadChar()         // read of extra '\'
+        prevEscape = true
+      } else {
+        prevEscape = false
+      }
+      this.ReadChar()
+    }
+    return str
+  }
+
+  ReadNumber(): string {
+    let str = ''
+    while (this.C !== undefined && (isDigit(this.C) || this.C === '.') && parseFloat(str + this.C) != NaN) {
+      str = str + this.C
+      this.ReadChar()
+    }
+    return str
+  }
+
+  NextToken() {
+    let t: Token | null = null
+
+    this.SkipWhitespace()
+
+    switch (this.C) {
+      case '\n':
+        t = new Token(TokenType.NEW_LINE, this.C)
+        break
+      case '{':
+        t = new Token(TokenType.LBRACE, this.C)
+        break
+      case '}':
+        t = new Token(TokenType.RBRACE, this.C)
+        break
+      case '(':
+        t = new Token(TokenType.LPAREN, this.C)
+        break
+      case ')':
+        t = new Token(TokenType.RPAREN, this.C)
+        break
+      case '+':// TODO: This should be PLUS token
+        t = new Token(TokenType.IDENTIFIER, this.C)
+        break
+      case '-':// TODO: This should be MINUS token
+        t = new Token(TokenType.IDENTIFIER, this.C)
+        let p = this.PeekChar()
+        if (p !== null && isDigit(p)){
+          this.ReadChar()
+          const n = this.ReadNumber()
+          t = new Token(TokenType.NUMBER, '-' + n)
+          return t
+        }
+        break
+      case ',':
+        t = new Token(TokenType.COMMA, this.C)
+        break
+    case '.':
+      t = new Token(TokenType.DOT, this.C)
+      break
+      case '<':
+        let lPeekChar = this.PeekChar()
+        if (lPeekChar !== null && lPeekChar === '=') {
+          t = new Token(TokenType.LESS_EQUAL, '<=')
+          this.ReadChar()
+        } else {
+          t = new Token(TokenType.LESS, '<')
+        }
+        break
+      case '>':
+        let rPeekChar = this.PeekChar()
+        if (rPeekChar !== null && rPeekChar === '=') {
+          t = new Token(TokenType.GREATER_EQUAL, '>=')
+          this.ReadChar()
+        } else {
+          t = new Token(TokenType.GREATER, '>')
+        }
+        break
+      case '=':
+        let ePeekChar = this.PeekChar()
+        if (ePeekChar !== null && ePeekChar === '=') {
+          t = new Token(TokenType.EQUAL, '==')
+          this.ReadChar()
+        } else {
+          // No Assign Token
+          t = new Token(TokenType.ILLEGAL, this.C)
+        }
+        break
+      case undefined:
+        t = new Token(TokenType.EOF, '')
+        break
+      default:
+        if (this.C !== undefined && (isLetter(this.C) || ['@', ':'].includes(this.C))) {
+          const literal = this.ReadIdentifier()
+          let tokenType = KEYWORDS[literal] || TokenType.IDENTIFIER
+          if (literal.startsWith('TAG:')) {
+            tokenType = TokenType.TAG
+          } else if (literal === 'FUZZY') {
+            tokenType = TokenType.FUZZY
+          } else if (literal === 'WILDCARD') {
+            tokenType = TokenType.WILDCARD
+          } else if (literal === 'PREFIX') {
+            tokenType = TokenType.PREFIX
+          } else if (literal === 'IDS') {
+            tokenType = TokenType.IDS_EXPR
+          } else if (literal === 'LEXRANGE') {
+            tokenType = TokenType.LEXRANGE_EXPR
+          } else if (literal === 'GEO') {
+            tokenType = TokenType.GEO_EXPR
+          } else if (literal.startsWith('@') && literal.endsWith(':OPTIONAL')) {
+            tokenType = TokenType.OPTIONAL
+          } else if (literal.startsWith('@') && literal.endsWith(':NOT')) {
+            tokenType = TokenType.NOT
+          } else if (literal.startsWith('@') && literal.endsWith(':EXACT')) {
+            tokenType = TokenType.EXACT
+          } else if (literal.startsWith('@') && literal.endsWith(':VECTOR')) {
+            tokenType = TokenType.VECTOR
+          } else if (literal.startsWith('@') && literal.endsWith(':UNION')) {
+            tokenType = TokenType.UNION
+          } else if (literal.startsWith('@') && literal.endsWith(':INTERSECT')) {
+            tokenType = TokenType.INTERSECT
+          }
+          t = new Token(tokenType, literal)
+          return t
+        } else if (this.C !== undefined && isDigit(this.C)) {
+          const n = this.ReadNumber()
+          t = new Token(TokenType.NUMBER, n)
+          return t
+        } else {
+          t = new Token(TokenType.ILLEGAL, this.C)
+        }
+    }
+    this.ReadChar()
+    return t
+  }
+}
+
+export enum EntityType {
+  Expr = 'Expr',
+  UNION = 'UNION',
+  INTERSECT = 'INTERSECT',
+  OPTIONAL = 'OPTIONAL',
+  NOT = 'NOT',
+  EXACT = 'EXACT',
+  VECTOR = 'VECTOR',
+  NUMERIC = 'NUMERIC',
+
+  // These are used exclusively in FT.PROFILE
+  GEO = 'GEO',
+  FUZZY = 'FUZZY',
+  WILDCARD = 'WILDCARD',
+  PREFIX = 'PREFIX',
+  TEXT = 'TEXT',
+  NUMBER = 'NUMBER',
+  TAG = 'TAG',
+
+  IDS = 'IDS',
+  LEXRANGE = 'LEXRANGE',
+
+  Index = 'Index',
+  Scorer = 'Scorer',
+  Sorter = 'Sorter',
+  Loader = 'Loader',
+
+  CLUSTER_MERGE = 'CLUSTER MERGE'
+}
+
+
+export interface EntityInfo {
+  id: string
+  type: EntityType,
+  subType?: EntityType,
+  data?: string
+  snippet?: string
+  children: EntityInfo[]
+  time?: string
+  counter?: string
+  size?: string
+  parentId?: string
+  parentSnippet?: string
+  level?: number
+  recordsProduced?: string
+}
+
+interface IAncestors {
+  found: boolean
+  pairs: [string, string][]
+}
+
+export function GetAncestors(info: EntityInfo, searchId: string, a: IAncestors): IAncestors {
+  if (searchId === info.id) {
+    return {
+      found: true,
+      pairs: info.parentId ? [[info.parentId, info.id]] : []
+    }
+  } else {
+    let r: IAncestors = {...a}
+    for (let i = 0; i < info.children.length; i++) {
+      let c = info.children[i]
+      let ci = GetAncestors(c, searchId, a)
+      if (ci.found) {
+        r.found = true
+        r.pairs = [...a.pairs, ...ci.pairs]
+        if (info.parentId) {
+          r.pairs = [...r.pairs, [info.parentId, info.id]]
+        }
+        return r
+      }
+    }
+    return r
+  }
+}
+
+
+class Expr {
+  Core: string
+  SubType: EntityType
+  Time?: string
+  Info?: string
+
+  constructor(expr: string, subType: EntityType, info: string | undefined = undefined) {
+    this.Core = expr
+    this.SubType = subType
+    this.Info = info
+  }
+
+  toJSON(): EntityInfo {
+
+    let snippet: string | undefined = undefined
+
+    if (this.SubType === EntityType.TAG && this.Info?.startsWith('TAG:')) {
+      snippet = this.Info?.substr(4)
+    } else if (this.SubType === EntityType.GEO) {
+      snippet = this.Info
+      if (snippet?.endsWith(':')) {
+        snippet = snippet?.slice(0, -1)
+      }
+    }
+
+    return {
+      id: uuidv4(),
+      // data: 'Expr',
+      // snippet: this.Core,
+      type: EntityType.Expr,
+      subType: this.SubType,
+      snippet: snippet,
+      data: this.Core,
+      children: [],
+      time: this.Time,
+    }
+  }
+}
+
+class NumericExpr {
+  Left: number
+  LSign: Token
+
+  Identifier: Token
+
+  Right: number
+  RSign: Token
+
+
+  constructor(left: number, lsign: Token, identifier: Token, rsign: Token, right: number) {
+    this.Left = left
+    this.LSign = lsign
+    this.Identifier = identifier
+    this.Right = right
+    this.RSign = rsign
+  }
+
+  toJSON(): EntityInfo {
+    return {
+      id: uuidv4(),
+      type: EntityType.NUMERIC,
+      data: 'Numeric',
+      snippet: `${this.Left.toString()} ${this.LSign.Data} ${this.Identifier.Data} ${this.RSign.Data} ${this.Right.toString()}`,
+      children: [],
+    }
+  }
+}
+
+type SearchExpr = NumericExpr | Expr | ExpandExpr
+
+type ExprTuple2 = SearchExpr[]
+
+class ExpandExpr {
+  Type: EntityType
+  Info?: string
+  Core: ExprTuple2
+
+  constructor(type: EntityType, e: ExprTuple2, info?: string) {
+    this.Core = e
+    this.Info = info
+    this.Type = type
+  }
+
+  toJSON(): EntityInfo {
+    const id = uuidv4()
+
+    let snippet: string | undefined = undefined
+
+    if (this.Type === EntityType.TAG && this.Info?.startsWith('TAG:')) {
+      snippet = this.Info?.substr(4)
+    }
+
+    if (!this.Info?.startsWith(this.Type)) {
+      snippet = this.Info?.substring(0, this.Info.indexOf(`:${this.Type}`))
+    }
+
+    return {
+      id,
+      type: this.Type,
+      snippet,
+      children: this.Core.map(x => x.toJSON()).map((d: EntityInfo) => ({
+        ...d,
+        parentId: id,
+        parentSnippet: snippet,
+      }))
+    }
+  }
+}
+
+
+class Parser {
+  private L: Lexer
+  CurrentToken: Token
+  PeekToken: Token
+  Errors: string[]
+
+  constructor(l: Lexer) {
+    this.L = l
+    
+    this.Errors = []
+    this.CurrentToken = new Token(TokenType.INIT, '')
+    this.PeekToken = new Token(TokenType.INIT, '')
+
+    this.nextToken()
+    this.nextToken()
+  }
+
+  currentTokenIs(t: TokenType) {
+    return this.CurrentToken?.T === t
+  }
+
+  peekTokenIs(t: TokenType) {
+    return this.PeekToken?.T === t
+  }
+
+  nextToken() {
+    this.CurrentToken = this.PeekToken
+    this.PeekToken = this.L.NextToken()
+
+    if (this.CurrentToken.T === TokenType.EOF) {
+      throw new Error("Didn't expect EOF token")
+    }
+  }
+
+  assertToken(t: TokenType) {
+    assertToken(t, this.CurrentToken.T)
+  }
+
+  // Parse an entity which can expand, i.e., has further children of
+  // an entity type.
+  //
+  // Example:
+  // <ENTITY_TYPE> { <ENTITY_TYPE> { ... } (<ENTITY_TYPE> { ... } ...) }
+  parseExpandExpr(t: EntityType): ExpandExpr {
+
+    assertExpandEntity(t)
+
+    this.assertToken(t as unknown as TokenType)
+
+    let data = this.CurrentToken.Data
+
+    this.nextToken()
+
+    this.assertToken(TokenType.LBRACE)
+
+    let Exprs: SearchExpr[] = []
+    this.nextToken()
+
+    this.assertToken(TokenType.NEW_LINE)
+
+    this.nextToken()
+
+    while (true) {
+
+      if (this.CurrentToken.T === TokenType.RBRACE && this.PeekToken.T === TokenType.NEW_LINE) {
+
+        this.nextToken()
+        break
+      }
+
+      const t = this.CurrentToken.T;
+
+      if (this.CurrentToken?.T === TokenType.NUMERIC) {
+        Exprs.push(this.parseNumericExpr())
+      } else if (this.CurrentToken?.T === TokenType.IDENTIFIER) {
+        Exprs.push(this.parseExpr())
+      } else if ([
+        TokenType.UNION,
+        TokenType.INTERSECT,
+        TokenType.NOT,
+        TokenType.OPTIONAL,
+        TokenType.EXACT,
+        TokenType.VECTOR,
+        TokenType.TAG
+      ].includes(t)) {
+        Exprs.push(this.parseExpandExpr(EntityType[t]))
+      } else if (this.CurrentToken.T === TokenType.GEO_EXPR) {
+        Exprs.push(this.parseGeoExpr())
+      } else if ([TokenType.FUZZY, TokenType.WILDCARD, TokenType.PREFIX].includes(t)) {
+        Exprs.push(this.parseSimpleExpr(EntityType[t]))
+      } else if (this.CurrentToken.T === TokenType.IDS_EXPR) {
+        Exprs.push(this.parseIdsExpr())
+      } else if (this.CurrentToken.T === TokenType.LEXRANGE_EXPR) {
+        Exprs.push(this.parseLexrangeExpr())
+      } else if (this.CurrentToken.T === TokenType.NUMBER) {
+        Exprs.push(new Expr(this.CurrentToken.Data.toString(), EntityType.NUMBER))
+      } else if (this.CurrentToken.T === TokenType.LESS) {
+        Exprs.push(this.parseWildcardEmpty())
+      }
+
+      this.nextToken()
+    }
+
+    return new ExpandExpr(t, Exprs, data)
+  }
+
+  parseLexrangeExpr() {
+    this.assertToken(TokenType.LEXRANGE_EXPR)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.LBRACE)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.IDENTIFIER)
+
+    let first = this.CurrentToken.Data
+
+    this.nextToken()
+
+    this.assertToken(TokenType.DOT)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.DOT)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.DOT)
+
+    this.nextToken()
+
+    let second = this.CurrentToken.Data
+
+    this.nextToken()
+
+    this.assertToken(TokenType.RBRACE)
+
+    return new Expr(`${first}...${second}`, EntityType.LEXRANGE)
+  }
+
+  parseIdsExpr() {
+    this.assertToken(TokenType.IDS_EXPR)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.LBRACE)
+
+    this.nextToken()
+
+    let ids: number[] = []
+
+    while (this.CurrentToken.T !== TokenType.RBRACE) {
+      ids.push(parseInt(this.CurrentToken.Data))
+
+      this.nextToken()
+
+
+      this.assertToken(TokenType.COMMA)
+
+      this.nextToken()
+    }
+
+    this.assertToken(TokenType.RBRACE)
+
+    this.nextToken()
+
+    return new Expr(ids.join(','), EntityType.IDS)
+  }
+
+  // This is a special result.
+  //
+  // Example output: <WILDCARD>}\n
+  parseWildcardEmpty() {
+    // TODO: Check for WILDCARD_EMPTY
+    this.assertToken(TokenType.LESS)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.WILDCARD)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.GREATER)
+
+    this.nextToken()
+
+    // TODO: Once fixed by redisearch team, remove this.
+    this.assertToken(TokenType.RBRACE)
+
+
+    return new Expr("<WILDCARD>", EntityType.WILDCARD)
+  }
+
+  parseExpr() {
+
+    this.assertToken(TokenType.IDENTIFIER)
+
+    let str = ''
+
+    while (this.CurrentToken.T !== TokenType.NEW_LINE) {
+      str = str + this.CurrentToken.Data
+      this.nextToken()
+    }
+
+    return new Expr(str, EntityType.TEXT)
+  }
+
+  // Parse a very simple entity with format:
+  // <ENTITY_TYPE> { <IDENTIFIER> }
+  parseSimpleExpr(e: EntityType) {
+
+    assertSimpleEntity(e)
+
+    this.assertToken(TokenType[e])
+
+    this.nextToken()
+
+    this.assertToken(TokenType.LBRACE)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.IDENTIFIER)
+
+    let identifierData = this.CurrentToken.Data;
+
+    this.nextToken()
+
+    this.assertToken(TokenType.RBRACE)
+
+    this.nextToken()
+
+    return new Expr(identifierData, e)
+  }
+
+  parseGeoExpr() {
+    this.assertToken(TokenType.GEO_EXPR)
+
+    let geoData = this.CurrentToken.Data
+
+    this.nextToken()
+
+    this.assertToken(TokenType.IDENTIFIER)
+
+    let identifierData = this.CurrentToken.Data
+
+    this.nextToken()
+
+    this.assertToken(TokenType.LBRACE)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.NUMBER)
+
+    let first = this.CurrentToken.Data;
+
+    this.nextToken()
+
+    this.assertToken(TokenType.COMMA)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.NUMBER)
+
+    let second = this.CurrentToken.Data;
+
+    this.nextToken()
+
+    this.assertToken(TokenType.IDENTIFIER)
+
+    assert(this.CurrentToken.Data === '-', "Expected Identifier to be MINUS")
+
+    this.nextToken()
+
+    this.assertToken(TokenType.IDENTIFIER)
+
+    assert(this.CurrentToken.Data === '-', "Expected Identifier to be MINUS")
+
+    this.nextToken()
+
+    this.assertToken(TokenType.GREATER)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.NUMBER)
+
+    let third = this.CurrentToken.Data;
+
+    this.nextToken()
+
+    this.assertToken(TokenType.IDENTIFIER)
+
+    let metric = this.CurrentToken.Data;
+
+    this.nextToken()
+
+    this.assertToken(TokenType.RBRACE)
+
+    this.nextToken()
+
+    return new Expr(`${first},${second} --> ${third} ${metric}`, EntityType.GEO, identifierData)
+  }
+
+  parseNumericExpr() {
+    this.assertToken(TokenType.NUMERIC)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.LBRACE)
+
+    this.nextToken()
+
+    this.assertToken(TokenType.NUMBER)
+
+    let left = this.CurrentToken?.Data
+
+    this.nextToken()
+
+    let lsign = this.CurrentToken // TODO: Check sign
+
+    this.nextToken()
+
+    this.assertToken(TokenType.IDENTIFIER)
+
+    let identifier = this.CurrentToken
+
+    this.nextToken()
+
+    while (this.CurrentToken.T === TokenType.IDENTIFIER) {
+      identifier.Data = identifier.Data + this.CurrentToken.Data
+      this.nextToken()
+    }
+
+
+    let rsign = this.CurrentToken
+
+    this.nextToken()
+
+
+    this.assertToken(TokenType.NUMBER)
+
+    let right = this.CurrentToken?.Data
+
+    this.nextToken()
+
+
+    this.assertToken(TokenType.RBRACE)
+
+    this.nextToken()// read off RBRACE
+
+    // assertToken(TokenType.NEW_LINE, this.CurrentToken?.T)
+    // 
+    // this.nextToken() // read off new line
+
+    return new NumericExpr(left !== 'inf' ? parseFloat(left) : Infinity, lsign, identifier, rsign, right !== 'inf' ? parseFloat(right) : Infinity)
+  }
+}
+
+
+function Parse(data: string): SearchExpr {
+  const l = new Lexer(data)
+
+  let p = new Parser(l)
+  
+  const t = p.CurrentToken.T;
+
+  if (p.CurrentToken?.T === TokenType.NUMERIC) {
+    return p.parseNumericExpr()
+  } else if ([
+    TokenType.UNION,
+    TokenType.INTERSECT,
+    TokenType.NOT,
+    TokenType.OPTIONAL,
+    TokenType.EXACT,
+    TokenType.VECTOR,
+    TokenType.TAG,
+  ].includes(t)) {
+    return p.parseExpandExpr(EntityType[t])
+  } else if (p.CurrentToken.T === TokenType.GEO_EXPR) {
+    return p.parseGeoExpr()
+  } else if ([TokenType.FUZZY, TokenType.WILDCARD, TokenType.PREFIX].includes(t)) {
+    return p.parseSimpleExpr(EntityType[t])
+  } else if (p.CurrentToken.T === TokenType.IDS_EXPR) {
+    return p.parseIdsExpr()
+  } else if (p.CurrentToken.T === TokenType.LEXRANGE_EXPR) {
+    return p.parseLexrangeExpr()
+  } else if (p.CurrentToken.T === TokenType.LESS) {
+    return p.parseWildcardEmpty()
+  } else {
+    return p.parseExpr()
+  }
+}
+
+export function ParseExplain(output: string) {
+  return Parse(output).toJSON()
+}
+
+
+function isLetter(str: string): boolean {
+  return str.length === 1 && (str.match(/[a-z]/i) !== null)
+}
+
+function isDigit(str: string): boolean {
+  return str >='0' && str <= '9'
+}
+
+
+function assert(c: boolean, errorMsg: string) {
+  if (!c) {
+    throw new Error(errorMsg)
+  }
+}
+
+function assertToken(expected: TokenType, actual: TokenType | undefined) {
+  if (actual === undefined) {
+    throw new Error("Token is undefined")
+  }
+
+  assert(expected === actual, `Expected ${expected}, Actual: ${actual}`)
+}
+
+function assertExpandEntity(t: EntityType) {
+  if (![
+    EntityType.UNION,
+    EntityType.INTERSECT,
+    EntityType.NOT,
+    EntityType.OPTIONAL,
+    EntityType.EXACT,
+    EntityType.VECTOR,
+    EntityType.TAG,
+  ].includes(t)) {
+    throw new Error(`${t} is not an expand entity`)
+  }
+}
+
+
+function assertSimpleEntity(t: EntityType) {
+  if (![
+    EntityType.FUZZY,
+    EntityType.WILDCARD,
+    EntityType.PREFIX,
+  ].includes(t)) {
+    throw new Error(`${t} is not a simple entity`)
+  }
+}
+
+export function ParseProfileCluster(info: any[]): [Object, EntityInfo] {
+
+  let clusterInfo: {[key: string]: any[]} = {}
+  let key: string = ''
+  let i = 0
+  while (i < info.length) {
+    if (Array.isArray(info[i])) {
+      clusterInfo[key].push(info[i])
+    } else if (typeof(info[i]) === 'string') {
+      key = info[i]
+      clusterInfo[key] = []
+    } else {
+      throw new Error("Expected array or string - " + JSON.stringify(info))
+    }
+    i++
+  }
+
+  let shards: EntityInfo[] = []
+
+  Object.keys(clusterInfo).map(k => {
+    if (k.toLowerCase().startsWith('shard')) {
+      let shardProfileInfo = ParseProfile(clusterInfo[k])
+      shards.push({
+        id: uuidv4(),
+        type: k as EntityType,
+        children: [shardProfileInfo],
+      })
+    }
+  })
+
+  return [
+    clusterInfo,
+    {
+      id: uuidv4(),
+      type: EntityType.CLUSTER_MERGE,
+      // children: shards,
+      children: Object.keys(clusterInfo).filter(k => k.toLowerCase().startsWith('shard')).map(k =>
+        ParseProfile(clusterInfo[k])
+      )
+    }
+  ]
+}
+
+export function ParseProfile(info: any[][]): EntityInfo {
+  const parserData: any = info[info.length - 2]
+  let resp = parserData[0].toLowerCase().startsWith('iterators') ? ParseIteratorProfile(parserData[1]) : null
+
+  const processorsProfile: string[][] = info[info.length - 1].slice(1)
+
+  for (let i = 0; i < processorsProfile.length; i++) {
+    const e = processorsProfile[i]
+    let id = uuidv4()
+    resp = {
+      id,
+      type: e[1] as EntityType,
+      time: e[3],
+      counter: e[5],
+      children: resp ? [{...resp, parentId: id}] : [],
+    }
+  }
+
+  return resp as EntityInfo
+}
+
+export function ParseIteratorProfile(data: any[]): EntityInfo {
+
+  let props: {[key: string]: any} = {}
+
+  // Parse items with the following format [key1, value1, key2, value2, null, key3, value3, key4, value4_1[], value4_2[]]
+  for (let x = 0; x < data.length; x += 2) {
+    let key = data[x]
+    if (key === null) {
+
+      while (data[x] === null) {
+        x = x + 1
+      }
+      key = data[x]
+    }
+
+    let val = data[x + 1]
+
+    while (data[x + 1] === null) x = x + 1
+    val = data[x + 1]
+
+    if (Array.isArray(val)) {
+      let arr: any[] = []
+      while ((x + 1) < data.length && Array.isArray(data[x + 1])) {
+        arr.push(data[x + 1])
+        x = x + 1
+      }
+      props[key] = arr
+    } else {
+      props[key] = val
+    }
+  }
+
+  let childrens = props['Child iterators'] || props['Child Iterators'] || []
+
+  const id = uuidv4()
+  return {
+    id,
+    type: props['Type'] || props['TYPE'],
+    time: props['Time'],
+    counter: props['Counter'],
+    size: props['Size'],
+    data: props['Term'],
+    children: childrens.map(ParseIteratorProfile).map((d: EntityInfo) => ({...d, parentId: id})),
+  }
+
+  // const t: EntityType = props['Type']
+  // if ([EntityType.UNION, EntityType.INTERSECT].includes(t)) {
+  //   const l = data.length
+
+  //   return {
+  //     id: uuidv4(),
+  //     type: t,
+  //     time: data[5],
+  //     counter: data[7],
+  //     children: props['Child iterators'].map(x => ParseIteratorProfile(x)),
+  //   }
+  // // } else if (t === EntityType.NUMERIC) {
+  // //   return {
+  // //     id: uuidv4(),
+  // //     type: EntityType.NUMERIC,
+  // //     snippet: 'Numeric',
+  // //     children: [],
+  // //   }
+  // } else {
+  //   return {
+  //     id: uuidv4(),
+  //     type: data[1],
+  //     data: data[3],
+  //     time: data[5],
+  //     counter: data[7],
+  //     size: data[9],
+  //     children: [],
+  //   }
+  // }
+}
+
+export enum ModuleType {
+  Graph,
+  Search,
+}
+
+export enum CoreType {
+  Profile,
+  Explain,
+}
+
+export function getOutputLevel(output: string) {
+  let i = 0
+  while (output[i] == ' ' && i < output.length) {
+    i++
+  }
+  return (i > 0 ? i / 4 : 0) + 1
+}
+
+function ParseEntity(entity: string, children: EntityInfo[]): EntityInfo {
+  const info = entity.trim().split('|')
+
+  let time: string | undefined = '', size: string | undefined = ''
+
+  const metaData = info.slice(-1)[0].trim()
+
+  // Is GRAPH.PROFILE output
+  if (metaData.startsWith('Records produced')) {
+
+    [size, time] = metaData.trim().split(',')
+
+    size = size.split(': ')[1]
+    time = time.split(': ')[1].split(' ')[0]
+    info.pop()
+  }
+
+  const snippet = [...info.slice(1)].join('|').trim()
+
+  return {
+    id: uuidv4(),
+    type: info[0] as EntityType,
+    snippet,
+    children,
+    time,
+    size,
+    counter: size,
+    level: getOutputLevel(entity),
+  }
+}
+
+
+export function ParseGraphV2(output: string[]) {
+
+  const level = getOutputLevel(output[0]) + 1
+
+  let entity = ParseEntity(output[0], [])
+  let children: EntityInfo[] = []
+
+  let pairs: [number, number][] = []
+    
+  let s: number | null = null, e: number | null = null
+  let i = 1
+
+  while (i < output.length) {
+    let l = getOutputLevel(output[i])
+    if (l === level) {
+      if (s == null) {
+        s = i
+      } else if (s != null) {
+        pairs.push([s, i])
+        s = i
+      }
+    }
+    i++
+  }
+
+  if (s !== null) {
+    pairs.push([s, i])
+  }
+
+  for (let k = 0; k < pairs.length; k++) {
+    let p = pairs[k]
+    children.push({...ParseGraphV2(output.slice(p[0], p[1])), parentId: entity.id})
+  }
+
+  entity.children = children
+  return entity
+}
+
+
+export function GetTotalExecutionTime(g: EntityInfo) {
+  return parseFloat(g.time || '') + g.children.reduce((a, c) => a + GetTotalExecutionTime(c), 0)
+}
diff --git a/redisinsight/ui/src/packages/ri-explain/src/styles/_dark_theme.less b/redisinsight/ui/src/packages/ri-explain/src/styles/_dark_theme.less
new file mode 100644
index 0000000000..54175c82c7
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/styles/_dark_theme.less
@@ -0,0 +1,3 @@
+.theme_DARK {
+  @import (less)'../../node_modules/@elastic/eui/dist/eui_theme_dark.min.css';
+}
diff --git a/redisinsight/ui/src/packages/ri-explain/src/styles/_light_theme.less b/redisinsight/ui/src/packages/ri-explain/src/styles/_light_theme.less
new file mode 100644
index 0000000000..1177707d0f
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/styles/_light_theme.less
@@ -0,0 +1,3 @@
+.theme_LIGHT {
+  @import (less)'../../node_modules/@elastic/eui/dist/eui_theme_light.min.css';
+}
diff --git a/redisinsight/ui/src/packages/ri-explain/src/styles/styles.less b/redisinsight/ui/src/packages/ri-explain/src/styles/styles.less
new file mode 100644
index 0000000000..feba7ced40
--- /dev/null
+++ b/redisinsight/ui/src/packages/ri-explain/src/styles/styles.less
@@ -0,0 +1,394 @@
+@import "_dark_theme.less";
+@import "_light_theme.less";
+
+* {
+  margin: 0px;
+  padding: 0px;
+}
+
+#mainApp::-webkit-scrollbar {
+  width: 2em;
+}
+
+#mainApp::-webkit-scrollbar-thumb {
+    background-color: rgba(105, 112, 125, 0.5);
+    border: 6px solid transparent;
+    background-clip: content-box;
+}
+
+#container-parent::-webkit-scrollbar {
+  width: 16px;
+  height: 16px;
+}
+
+#container-parent::-webkit-scrollbar-corner, #container-parent::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+#container-parent::-webkit-scrollbar-thumb {
+  background-color: rgba(105, 112, 125, 0.5);
+  border: 6px solid transparent;
+  background-clip: content-box;
+}
+
+.theme_DARK {
+  --info-background: #2b2b2b;;
+  --info-color: white;
+  --svg-background: #010101;
+  --tooltip-background: #3E4B5E;
+
+  --node-border-color: #3D3D3D;
+  --node-border-shadow: #17336952;
+  --node-metadata-border-color: #3C3C3C;
+  --node-metadata-color: #B5B6C0;
+  --node-background: #212021;
+  --edge-background: #6B6B6B;
+  --text-color: #DFE5EF;
+}
+
+.theme_LIGHT {
+  --info-background: #EBEFFA;
+  --info-color: black;
+  --svg-background: #FFFFFF;
+  --tooltip-background: white;
+
+  --node-border-color: #E4EAF2;
+  --node-border-shadow: #17336926;
+  --node-metadata-border-color: #CCD7E7;
+  --node-metadata-color: #415681;
+  --node-background: #FFF;
+  --edge-background: #8992B3;
+  --text-color: #173369;
+}
+
+body {
+    background-color: var(--svg-background);
+    overflow: hidden;
+}
+
+
+* div,
+* span {
+  font-family: 'Graphik', sans-serif !important;
+}
+
+.euiPagination__list {
+  list-style: none;
+  padding-inline-start: 0px;
+}
+
+
+.responseFail {
+  color: #e06c75;
+  padding: 12px !important;
+  font-family: monospace !important;
+}
+
+.parsedRedisReply {
+  white-space: pre-wrap;
+  word-break: break-all;
+  font: normal normal normal 14px/17px Inconsolata !important;
+  padding: 4px 12px !important;
+  color: var(--info-color);
+}
+
+.responseInfo {
+  color: var(--info-color);
+  padding: 12px !important;
+  font-family: monospace !important;
+}
+
+.euiToolTip {
+  color: var(--info-color) !important;
+  background-color: var(--tooltip-background) !important;
+  font-size: 12px !important;
+}
+
+.euiToolTip__arrow {
+  background-color: var(--tooltip-background) !important;
+}
+
+
+.euiToolTipAnchor {
+  display: unset !important;
+}
+
+.InfoData {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+
+  // Make text selectable
+  -moz-user-select: text;
+  -khtml-user-select: text;
+  -webkit-user-select: text;
+  -ms-user-select: text;
+  user-select: text;
+}
+
+.FooterCommon {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+
+  color: var(--node-metadata-color);
+  font-size: 12px;
+
+
+  // Make text selectable
+  -moz-user-select: text;
+  -khtml-user-select: text;
+  -webkit-user-select: text;
+  -ms-user-select: text;
+  user-select: text;
+}
+
+.ProfileContainer {
+  width: 320px;
+  min-height: 84px;
+
+  padding-left: 18px !important;
+  padding-right: 18px !important;
+
+  box-shadow: 0px 3px 12px var(--node-border-shadow);
+  border: 1px solid var(--node-border-color) !important;
+  border-radius: 4px;
+  opacity: 1;
+
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+
+  background-color: var(--node-background);
+  color: var(--text-color);
+
+  &:hover {
+      outline: 2px solid #85A2FE !important;
+      box-sizing: border-box;
+  }
+
+  .Main {
+
+      display: flex;
+      justify-content: space-between;
+      line-height: 18px;
+
+      font-size: 13px;
+      color: var(--text-color);
+
+      padding-top: 12px;
+      padding-bottom: 12px;
+
+      .Type {
+          color: #CE915B;
+          text-transform: lowercase;
+      }
+  }
+
+  .Footer{
+    padding-top: 4px;
+    padding-bottom: 12px;
+    height: auto;
+  }
+
+  .MetaData {
+      display: flex;
+      justify-content: space-between;
+      line-height: 18px;
+      color: var(--node-metadata-color);
+
+      padding-top: 12px;
+      padding-bottom: 12px;
+
+      height: 42px;             //FIXME: fixed height?
+      border-top: 0.5px solid var(--node-metadata-border-color);
+
+      .Time {
+          display: flex;
+          align-items: center;
+          font-size: 12px;
+
+          div:first-child {
+              padding-right: 5px;
+          }
+
+      }
+
+      .Size {
+          display: flex;
+          align-items: center;
+          font-size: 13px;
+
+          div:first-child {
+              padding-right: 5px;
+          }
+
+
+      }
+
+      .IconContainer {
+          > svg {
+              width: 12px !important;
+              height: 13px !important;
+          }
+      }
+  }
+}
+
+.ExplainContainer {
+  width: 240px;
+  min-height: 42px;
+
+  box-shadow: 0px 3px 12px var(--node-border-shadow);
+  border: 1px solid var(--node-border-color) !important;
+  border-radius: 4px;
+  opacity: 1;
+
+  padding: 12px 18px 12px 18px !important;
+
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+
+  background-color: var(--node-background);
+
+  &:hover {
+      outline: 2px solid #85A2FE !important;
+      box-sizing: border-box;
+  }
+
+  .Main {
+    // height: 42px;
+    font-size: 13px;
+    color: var(--text-color);
+
+    .Info {
+        display: flex;
+        justify-content: space-between;
+        .Type {
+            color: #CE915B;
+            text-transform: lowercase;
+        }
+    }
+
+  }
+
+  .Footer{
+    height: 24px;
+    padding-top: 6px;
+  }
+}
+
+
+.ProfileInfo {
+  display: flex;
+  justify-content: center;
+  color: var(--text-color);
+
+  font-family: 'Graphik', sans-serif !important;
+  font-size: 13px;
+
+  padding-bottom: 3px !important;
+
+  position: absolute;
+  bottom: 12px;
+  width: 100%;
+}
+
+.ProfileTimeInfo {
+    background-color: var(--info-background);
+
+    padding-top: 3px !important;
+
+    .Item {
+
+        padding-left: 18px;
+        padding-right: 18px;
+
+        .Key {
+            font-size: 13px;
+            line-height: 18px;
+        }
+
+        .Value {
+            font-size: 18px;
+            line-height: 24px;
+        }
+    }
+}
+
+.ProfileTimeMini {
+  background-color: var(--svg-background);
+}
+
+.NodeType {
+  color: #CE915B;
+}
+
+.NodeMetadata {
+  display: flex;
+  justify-content: space-between;
+  font-size: 12px;
+  color: darkgrey;
+}
+
+.NodeInfoDivider {
+  width: 284px;
+  height: 29px;
+  border-bottom: 1px solid #3D3D3D !important;
+  position: absolute;
+  color: #B5B6C0;
+}
+
+.NodeTime {
+  display: flex;
+  align-items: center;
+}
+
+
+.NodeContentInfo {
+  display: flex;
+  align-items: center;
+}
+
+
+.NodeTimeIcon {
+  padding-right: 5px !important;
+}
+
+.NodeContentIcon {
+  padding-left: 5px !important;
+}
+
+.Box {
+  width: 5px;
+  height: 9px;
+  background-color: #FF6280;
+
+  align-self: center;
+
+  margin-left: 2px !important;
+}
+
+.ZoomMenu {
+    position: absolute;
+    bottom: 110px;
+    right: 10px;
+    border-right: 4px;
+    box-shadow: 0 1px 6px rgb(0 0 0 / 16%), 0 1px 6px rgb(0 0 0 / 23%);
+    display: flex;
+    flex-direction: column;
+}
+
+.CollapseButton {
+    color: var(--text-color);
+    line-height: 18px;
+    font-size: 12px;
+    display: flex;
+    justify-content: center;
+    cursor: pointer;
+
+    div:first-child {
+        padding-right: 5px;
+    }
+}
diff --git a/redisinsight/ui/src/packages/clients-list/yarn.lock b/redisinsight/ui/src/packages/ri-explain/yarn.lock
similarity index 77%
rename from redisinsight/ui/src/packages/clients-list/yarn.lock
rename to redisinsight/ui/src/packages/ri-explain/yarn.lock
index 6f54f629a0..d9231ca8ac 100644
--- a/redisinsight/ui/src/packages/clients-list/yarn.lock
+++ b/redisinsight/ui/src/packages/ri-explain/yarn.lock
@@ -2,149 +2,60 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
-  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.0"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/compat-data@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2"
-  integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==
-
-"@babel/core@^7.12.0":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.7.tgz#f7c28228c83cdf2dbd1b9baa06eaf9df07f0c2f9"
-  integrity sha512-djHlEfFHnSnTAcPb7dATbiM5HxGOP98+3JLBZtjRb5I7RXrw7kFRoG2dXM8cm3H+o11A8IFH/uprmJpwFynRNQ==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.7"
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helpers" "^7.17.7"
-    "@babel/parser" "^7.17.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-
-"@babel/generator@^7.17.3", "@babel/generator@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad"
-  integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==
-  dependencies:
-    "@babel/types" "^7.17.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/helper-compilation-targets@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46"
-  integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==
-  dependencies:
-    "@babel/compat-data" "^7.17.7"
-    "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.17.5"
-    semver "^6.3.0"
-
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
+"@antv/hierarchy@^0.6.8":
+  version "0.6.8"
+  resolved "https://registry.yarnpkg.com/@antv/hierarchy/-/hierarchy-0.6.8.tgz#b77c490a9c2dd6da186cbacee0e7887b8c1b3fa4"
+  integrity sha512-wVzUl+pxny5gyGJ2mkWx8IiEypX6bnMHgr/NILgbxY6shoy0Vf4FhZpI3CY8Ez7bQT6js8fMkB2NymPW7d7i8A==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@antv/util" "^2.0.7"
 
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
+"@antv/util@^2.0.7":
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/@antv/util/-/util-2.0.17.tgz#e8ef42aca7892815b229269f3dd10c6b3c7597a9"
+  integrity sha512-o6I9hi5CIUvLGDhth0RxNSFDRwXeywmt6ExR4+RmVAzIi48ps6HUy+svxOCayvrPBN37uE6TAc2KDofRo0nK9Q==
   dependencies:
-    "@babel/types" "^7.16.7"
+    csstype "^3.0.8"
+    tslib "^2.0.3"
 
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+"@antv/x6-common@^2.0.x":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@antv/x6-common/-/x6-common-2.0.4.tgz#14dcfa4266d1ea594b0029b80defb916dbe01a7f"
+  integrity sha512-OeCMJUP2/fAbGLCfUuFU/p9oSdyG/RLNpDE4xUT8pBHfhhlKfoMDz9RkYr6+ZAg8F5hgN3zBkZDuLXhO6uN8hQ==
   dependencies:
-    "@babel/types" "^7.16.7"
+    lodash-es "^4.17.15"
+    utility-types "^3.10.0"
 
-"@babel/helper-module-imports@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
-  dependencies:
-    "@babel/types" "^7.16.7"
+"@antv/x6-geometry@^2.0.x":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@antv/x6-geometry/-/x6-geometry-2.0.4.tgz#d08213e200e16c8d065a0235189239cb367a0797"
+  integrity sha512-dlsLNRRTiCw8TsJ/03j3y5IbbbK4Npf6zBH6kAx8nnW+edNT/TAOChvPRzizwD+vA7wY9Rp2AiRnp/vCdIYC5w==
 
-"@babel/helper-module-transforms@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd"
-  integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
+"@antv/x6-react-shape@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@antv/x6-react-shape/-/x6-react-shape-2.1.0.tgz#b364a021d9690abb1f8f35cefd2da913dfd145d3"
+  integrity sha512-HY9tPbMU1Z7Tu2lwBenXJe53DzT2MFt9LXRBPyN+r5qu8kP3VMU1vzS+2+LsPFdPL3s71wolGjL1GExUoh77JQ==
 
-"@babel/helper-simple-access@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
-  integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
+"@antv/x6@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@antv/x6/-/x6-2.1.3.tgz#65899f44058bb7ef6dba0986aa65fb38c1737d87"
+  integrity sha512-1y/BU76RmENucn5wPvSvabd+RnwBJ6y61XckBPvmoDHnvsY8xsKjedTL3Hqpvf2/5nfU21YPmvo+1gV0x4nO0w==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@antv/x6-common" "^2.0.x"
+    "@antv/x6-geometry" "^2.0.x"
+    utility-types "^3.10.0"
 
-"@babel/helper-split-export-declaration@^7.16.7":
+"@babel/code-frame@^7.0.0":
   version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/highlight" "^7.16.7"
 
 "@babel/helper-validator-identifier@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
   integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
 
-"@babel/helper-validator-option@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
-  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
-
-"@babel/helpers@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.7.tgz#6fc0a24280fd00026e85424bbfed4650e76d7127"
-  integrity sha512-TKsj9NkjJfTBxM7Phfy7kv6yYc4ZcOo+AaWGqQOKTPDOmcGkIFb5xNA746eKisQkm4yavUYh4InYM9S+VnO01w==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
-
 "@babel/highlight@^7.16.7":
   version "7.16.10"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88"
@@ -154,57 +65,19 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.7.tgz#fc19b645a5456c8d6fdb6cecd3c66c0173902800"
-  integrity sha512-bm3AQf45vR4gKggRfvJdYJ0gFLoCbsPxiFLSH6hTVYABptNHY6l9NrhnucVjQ/X+SPtLANT9lc0fFhikj+VBRA==
-
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.15.4", "@babel/runtime@^7.9.2":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.7.tgz#a5f3328dc41ff39d803f311cfe17703418cf9825"
-  integrity sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.0.tgz#b8d142fc0f7664fb3d9b5833fd40dcbab89276c0"
+  integrity sha512-etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.16.7":
+"@babel/runtime@^7.13.10":
   version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/traverse@^7.17.3":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
-  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.3"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.3"
-    "@babel/types" "^7.17.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.16.7", "@babel/types@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
-  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
-
-"@elastic/datemath@^5.0.3":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@elastic/datemath/-/datemath-5.0.3.tgz#7baccdab672b9a3ecb7fe8387580670936b58573"
-  integrity sha512-8Hbr1Uyjm5OcYBfEB60K7sCP6U3IXuWDaLaQmYv3UxgI4jqBWbakoemwWvsqPVUvnwEjuX6z7ghPZbefs8xiaA==
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
+  integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
   dependencies:
-    tslib "^1.9.3"
+    regenerator-runtime "^0.13.4"
 
 "@elastic/eui@34.6.0":
   version "34.6.0"
@@ -250,23 +123,70 @@
     uuid "^8.3.0"
     vfile "^4.2.0"
 
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
-  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+"@emotion/cache@^11.7.1":
+  version "11.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539"
+  integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==
+  dependencies:
+    "@emotion/memoize" "^0.7.4"
+    "@emotion/sheet" "^1.1.0"
+    "@emotion/utils" "^1.0.0"
+    "@emotion/weak-memoize" "^0.2.5"
+    stylis "4.0.13"
+
+"@emotion/hash@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
+  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
+
+"@emotion/memoize@^0.7.4":
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
+  integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
+
+"@emotion/react@^11.7.1":
+  version "11.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.7.1.tgz#3f800ce9b20317c13e77b8489ac4a0b922b2fe07"
+  integrity sha512-DV2Xe3yhkF1yT4uAUoJcYL1AmrnO5SVsdfvu+fBuS7IbByDeTVx9+wFmvx9Idzv7/78+9Mgx2Hcmr7Fex3tIyw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@emotion/cache" "^11.7.1"
+    "@emotion/serialize" "^1.0.2"
+    "@emotion/sheet" "^1.1.0"
+    "@emotion/utils" "^1.0.0"
+    "@emotion/weak-memoize" "^0.2.5"
+    hoist-non-react-statics "^3.3.1"
+
+"@emotion/serialize@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.2.tgz#77cb21a0571c9f68eb66087754a65fa97bfcd965"
+  integrity sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==
+  dependencies:
+    "@emotion/hash" "^0.8.0"
+    "@emotion/memoize" "^0.7.4"
+    "@emotion/unitless" "^0.7.5"
+    "@emotion/utils" "^1.0.0"
+    csstype "^3.0.2"
 
-"@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.11"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
-  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+"@emotion/sheet@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"
+  integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==
 
-"@jridgewell/trace-mapping@^0.3.0":
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
-  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
+"@emotion/unitless@^0.7.5":
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
+  integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
+
+"@emotion/utils@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
+  integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
+
+"@emotion/weak-memoize@^0.2.5":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
+  integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
 "@mapbox/hast-util-table-cell-style@^0.2.0":
   version "0.2.0"
@@ -304,18 +224,18 @@
     chalk "^4.1.0"
 
 "@parcel/compressor-brotli@^2.0.0":
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/@parcel/compressor-brotli/-/compressor-brotli-2.3.2.tgz#91c7f9e79db47779c5080728b35bd9e5d9e6cb72"
-  integrity sha512-DwzmdS9AwUisKRYood38KkYz6gP9bdUZTEu35RJbmOaQhaBTri28JV+MSTMM0bEs5nIn2bRpT5wlhabZz9p9gw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@parcel/compressor-brotli/-/compressor-brotli-2.2.1.tgz#0ebcb44f656e0f2093f6fa43ef074fbc12d77a49"
+  integrity sha512-CXmneKgudev9VthRShKL20JTV8paYS53A2LBA5nspfgEPnbFeAzX2LV0/QqY983+f+WCEWzieySGcVRxCxK5nQ==
   dependencies:
-    "@parcel/plugin" "2.3.2"
+    "@parcel/plugin" "^2.2.1"
 
 "@parcel/compressor-gzip@^2.0.0":
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/@parcel/compressor-gzip/-/compressor-gzip-2.3.2.tgz#85c8e2364ff280208a30c67a73c9966b4a56160d"
-  integrity sha512-XMH3PJRI+urjpHZfSFW/qVNgRhDEpApvLEdobL8KbAhI5qtsD66PlaNPbaixr00d/qW3r/CHjgKPz69idMikNA==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@parcel/compressor-gzip/-/compressor-gzip-2.2.1.tgz#3c9182888ca83f86e8f1da48bbe2059e50ee7bb1"
+  integrity sha512-aj9TQifbxqWNQxhUUMvC/UJ6+fY+nPrqJbAJHjrJGrbYncjS0jok1Wkh40iu0qY5OAz3YGUvzadr3nFgL5UsDQ==
   dependencies:
-    "@parcel/plugin" "2.3.2"
+    "@parcel/plugin" "^2.2.1"
 
 "@parcel/compressor-raw@2.3.2":
   version "2.3.2"
@@ -588,7 +508,7 @@
     "@parcel/utils" "2.3.2"
     posthtml "^0.16.4"
 
-"@parcel/plugin@2.3.2":
+"@parcel/plugin@2.3.2", "@parcel/plugin@^2.2.1":
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/@parcel/plugin/-/plugin-2.3.2.tgz#7701c40567d2eddd5d5b2b6298949cd03a2a22fa"
   integrity sha512-SaLZAJX4KH+mrAmqmcy9KJN+V7L+6YNTlgyqYmfKlNiHu7aIjLL+3prX8QRcgGtjAYziCxvPj0cl1CCJssaiGg==
@@ -739,6 +659,15 @@
     "@parcel/plugin" "2.3.2"
     json5 "^2.2.0"
 
+"@parcel/transformer-less@^2.3.2":
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@parcel/transformer-less/-/transformer-less-2.3.2.tgz#5e9fe261e6d3a196f89cfb811e60c549f1034e37"
+  integrity sha512-elQ00PiUkadFM2DdZrqTciobXSQjPkZA5ZSfdC/lfW7aSP28bnLI1EV3FfHZhiwJcmJ/nccmT2ZwRVwJKus7hg==
+  dependencies:
+    "@parcel/plugin" "2.3.2"
+    "@parcel/source-map" "^2.0.0"
+    less "^4.1.1"
+
 "@parcel/transformer-postcss@2.3.2":
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/@parcel/transformer-postcss/-/transformer-postcss-2.3.2.tgz#a428c81569dd66758c5fab866dca69b4c6e59743"
@@ -781,15 +710,6 @@
     "@parcel/utils" "2.3.2"
     react-refresh "^0.9.0"
 
-"@parcel/transformer-sass@^2.0.0":
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-sass/-/transformer-sass-2.3.2.tgz#ee124d02acb1f44417f0d78d366302dd68aa412b"
-  integrity sha512-jVDdhyzfCYLY/91gOfMAT0Cj3a3czETD71WpvnXhzfctnhZZ/lhC1aFUJxlhIF1hkVNyZ1b9USCCBAD4fje2Jg==
-  dependencies:
-    "@parcel/plugin" "2.3.2"
-    "@parcel/source-map" "^2.0.0"
-    sass "^1.38.0"
-
 "@parcel/transformer-svg@2.3.2":
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/@parcel/transformer-svg/-/transformer-svg-2.3.2.tgz#9a66aef5011c7bbb1fa3ce9bb52ca56d8f0f964d"
@@ -804,22 +724,6 @@
     posthtml-render "^3.0.0"
     semver "^5.7.1"
 
-"@parcel/transformer-typescript-tsc@^2.3.2":
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/@parcel/transformer-typescript-tsc/-/transformer-typescript-tsc-2.3.2.tgz#4660a73cdcf90de26e08f6722ff0c877072f09ae"
-  integrity sha512-29Y9eMnC+PbP2g6wKXhN6yPVarautsNrbSrRaJENQySAQavv52qxvAPC8LVremSYEeYbgxrg/3TT5rq48kt1Ng==
-  dependencies:
-    "@parcel/plugin" "2.3.2"
-    "@parcel/source-map" "^2.0.0"
-    "@parcel/ts-utils" "2.3.2"
-
-"@parcel/ts-utils@2.3.2":
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/@parcel/ts-utils/-/ts-utils-2.3.2.tgz#d63f7027574f3c1a128e1c865d683d6aacb4476d"
-  integrity sha512-jYCHoSmU+oVtFA4q0BygVf74FpVnCDSNtVfLzd1EfGVHlBFMo9GzSY5luMTG4qhnNCDEEco89bkMIgjPHQ3qnA==
-  dependencies:
-    nullthrows "^1.1.1"
-
 "@parcel/types@2.3.2":
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/@parcel/types/-/types-2.3.2.tgz#7eb6925bc852a518dd75b742419e51292418769f"
@@ -897,9 +801,9 @@
     hoist-non-react-statics "^3.3.0"
 
 "@types/lodash@^4.14.160":
-  version "4.14.180"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.180.tgz#4ab7c9ddfc92ec4a887886483bc14c79fb380670"
-  integrity sha512-XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g==
+  version "4.14.178"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8"
+  integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==
 
 "@types/mdast@^3.0.0":
   version "3.0.10"
@@ -908,11 +812,6 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/node@^17.0.21":
-  version "17.0.21"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644"
-  integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==
-
 "@types/numeral@^0.0.28":
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/@types/numeral/-/numeral-0.0.28.tgz#e43928f0bda10b169b6f7ecf99e3ddf836b8ebe4"
@@ -945,13 +844,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-dom@^17.0.13":
-  version "17.0.13"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.13.tgz#a3323b974ee4280070982b3112351bb1952a7809"
-  integrity sha512-wEP+B8hzvy6ORDv1QBhcQia4j6ea4SFIBttHYpXKPFZRviBvknq0FRh3VrIxeXUmsPkwuXVZrVGG7KUVONmXCQ==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-input-autosize@^2.2.0":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@types/react-input-autosize/-/react-input-autosize-2.2.1.tgz#6a335212e7fce1e1a4da56ae2095c8c5c35fbfe6"
@@ -960,9 +852,9 @@
     "@types/react" "*"
 
 "@types/react-redux@^7.1.20":
-  version "7.1.23"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.23.tgz#3c2bb1bcc698ae69d70735f33c5a8e95f41ac528"
-  integrity sha512-D02o3FPfqQlfu2WeEYwh3x2otYd2Dk1o8wAfsA0B1C2AJEFxE663Ozu7JzuWbznGgW248NaOF6wsqCGNq9d3qw==
+  version "7.1.22"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.22.tgz#0eab76a37ef477cc4b53665aeaf29cb60631b72a"
+  integrity sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==
   dependencies:
     "@types/hoist-non-react-statics" "^3.3.0"
     "@types/react" "*"
@@ -983,10 +875,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^17.0.40":
-  version "17.0.40"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.40.tgz#dc010cee6254d5239a138083f3799a16638e6bad"
-  integrity sha512-UrXhD/JyLH+W70nNSufXqMZNuUD2cXHu6UjCllC6pmOQgBX4SGXOH8fjRka0O0Ee0HrFxapDD8Bwn81Kmiz6jQ==
+"@types/react@*":
+  version "17.0.38"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.38.tgz#f24249fefd89357d5fa71f739a686b8d7c7202bd"
+  integrity sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -1026,11 +918,6 @@ abortcontroller-polyfill@^1.1.9:
   resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz#1b5b487bd6436b5b764fd52a612509702c3144b5"
   integrity sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q==
 
-acorn@^8.5.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -1050,14 +937,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
 aria-hidden@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.1.3.tgz#bb48de18dc84787a3c6eee113709c473c64ec254"
@@ -1065,7 +944,7 @@ aria-hidden@^1.1.3:
   dependencies:
     tslib "^1.0.0"
 
-attr-accept@^2.2.2:
+attr-accept@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b"
   integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==
@@ -1087,11 +966,6 @@ base-x@^3.0.8:
   dependencies:
     safe-buffer "^5.0.1"
 
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
 boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -1110,20 +984,13 @@ brace@^0.11.1:
   resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58"
   integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg=
 
-braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-browserslist@^4.0.0, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.6.6:
-  version "4.20.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88"
-  integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==
+browserslist@^4.0.0, browserslist@^4.16.6, browserslist@^4.6.6:
+  version "4.19.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.3.tgz#29b7caad327ecf2859485f696f9604214bedd383"
+  integrity sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==
   dependencies:
-    caniuse-lite "^1.0.30001317"
-    electron-to-chromium "^1.4.84"
+    caniuse-lite "^1.0.30001312"
+    electron-to-chromium "^1.4.71"
     escalade "^3.1.1"
     node-releases "^2.0.2"
     picocolors "^1.0.0"
@@ -1148,10 +1015,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001317:
-  version "1.0.30001317"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz#0548fb28fd5bc259a70b8c1ffdbe598037666a1b"
-  integrity sha512-xIZLh8gBm4dqNX0gkzrBeyI86J2eCjWzYAs40q88smG844YIrN4tVQl/RhquHvKEKImWWFIVh1Lxe5n1G/N+GQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001312:
+  version "1.0.30001312"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz#e11eba4b87e24d22697dae05455d5aea28550d5f"
+  integrity sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==
 
 ccount@^1.0.0:
   version "1.1.0"
@@ -1195,21 +1062,6 @@ character-reference-invalid@^1.0.0:
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
   integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
 
-"chokidar@>=3.0.0 <4.0.0":
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
 chroma-js@^2.1.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.4.2.tgz#dffc214ed0c11fa8eefca2c36651d8e57cbfb2b0"
@@ -1307,12 +1159,12 @@ concurrently@^6.3.0:
     tree-kill "^1.2.2"
     yargs "^16.2.0"
 
-convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
+copy-anything@^2.0.1:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480"
+  integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==
   dependencies:
-    safe-buffer "~5.1.1"
+    is-what "^3.14.1"
 
 cosmiconfig@^7.0.1:
   version "7.0.1"
@@ -1384,52 +1236,52 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssnano-preset-default@^*:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.4.tgz#eced79bbc1ab7270337c4038a21891daac2329bc"
-  integrity sha512-w1Gg8xsebln6/axZ6qDFQHuglrGfbIHOIx0g4y9+etRlRab8CGpSpe6UMsrgJe4zhCaJ0LwLmc+PhdLRTwnhIA==
+cssnano-preset-default@^5.1.12:
+  version "5.1.12"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.12.tgz#64e2ad8e27a279e1413d2d2383ef89a41c909be9"
+  integrity sha512-rO/JZYyjW1QNkWBxMGV28DW7d98UDLaF759frhli58QFehZ+D/LSmwQ2z/ylBAe2hUlsIWTq6NYGfQPq65EF9w==
   dependencies:
     css-declaration-sorter "^6.0.3"
-    cssnano-utils "^*"
-    postcss-calc "^8.2.3"
-    postcss-colormin "^*"
-    postcss-convert-values "^*"
-    postcss-discard-comments "^*"
-    postcss-discard-duplicates "^*"
-    postcss-discard-empty "^*"
-    postcss-discard-overridden "^*"
-    postcss-merge-longhand "^*"
-    postcss-merge-rules "^*"
-    postcss-minify-font-values "^*"
-    postcss-minify-gradients "^*"
-    postcss-minify-params "^*"
-    postcss-minify-selectors "^*"
-    postcss-normalize-charset "^*"
-    postcss-normalize-display-values "^*"
-    postcss-normalize-positions "^*"
-    postcss-normalize-repeat-style "^*"
-    postcss-normalize-string "^*"
-    postcss-normalize-timing-functions "^*"
-    postcss-normalize-unicode "^*"
-    postcss-normalize-url "^*"
-    postcss-normalize-whitespace "^*"
-    postcss-ordered-values "^*"
-    postcss-reduce-initial "^*"
-    postcss-reduce-transforms "^*"
-    postcss-svgo "^*"
-    postcss-unique-selectors "^*"
-
-cssnano-utils@^*, cssnano-utils@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
-  integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
+    cssnano-utils "^3.0.2"
+    postcss-calc "^8.2.0"
+    postcss-colormin "^5.2.5"
+    postcss-convert-values "^5.0.4"
+    postcss-discard-comments "^5.0.3"
+    postcss-discard-duplicates "^5.0.3"
+    postcss-discard-empty "^5.0.3"
+    postcss-discard-overridden "^5.0.4"
+    postcss-merge-longhand "^5.0.6"
+    postcss-merge-rules "^5.0.6"
+    postcss-minify-font-values "^5.0.4"
+    postcss-minify-gradients "^5.0.6"
+    postcss-minify-params "^5.0.5"
+    postcss-minify-selectors "^5.1.3"
+    postcss-normalize-charset "^5.0.3"
+    postcss-normalize-display-values "^5.0.3"
+    postcss-normalize-positions "^5.0.4"
+    postcss-normalize-repeat-style "^5.0.4"
+    postcss-normalize-string "^5.0.4"
+    postcss-normalize-timing-functions "^5.0.3"
+    postcss-normalize-unicode "^5.0.4"
+    postcss-normalize-url "^5.0.5"
+    postcss-normalize-whitespace "^5.0.4"
+    postcss-ordered-values "^5.0.5"
+    postcss-reduce-initial "^5.0.3"
+    postcss-reduce-transforms "^5.0.4"
+    postcss-svgo "^5.0.4"
+    postcss-unique-selectors "^5.0.4"
+
+cssnano-utils@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.0.2.tgz#d82b4991a27ba6fec644b39bab35fe027137f516"
+  integrity sha512-KhprijuQv2sP4kT92sSQwhlK3SJTbDIsxcfIEySB0O+3m9esFOai7dP9bMx5enHAh2MwarVIcnwiWoOm01RIbQ==
 
 cssnano@^5.0.15:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.4.tgz#c648192e8e2f1aacb7d839e6aa3706b50cc7f8e4"
-  integrity sha512-hbfhVZreEPyzl+NbvRsjNo54JOX80b+j6nqG2biLVLaZHJEiqGyMh4xDGHtwhUKd5p59mj2GlDqlUBwJUuIu5A==
+  version "5.0.17"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.17.tgz#ff45713c05cfc780a1aeb3e663b6f224d091cabf"
+  integrity sha512-fmjLP7k8kL18xSspeXTzRhaFtRI7DL9b8IcXR80JgtnWBpvAzHT7sCR/6qdn0tnxIaINUN6OEQu83wF57Gs3Xw==
   dependencies:
-    cssnano-preset-default "^*"
+    cssnano-preset-default "^5.1.12"
     lilconfig "^2.0.3"
     yaml "^1.10.2"
 
@@ -1441,21 +1293,26 @@ csso@^4.2.0:
     css-tree "^1.1.2"
 
 csstype@^3.0.2:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
-  integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5"
+  integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==
+
+csstype@^3.0.8:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
+  integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
 
 date-fns@^2.16.1:
   version "2.28.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
   integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
 
-debug@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+debug@^3.2.6:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
-    ms "2.1.2"
+    ms "^2.1.1"
 
 detect-libc@^1.0.3:
   version "1.0.3"
@@ -1512,10 +1369,10 @@ dotenv@^7.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"
   integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
 
-electron-to-chromium@^1.4.84:
-  version "1.4.87"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.87.tgz#1aeacfa50b2fbf3ecf50a78fbebd8f259d4fe208"
-  integrity sha512-EXXTtDHFUKdFVkCnhauU7Xp8wmFC1ZG6GK9a1BeI2vvNhy61IwfNPo/CRexhf7mh4ajxAHJPind62BzpzVUeuQ==
+electron-to-chromium@^1.4.71:
+  version "1.4.71"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz#17056914465da0890ce00351a3b946fd4cd51ff6"
+  integrity sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -1537,6 +1394,13 @@ entities@^3.0.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
   integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
 
+errno@^0.1.1:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
+  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
+  dependencies:
+    prr "~1.0.1"
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -1559,24 +1423,17 @@ extend@^3.0.0:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-file-selector@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.4.0.tgz#59ec4f27aa5baf0841e9c6385c8386bef4d18b17"
-  integrity sha512-iACCiXeMYOvZqlF1kTiYINzgepRBymz1wwjiuup9u9nayhb6g4fSwiyJ/6adli+EPwrWtpgQAh2PoS7HukEGEg==
+file-selector@^0.2.2:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.2.4.tgz#7b98286f9dbb9925f420130ea5ed0a69238d4d80"
+  integrity sha512-ZDsQNbrv6qRi1YTDOEWzf5J2KjZ9KMI1Q2SGeTkCJmNNW25Jg4TW4UMcmoqcg4WrAyKRcpBXdbWRxkfrOzVRbA==
   dependencies:
     tslib "^2.0.3"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-focus-lock@^0.10.2:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.10.2.tgz#561c62bae8387ecba1dd8e58a6df5ec29835c644"
-  integrity sha512-DSaI/UHZ/02sg1P616aIWgToQcrKKBmcCvomDZ1PZvcJFj350PnWhSJxJ76T3e5/GbtQEARIACtbrdlrF9C5kA==
+focus-lock@^0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.10.1.tgz#5f46fa74fefb87144479c2f8e276f0eedd8081b2"
+  integrity sha512-b9yUklCi4fTu2GXn7dnaVf4hiLVVBp7xTiZarAHMODV2To6Bitf6F/UI67RmKbdgJQeVwI1UO0d9HYNbXt3GkA==
   dependencies:
     tslib "^2.0.3"
 
@@ -1585,16 +1442,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-gensync@^1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
-  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -1610,13 +1457,6 @@ get-port@^4.2.0:
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
   integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
 
-glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
 glob@^7.1.3:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
@@ -1629,18 +1469,18 @@ glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
 globals@^13.2.0:
-  version "13.13.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b"
-  integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==
+  version "13.12.1"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.1.tgz#ec206be932e6c77236677127577aa8e50bf1c5cb"
+  integrity sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==
   dependencies:
     type-fest "^0.20.2"
 
+graceful-fs@^4.1.2:
+  version "4.2.9"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
+  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -1746,7 +1586,7 @@ hastscript@^6.0.0:
     property-information "^5.0.0"
     space-separated-tokens "^1.0.0"
 
-hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -1777,10 +1617,17 @@ htmlparser2@^7.1.1:
     domutils "^2.8.0"
     entities "^3.0.1"
 
-immutable@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
-  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
+iconv-lite@^0.4.4:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+image-size@~0.5.0:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
 import-fresh@^3.2.1:
   version "3.3.0"
@@ -1833,13 +1680,6 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
 is-buffer@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
@@ -1850,23 +1690,11 @@ is-decimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
   integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
 
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
 is-hexadecimal@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
@@ -1877,16 +1705,16 @@ is-json@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-json/-/is-json-2.0.1.tgz#6be166d144828a131d686891b983df62c39491ff"
   integrity sha1-a+Fm0USCihMdaGiRuYPfYsOUkf8=
 
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
 is-plain-obj@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
 
+is-what@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
+  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
+
 is-whitespace-character@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
@@ -1907,11 +1735,6 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
@@ -1922,13 +1745,30 @@ json-source-map@^0.6.1:
   resolved "https://registry.yarnpkg.com/json-source-map/-/json-source-map-0.6.1.tgz#e0b1f6f4ce13a9ad57e2ae165a24d06e62c79a0f"
   integrity sha512-1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg==
 
-json5@^2.1.2, json5@^2.2.0:
+json5@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
   integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
   dependencies:
     minimist "^1.2.5"
 
+less@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/less/-/less-4.1.2.tgz#6099ee584999750c2624b65f80145f8674e4b4b0"
+  integrity sha512-EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA==
+  dependencies:
+    copy-anything "^2.0.1"
+    parse-node-version "^1.0.1"
+    tslib "^2.3.0"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    make-dir "^2.1.0"
+    mime "^1.4.1"
+    needle "^2.5.2"
+    source-map "~0.6.0"
+
 lilconfig@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082"
@@ -1940,9 +1780,9 @@ lines-and-columns@^1.1.6:
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 lmdb@^2.0.2:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/lmdb/-/lmdb-2.2.6.tgz#a52ef533812b8abcbe0033fc9d74d215e7dfc0a0"
-  integrity sha512-UmQV0oZZcV3EN6rjcAjIiuWcc3MYZGWQ0GUYz46Ron5fuTa/dUow7WSQa6leFkvZIKVUdECBWVw96tckfEzUFQ==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/lmdb/-/lmdb-2.2.1.tgz#b7fd22ed2268ab74aa71108b793678314a7b94bb"
+  integrity sha512-tUlIjyJvbd4mqdotI9Xe+3PZt/jqPx70VKFDrKMYu09MtBWOT3y2PbuTajX+bJFDjbgLkQC0cTx2n6dithp/zQ==
   dependencies:
     msgpackr "^1.5.4"
     nan "^2.14.2"
@@ -1950,6 +1790,11 @@ lmdb@^2.0.2:
     ordered-binary "^1.2.4"
     weak-lru-cache "^1.2.2"
 
+lodash-es@^4.17.15:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -1982,6 +1827,14 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
+make-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 markdown-escapes@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
@@ -2023,6 +1876,11 @@ mdurl@^1.0.0:
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
+mime@^1.4.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
 minimatch@^3.0.4:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -2035,15 +1893,10 @@ minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-moment@^2.29.1:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 msgpackr-extract@^1.0.14:
   version "1.0.16"
@@ -2054,9 +1907,9 @@ msgpackr-extract@^1.0.14:
     node-gyp-build "^4.2.3"
 
 msgpackr@^1.5.1, msgpackr@^1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.5.5.tgz#c0562abc2951d7e29f75d77a8656b01f103a042c"
-  integrity sha512-JG0V47xRIQ9pyUnx6Hb4+3TrQoia2nA3UIdmyTldhxaxtKFkekkKpUW/N6fwHwod9o4BGuJGtouxOk+yCP5PEA==
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.5.4.tgz#2b6ea6cb7d79c0ad98fc76c68163c48eda50cf0d"
+  integrity sha512-Z7w5Jg+2Q9z9gJxeM68d7tSuWZZGnFIRhZnyqcZCa/1dKkhOCNvR1TUV3zzJ3+vj78vlwKRzUgVDlW4jiSOeDA==
   optionalDependencies:
     msgpackr-extract "^1.0.14"
 
@@ -2065,11 +1918,20 @@ nan@^2.14.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
-nanoid@^3.3.1:
+nanoid@^3.2.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
   integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
 
+needle@^2.5.2:
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684"
+  integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 node-addon-api@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
@@ -2092,11 +1954,6 @@ node-releases@^2.0.2:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
   integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
 
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
 normalize-url@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
@@ -2185,6 +2042,11 @@ parse-json@^5.0.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
+parse-node-version@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
+
 parse5@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
@@ -2210,12 +2072,12 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-postcss-calc@^8.2.3:
+postcss-calc@^8.2.0:
   version "8.2.4"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
   integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==
@@ -2223,176 +2085,176 @@ postcss-calc@^8.2.3:
     postcss-selector-parser "^6.0.9"
     postcss-value-parser "^4.2.0"
 
-postcss-colormin@^*:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a"
-  integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==
+postcss-colormin@^5.2.5:
+  version "5.2.5"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.5.tgz#d1fc269ac2ad03fe641d462b5d1dada35c69968a"
+  integrity sha512-+X30aDaGYq81mFqwyPpnYInsZQnNpdxMX0ajlY7AExCexEFkPVV+KrO7kXwayqEWL2xwEbNQ4nUO0ZsRWGnevg==
   dependencies:
     browserslist "^4.16.6"
     caniuse-api "^3.0.0"
     colord "^2.9.1"
     postcss-value-parser "^4.2.0"
 
-postcss-convert-values@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz#f8d3abe40b4ce4b1470702a0706343eac17e7c10"
-  integrity sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==
+postcss-convert-values@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.4.tgz#3e74dd97c581f475ae7b4500bc0a7c4fb3a6b1b6"
+  integrity sha512-bugzSAyjIexdObovsPZu/sBCTHccImJxLyFgeV0MmNBm/Lw5h5XnjfML6gzEmJ3A6nyfCW7hb1JXzcsA4Zfbdw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-discard-comments@^*:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz#e90019e1a0e5b99de05f63516ce640bd0df3d369"
-  integrity sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==
+postcss-discard-comments@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.3.tgz#011acb63418d600fdbe18804e1bbecb543ad2f87"
+  integrity sha512-6W5BemziRoqIdAKT+1QjM4bNcJAQ7z7zk073730NHg4cUXh3/rQHHj7pmYxUB9aGhuRhBiUf0pXvIHkRwhQP0Q==
 
-postcss-discard-duplicates@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848"
-  integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==
+postcss-discard-duplicates@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.3.tgz#10f202a4cfe9d407b73dfea7a477054d21ea0c1f"
+  integrity sha512-vPtm1Mf+kp7iAENTG7jI1MN1lk+fBqL5y+qxyi4v3H+lzsXEdfS3dwUZD45KVhgzDEgduur8ycB4hMegyMTeRw==
 
-postcss-discard-empty@^*:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c"
-  integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==
+postcss-discard-empty@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.3.tgz#ec185af4a3710b88933b0ff751aa157b6041dd6a"
+  integrity sha512-xGJugpaXKakwKI7sSdZjUuN4V3zSzb2Y0LOlmTajFbNinEjTfVs9PFW2lmKBaC/E64WwYppfqLD03P8l9BuueA==
 
-postcss-discard-overridden@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
-  integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
+postcss-discard-overridden@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.4.tgz#cc999d6caf18ea16eff8b2b58f48ec3ddee35c9c"
+  integrity sha512-3j9QH0Qh1KkdxwiZOW82cId7zdwXVQv/gRXYDnwx5pBtR1sTkU4cXRK9lp5dSdiM0r0OICO/L8J6sV1/7m0kHg==
 
-postcss-merge-longhand@^*:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.2.tgz#fe3002f38ad5827c1d6f7d5bb3f71d2566a2a138"
-  integrity sha512-18/bp9DZnY1ai9RlahOfLBbmIUKfKFPASxRCiZ1vlpZqWPCn8qWPFlEozqmWL+kBtcEQmG8W9YqGCstDImvp/Q==
+postcss-merge-longhand@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.6.tgz#090e60d5d3b3caad899f8774f8dccb33217d2166"
+  integrity sha512-rkmoPwQO6ymJSmWsX6l2hHeEBQa7C4kJb9jyi5fZB1sE8nSCv7sqchoYPixRwX/yvLoZP2y6FA5kcjiByeJqDg==
   dependencies:
     postcss-value-parser "^4.2.0"
-    stylehacks "^*"
+    stylehacks "^5.0.3"
 
-postcss-merge-rules@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.0.tgz#a2d5117eba09c8686a5471d97bd9afcf30d1b41f"
-  integrity sha512-NecukEJovQ0mG7h7xV8wbYAkXGTO3MPKnXvuiXzOKcxoOodfTTKYjeo8TMhAswlSkjcPIBlnKbSFcTuVSDaPyQ==
+postcss-merge-rules@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.6.tgz#26b37411fe1e80202fcef61cab027265b8925f2b"
+  integrity sha512-nzJWJ9yXWp8AOEpn/HFAW72WKVGD2bsLiAmgw4hDchSij27bt6TF+sIK0cJUBAYT3SGcjtGGsOR89bwkkMuMgQ==
   dependencies:
     browserslist "^4.16.6"
     caniuse-api "^3.0.0"
-    cssnano-utils "^3.1.0"
+    cssnano-utils "^3.0.2"
     postcss-selector-parser "^6.0.5"
 
-postcss-minify-font-values@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b"
-  integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==
+postcss-minify-font-values@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.4.tgz#627d824406b0712243221891f40a44fffe1467fd"
+  integrity sha512-RN6q3tyuEesvyCYYFCRGJ41J1XFvgV+dvYGHr0CeHv8F00yILlN8Slf4t8XW4IghlfZYCeyRrANO6HpJ948ieA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-minify-gradients@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.0.tgz#de0260a67a13b7b321a8adc3150725f2c6612377"
-  integrity sha512-J/TMLklkONn3LuL8wCwfwU8zKC1hpS6VcxFkNUNjmVt53uKqrrykR3ov11mdUYyqVMEx67slMce0tE14cE4DTg==
+postcss-minify-gradients@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.6.tgz#b07cef51a93f075e94053fd972ff1cba2eaf6503"
+  integrity sha512-E/dT6oVxB9nLGUTiY/rG5dX9taugv9cbLNTFad3dKxOO+BQg25Q/xo2z2ddG+ZB1CbkZYaVwx5blY8VC7R/43A==
   dependencies:
     colord "^2.9.1"
-    cssnano-utils "^3.1.0"
+    cssnano-utils "^3.0.2"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-params@^*:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.1.tgz#c5f8e7dac565e577dd99904787fbec576cbdbfb2"
-  integrity sha512-WCpr+J9Uz8XzMpAfg3UL8z5rde6MifBbh5L8bn8S2F5hq/YDJJzASYCnCHvAB4Fqb94ys8v95ULQkW2EhCFvNg==
+postcss-minify-params@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.5.tgz#86cb624358cd45c21946f8c317893f0449396646"
+  integrity sha512-YBNuq3Rz5LfLFNHb9wrvm6t859b8qIqfXsWeK7wROm3jSKNpO1Y5e8cOyBv6Acji15TgSrAwb3JkVNCqNyLvBg==
   dependencies:
     browserslist "^4.16.6"
-    cssnano-utils "^3.1.0"
+    cssnano-utils "^3.0.2"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-selectors@^*:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c"
-  integrity sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==
+postcss-minify-selectors@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.3.tgz#6ac12d52aa661fd509469d87ab2cebb0a1e3a1b5"
+  integrity sha512-9RJfTiQEKA/kZhMaEXND893nBqmYQ8qYa/G+uPdVnXF6D/FzpfI6kwBtWEcHx5FqDbA79O9n6fQJfrIj6M8jvQ==
   dependencies:
     postcss-selector-parser "^6.0.5"
 
-postcss-normalize-charset@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed"
-  integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==
+postcss-normalize-charset@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.3.tgz#719fb9f9ca9835fcbd4fed8d6e0d72a79e7b5472"
+  integrity sha512-iKEplDBco9EfH7sx4ut7R2r/dwTnUqyfACf62Unc9UiyFuI7uUqZZtY+u+qp7g8Qszl/U28HIfcsI3pEABWFfA==
 
-postcss-normalize-display-values@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8"
-  integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==
+postcss-normalize-display-values@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.3.tgz#94cc82e20c51cc4ffba6b36e9618adc1e50db8c1"
+  integrity sha512-FIV5FY/qs4Ja32jiDb5mVj5iWBlS3N8tFcw2yg98+8MkRgyhtnBgSC0lxU+16AMHbjX5fbSJgw5AXLMolonuRQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-positions@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz#902a7cb97cf0b9e8b1b654d4a43d451e48966458"
-  integrity sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==
+postcss-normalize-positions@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.4.tgz#4001f38c99675437b83277836fb4291887fcc6cc"
+  integrity sha512-qynirjBX0Lc73ROomZE3lzzmXXTu48/QiEzKgMeqh28+MfuHLsuqC9po4kj84igZqqFGovz8F8hf44hA3dPYmQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-repeat-style@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz#f6d6fd5a54f51a741cc84a37f7459e60ef7a6398"
-  integrity sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==
+postcss-normalize-repeat-style@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.4.tgz#d005adf9ee45fae78b673031a376c0c871315145"
+  integrity sha512-Innt+wctD7YpfeDR7r5Ik6krdyppyAg2HBRpX88fo5AYzC1Ut/l3xaxACG0KsbX49cO2n5EB13clPwuYVt8cMA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-string@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228"
-  integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==
+postcss-normalize-string@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.4.tgz#b5e00a07597e7aa8a871817bfeac2bfaa59c3333"
+  integrity sha512-Dfk42l0+A1CDnVpgE606ENvdmksttLynEqTQf5FL3XGQOyqxjbo25+pglCUvziicTxjtI2NLUR6KkxyUWEVubQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-timing-functions@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb"
-  integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==
+postcss-normalize-timing-functions@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.3.tgz#47210227bfcba5e52650d7a18654337090de7072"
+  integrity sha512-QRfjvFh11moN4PYnJ7hia4uJXeFotyK3t2jjg8lM9mswleGsNw2Lm3I5wO+l4k1FzK96EFwEVn8X8Ojrp2gP4g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-unicode@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75"
-  integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==
+postcss-normalize-unicode@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.4.tgz#02866096937005cdb2c17116c690f29505a1623d"
+  integrity sha512-W79Regn+a+eXTzB+oV/8XJ33s3pDyFTND2yDuUCo0Xa3QSy1HtNIfRVPXNubHxjhlqmMFADr3FSCHT84ITW3ig==
   dependencies:
     browserslist "^4.16.6"
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-url@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc"
-  integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==
+postcss-normalize-url@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.5.tgz#c39efc12ff119f6f45f0b4f516902b12c8080e3a"
+  integrity sha512-Ws3tX+PcekYlXh+ycAt0wyzqGthkvVtZ9SZLutMVvHARxcpu4o7vvXcNoiNKyjKuWecnjS6HDI3fjBuDr5MQxQ==
   dependencies:
     normalize-url "^6.0.1"
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-whitespace@^*:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa"
-  integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==
+postcss-normalize-whitespace@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.4.tgz#1d477e7da23fecef91fc4e37d462272c7b55c5ca"
+  integrity sha512-wsnuHolYZjMwWZJoTC9jeI2AcjA67v4UuidDrPN9RnX8KIZfE+r2Nd6XZRwHVwUiHmRvKQtxiqo64K+h8/imaw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-ordered-values@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.0.tgz#04ef429e0991b0292bc918b135cd4c038f7b889f"
-  integrity sha512-wU4Z4D4uOIH+BUKkYid36gGDJNQtkVJT7Twv8qH6UyfttbbJWyw4/xIPuVEkkCtQLAJ0EdsNSh8dlvqkXb49TA==
+postcss-ordered-values@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.5.tgz#e878af822a130c3f3709737e24cb815ca7c6d040"
+  integrity sha512-mfY7lXpq+8bDEHfP+muqibDPhZ5eP9zgBEF9XRvoQgXcQe2Db3G1wcvjbnfjXG6wYsl+0UIjikqq4ym1V2jGMQ==
   dependencies:
-    cssnano-utils "^3.1.0"
+    cssnano-utils "^3.0.2"
     postcss-value-parser "^4.2.0"
 
-postcss-reduce-initial@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6"
-  integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==
+postcss-reduce-initial@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.3.tgz#68891594defd648253703bbd8f1093162f19568d"
+  integrity sha512-c88TkSnQ/Dnwgb4OZbKPOBbCaauwEjbECP5uAuFPOzQ+XdjNjRH7SG0dteXrpp1LlIFEKK76iUGgmw2V0xeieA==
   dependencies:
     browserslist "^4.16.6"
     caniuse-api "^3.0.0"
 
-postcss-reduce-transforms@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9"
-  integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==
+postcss-reduce-transforms@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.4.tgz#717e72d30befe857f7d2784dba10eb1157863712"
+  integrity sha512-VIJB9SFSaL8B/B7AXb7KHL6/GNNbbCHslgdzS9UDfBZYIA2nx8NLY7iD/BXFSO/1sRUILzBTfHCoW5inP37C5g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -2404,18 +2266,18 @@ postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-svgo@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d"
-  integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==
+postcss-svgo@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.4.tgz#cfa8682f47b88f7cd75108ec499e133b43102abf"
+  integrity sha512-yDKHvULbnZtIrRqhZoA+rxreWpee28JSRH/gy9727u0UCgtpv1M/9WEWY3xySlFa0zQJcqf6oCBJPR5NwkmYpg==
   dependencies:
     postcss-value-parser "^4.2.0"
     svgo "^2.7.0"
 
-postcss-unique-selectors@^*:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6"
-  integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==
+postcss-unique-selectors@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.4.tgz#08e188126b634ddfa615fb1d6c262bafdd64826e"
+  integrity sha512-5ampwoSDJCxDPoANBIlMgoBcYUHnhaiuLYJR5pj1DLnYQvMRVyFuTA5C3Bvt+aHtiqWpJkD/lXT50Vo1D0ZsAQ==
   dependencies:
     postcss-selector-parser "^6.0.5"
 
@@ -2425,28 +2287,21 @@ postcss-value-parser@^4.2.0:
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
 postcss@^8.4.5:
-  version "8.4.12"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905"
-  integrity sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==
+  version "8.4.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1"
+  integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==
   dependencies:
-    nanoid "^3.3.1"
+    nanoid "^3.2.0"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-posthtml-parser@^0.10.1:
+posthtml-parser@^0.10.0, posthtml-parser@^0.10.1:
   version "0.10.2"
   resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.10.2.tgz#df364d7b179f2a6bf0466b56be7b98fd4e97c573"
   integrity sha512-PId6zZ/2lyJi9LiKfe+i2xv57oEjJgWbsHGGANwos5AvdQp98i6AtamAl8gzSVFGfQ43Glb5D614cvZf012VKg==
   dependencies:
     htmlparser2 "^7.1.1"
 
-posthtml-parser@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.11.0.tgz#25d1c7bf811ea83559bc4c21c189a29747a24b7a"
-  integrity sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==
-  dependencies:
-    htmlparser2 "^7.1.1"
-
 posthtml-render@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/posthtml-render/-/posthtml-render-3.0.0.tgz#97be44931496f495b4f07b99e903cc70ad6a3205"
@@ -2455,17 +2310,17 @@ posthtml-render@^3.0.0:
     is-json "^2.0.1"
 
 posthtml@^0.16.4, posthtml@^0.16.5:
-  version "0.16.6"
-  resolved "https://registry.yarnpkg.com/posthtml/-/posthtml-0.16.6.tgz#e2fc407f67a64d2fa3567afe770409ffdadafe59"
-  integrity sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==
+  version "0.16.5"
+  resolved "https://registry.yarnpkg.com/posthtml/-/posthtml-0.16.5.tgz#d32f5cf32436516d49e0884b2367d0a1424136f6"
+  integrity sha512-1qOuPsywVlvymhTFIBniDXwUDwvlDri5KUQuBqjmCc8Jj4b/HDSVWU//P6rTWke5rzrk+vj7mms2w8e1vD0nnw==
   dependencies:
-    posthtml-parser "^0.11.0"
+    posthtml-parser "^0.10.0"
     posthtml-render "^3.0.0"
 
-prismjs@~1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057"
-  integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==
+prismjs@~1.25.0:
+  version "1.25.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756"
+  integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==
 
 prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
@@ -2483,6 +2338,11 @@ property-information@^5.0.0, property-information@^5.3.0:
   dependencies:
     xtend "^4.0.0"
 
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+
 querystringify@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
@@ -2524,31 +2384,30 @@ react-clientside-effect@^1.2.5:
   dependencies:
     "@babel/runtime" "^7.12.13"
 
-react-dom@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
-  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
+react-dom@^18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
+  integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    scheduler "^0.20.2"
+    scheduler "^0.23.0"
 
 react-dropzone@^11.2.0:
-  version "11.7.1"
-  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.7.1.tgz#3851bb75b26af0bf1b17ce1449fd980e643b9356"
-  integrity sha512-zxCMwhfPy1olUEbw3FLNPLhAm/HnaYH5aELIEglRbqabizKAdHs0h+WuyOpmA+v1JXn0++fpQDdNfUagWt5hJQ==
+  version "11.5.3"
+  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.5.3.tgz#757d4980fcae839896a894e41d3e72df04981f86"
+  integrity sha512-68+T6sWW5L89qJnn3SD1aRazhuRBhTT9JOI1W8vI5YWsfegM4C7tlGbPH1AgEbmZY5s8E8L0QhX0e3VdAa0KWA==
   dependencies:
-    attr-accept "^2.2.2"
-    file-selector "^0.4.0"
-    prop-types "^15.8.1"
+    attr-accept "^2.2.1"
+    file-selector "^0.2.2"
+    prop-types "^15.7.2"
 
 react-focus-lock@^2.6.0:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.8.1.tgz#a28f06a4ef5eab7d4ef0d859512772ec1331d529"
-  integrity sha512-4kb9I7JIiBm0EJ+CsIBQ+T1t5qtmwPRbFGYFQ0t2q2qIpbFbYTHDjnjJVFB7oMBtXityEOQehblJPjqSIf3Amg==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.7.1.tgz#a9fbb3fa4efaee32162406e5eb96ae658964193b"
+  integrity sha512-ImSeVmcrLKNMqzUsIdqOkXwTVltj79OPu43oT8tVun7eIckA4VdM7UmYUFo3H/UC2nRVgagMZGFnAOQEDiDYcA==
   dependencies:
     "@babel/runtime" "^7.0.0"
-    focus-lock "^0.10.2"
+    focus-lock "^0.10.1"
     prop-types "^15.6.2"
     react-clientside-effect "^1.2.5"
     use-callback-ref "^1.2.5"
@@ -2615,9 +2474,9 @@ react-remove-scroll-bar@^2.1.0:
     tslib "^1.0.0"
 
 react-remove-scroll@^2.4.1:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.4.4.tgz#2dfff377cf17efc00de39dad51c143fc7a1b9e3e"
-  integrity sha512-EyC5ohYhaeKbThMSQxuN2i+QC5HqV3AJvNZKEdiATITexu0gHm00+5ko0ltNS1ajYJVeDgVG2baRSCei0AUWlQ==
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.4.3.tgz#83d19b02503b04bd8141ed6e0b9e6691a2e935a6"
+  integrity sha512-lGWYXfV6jykJwbFpsuPdexKKzp96f3RbvGapDSIdcyGvHb7/eqyn46C7/6h+rUzYar1j5mdU+XECITHXCKBk9Q==
   dependencies:
     react-remove-scroll-bar "^2.1.0"
     react-style-singleton "^2.1.0"
@@ -2647,20 +2506,17 @@ react-window@^1.8.5:
     "@babel/runtime" "^7.0.0"
     memoize-one ">=3.1.1 <6"
 
-react@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
-  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
+react@^18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
+  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
 
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
+redisinsight-plugin-sdk@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/redisinsight-plugin-sdk/-/redisinsight-plugin-sdk-1.1.0.tgz#5ac39dc5398b1f73f2357e67ce51e1875fbece4f"
+  integrity sha512-TtPYfpxVZlwASkO8WFEB8+l6H9N9SVGwVxU0hRGzkEdXZyeQ+Xm/1WwnkGKMaeJyvfpIGrPWVl+lN4pDQ3iqbA==
 
 redux@^4.0.0, redux@^4.0.4:
   version "4.1.2"
@@ -2670,13 +2526,13 @@ redux@^4.0.0, redux@^4.0.4:
     "@babel/runtime" "^7.9.2"
 
 refractor@^3.4.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.6.0.tgz#ac318f5a0715ead790fcfb0c71f4dd83d977935a"
-  integrity sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.5.0.tgz#334586f352dda4beaf354099b48c2d18e0819aec"
+  integrity sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==
   dependencies:
     hastscript "^6.0.0"
     parse-entities "^2.0.0"
-    prismjs "~1.27.0"
+    prismjs "~1.25.0"
 
 regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
   version "0.13.9"
@@ -2782,38 +2638,28 @@ safe-buffer@^5.0.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass@^1.38.0:
-  version "1.49.9"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.9.tgz#b15a189ecb0ca9e24634bae5d1ebc191809712f9"
-  integrity sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==
-  dependencies:
-    chokidar ">=3.0.0 <4.0.0"
-    immutable "^4.0.0"
-    source-map-js ">=0.6.2 <2.0.0"
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-scheduler@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
-  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
+scheduler@^0.23.0:
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
+  integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
 
-semver@^5.7.0, semver@^5.7.1:
+semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -2826,7 +2672,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
+source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
@@ -2839,12 +2685,7 @@ source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@^0.5.0:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.0, source-map@^0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -2906,14 +2747,19 @@ style-to-object@^0.3.0:
   dependencies:
     inline-style-parser "0.1.1"
 
-stylehacks@^*:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520"
-  integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==
+stylehacks@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.3.tgz#2ef3de567bfa2be716d29a93bf3d208c133e8d04"
+  integrity sha512-ENcUdpf4yO0E1rubu8rkxI+JGQk4CgjchynZ4bDBJDfqdy+uhTRSWb8/F3Jtu+Bw5MW45Po3/aQGeIyyxgQtxg==
   dependencies:
     browserslist "^4.16.6"
     postcss-selector-parser "^6.0.4"
 
+stylis@4.0.13:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
+  integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -2954,11 +2800,10 @@ tabbable@^3.0.0:
   integrity sha512-wjB6puVXTYO0BSFtCmWQubA/KIn7Xvajw0x0l6eJUudMG/EAiJvIUnyNX6xO4NpGrJ16lbD0eUseB9WxW0vlpQ==
 
 terser@^5.2.0, terser@^5.9.0:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.1.tgz#4cf2ebed1f5bceef5c83b9f60104ac4a78b49e9c"
-  integrity sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
+  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
   dependencies:
-    acorn "^8.5.0"
     commander "^2.20.0"
     source-map "~0.7.2"
     source-map-support "~0.5.20"
@@ -2978,18 +2823,6 @@ tiny-invariant@^1.0.6:
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9"
   integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==
 
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
 tree-kill@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
@@ -3015,7 +2848,7 @@ tslib@^1.0.0, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.3, tslib@^2.3.1:
+tslib@^2.0.3, tslib@^2.3.0, tslib@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
@@ -3025,11 +2858,6 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-typescript@>=3.0.0:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
-  integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
-
 unherit@^1.0.4:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
@@ -3090,9 +2918,9 @@ unist-util-stringify-position@^2.0.0:
     "@types/unist" "^2.0.2"
 
 unist-util-stringify-position@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz#5c6aa07c90b1deffd9153be170dce628a869a447"
-  integrity sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz#d517d2883d74d0daa0b565adc3d10a02b4a8cde9"
+  integrity sha512-SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA==
   dependencies:
     "@types/unist" "^2.0.0"
 
@@ -3168,6 +2996,11 @@ uuid@^8.3.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+
 v8-compile-cache@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -3179,9 +3012,9 @@ vfile-location@^3.0.0, vfile-location@^3.2.0:
   integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==
 
 vfile-message@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.2.tgz#a2908f64d9e557315ec9d7ea3a910f658ac05f7d"
-  integrity sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.0.tgz#5437035aa43185ff4b9210d32fada6c640e59143"
+  integrity sha512-4QJbBk+DkPEhBXq3f260xSaWtjE4gPKOfulzfMFF8ZNwaPZieWsg3iVlcmF04+eebzpcpeXOOFMfrYzJHVYg+g==
   dependencies:
     "@types/unist" "^2.0.0"
     unist-util-stringify-position "^3.0.0"
diff --git a/redisinsight/ui/src/pages/browser/components/add-key/AddKeyReJSON/AddKeyReJSON.tsx b/redisinsight/ui/src/pages/browser/components/add-key/AddKeyReJSON/AddKeyReJSON.tsx
index 67ceff64df..548bbd1d35 100644
--- a/redisinsight/ui/src/pages/browser/components/add-key/AddKeyReJSON/AddKeyReJSON.tsx
+++ b/redisinsight/ui/src/pages/browser/components/add-key/AddKeyReJSON/AddKeyReJSON.tsx
@@ -15,7 +15,7 @@ import { Maybe, stringToBuffer } from 'uiSrc/utils'
 import { addKeyStateSelector, addReJSONKey, } from 'uiSrc/slices/browser/keys'
 
 import MonacoJson from 'uiSrc/components/monaco-json'
-import UploadFile from 'uiSrc/components/uploadFile'
+import UploadFile from 'uiSrc/components/upload-file'
 import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
 import { CreateRejsonRlWithExpireDto } from 'apiSrc/modules/browser/dto'
 
diff --git a/redisinsight/ui/src/pages/browser/components/hash-details/HashDetails.tsx b/redisinsight/ui/src/pages/browser/components/hash-details/HashDetails.tsx
index b50bd15008..b033c9186e 100644
--- a/redisinsight/ui/src/pages/browser/components/hash-details/HashDetails.tsx
+++ b/redisinsight/ui/src/pages/browser/components/hash-details/HashDetails.tsx
@@ -37,7 +37,7 @@ import {
 } from 'uiSrc/slices/browser/hash'
 import { keysSelector, selectedKeyDataSelector, selectedKeySelector } from 'uiSrc/slices/browser/keys'
 import { connectedInstanceSelector } from 'uiSrc/slices/instances/instances'
-import { RedisResponseBuffer } from 'uiSrc/slices/interfaces'
+import { RedisResponseBuffer, RedisString } from 'uiSrc/slices/interfaces'
 import { getBasedOnViewTypeEvent, getMatchType, sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
 import {
   bufferToSerializedFormat,
@@ -151,8 +151,8 @@ const HashDetails = (props: Props) => {
     })
   }
 
-  const handleDeleteField = (field = '') => {
-    dispatch(deleteHashFields(key, [stringToBuffer(field, viewFormat)], onSuccessRemoved))
+  const handleDeleteField = (field: RedisString | string = '') => {
+    dispatch(deleteHashFields(key, [field], onSuccessRemoved))
     closePopover()
   }
 
@@ -445,9 +445,10 @@ const HashDetails = (props: Props) => {
                 />
               </EuiToolTip>
               <PopoverDelete
-                header={createDeleteFieldHeader(fieldItem)}
+                header={createDeleteFieldHeader(fieldItem as RedisString)}
                 text={createDeleteFieldMessage(key ?? '')}
                 item={field}
+                itemRaw={fieldItem as RedisString}
                 suffix={suffix}
                 deleting={deleting}
                 closePopover={closePopover}
diff --git a/redisinsight/ui/src/pages/browser/components/popover-delete/PopoverDelete.spec.tsx b/redisinsight/ui/src/pages/browser/components/popover-delete/PopoverDelete.spec.tsx
index b2eee549b2..425f2fbd0c 100644
--- a/redisinsight/ui/src/pages/browser/components/popover-delete/PopoverDelete.spec.tsx
+++ b/redisinsight/ui/src/pages/browser/components/popover-delete/PopoverDelete.spec.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import { instance, mock } from 'ts-mockito'
+import { anyToBuffer } from 'uiSrc/utils'
 import { render, screen, fireEvent } from 'uiSrc/utils/test-utils'
 import PopoverDelete, { Props } from './PopoverDelete'
 
@@ -40,4 +41,44 @@ describe('PopoverDelete', () => {
     fireEvent.click(deleteBtn)
     expect(handleDeleteItem).toBeCalledTimes(1)
   })
+
+  it('should call handleDeleteItem on delete with itemRaw prop', () => {
+    const itemRawMock = anyToBuffer([1, 2, 3])
+    const handleDeleteItem = jest.fn()
+    render(
+      <PopoverDelete
+        {...instance(mockedProps)}
+        item="name"
+        itemRaw={itemRawMock}
+        suffix="_"
+        deleting="name_"
+        handleDeleteItem={handleDeleteItem}
+      />
+    )
+
+    const deleteBtn = screen.getByTestId('remove')
+    fireEvent.click(deleteBtn)
+    expect(handleDeleteItem).toBeCalledTimes(1)
+    expect(handleDeleteItem).toBeCalledWith(itemRawMock)
+  })
+
+  it('should call handleDeleteItem on delete with item prop if itemRaw is not defined', () => {
+    const itemMock = 'name'
+    const handleDeleteItem = jest.fn()
+    render(
+      <PopoverDelete
+        {...instance(mockedProps)}
+        item={itemMock}
+        itemRaw={undefined}
+        suffix="_"
+        deleting="name_"
+        handleDeleteItem={handleDeleteItem}
+      />
+    )
+
+    const deleteBtn = screen.getByTestId('remove')
+    fireEvent.click(deleteBtn)
+    expect(handleDeleteItem).toBeCalledTimes(1)
+    expect(handleDeleteItem).toBeCalledWith(itemMock)
+  })
 })
diff --git a/redisinsight/ui/src/pages/browser/components/popover-delete/PopoverDelete.tsx b/redisinsight/ui/src/pages/browser/components/popover-delete/PopoverDelete.tsx
index ec56e59fea..e83db0cd1a 100644
--- a/redisinsight/ui/src/pages/browser/components/popover-delete/PopoverDelete.tsx
+++ b/redisinsight/ui/src/pages/browser/components/popover-delete/PopoverDelete.tsx
@@ -1,18 +1,20 @@
 import React from 'react'
 import { EuiButton, EuiButtonIcon, EuiPopover, EuiText } from '@elastic/eui'
 
+import { RedisString } from 'uiSrc/slices/interfaces'
 import styles from './styles.module.scss'
 
 export interface Props {
   header?: string
   text: JSX.Element | string
   item: string
+  itemRaw?: RedisString
   suffix: string
   deleting: string
   closePopover: () => void
   showPopover: (item: string) => void
   updateLoading: boolean
-  handleDeleteItem: (item: string) => void
+  handleDeleteItem: (item: RedisString | string) => void
   handleButtonClick?: () => void
   appendInfo?: JSX.Element | string | null
   testid?: string
@@ -23,6 +25,7 @@ const PopoverDelete = (props: Props) => {
     header,
     text,
     item,
+    itemRaw,
     suffix,
     deleting,
     closePopover,
@@ -83,7 +86,7 @@ const PopoverDelete = (props: Props) => {
             size="s"
             color="warning"
             iconType="trash"
-            onClick={() => handleDeleteItem(item)}
+            onClick={() => handleDeleteItem(itemRaw || item)}
             data-testid={testid || 'remove'}
           >
             Remove
diff --git a/redisinsight/ui/src/pages/browser/components/set-details/SetDetails.tsx b/redisinsight/ui/src/pages/browser/components/set-details/SetDetails.tsx
index d734a92ab2..e35fa93454 100644
--- a/redisinsight/ui/src/pages/browser/components/set-details/SetDetails.tsx
+++ b/redisinsight/ui/src/pages/browser/components/set-details/SetDetails.tsx
@@ -7,7 +7,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui'
 import { CellMeasurerCache } from 'react-virtualized'
-import { RedisResponseBuffer } from 'uiSrc/slices/interfaces'
+import { RedisResponseBuffer, RedisString } from 'uiSrc/slices/interfaces'
 
 import {
   bufferToString,
@@ -117,8 +117,8 @@ const SetDetails = (props: Props) => {
     })
   }
 
-  const handleDeleteMember = (member = '') => {
-    dispatch(deleteSetMembers(key, [stringToBuffer(member, viewFormat)], onSuccessRemoved))
+  const handleDeleteMember = (member: string | RedisString = '') => {
+    dispatch(deleteSetMembers(key, [member], onSuccessRemoved))
     closePopover()
   }
 
@@ -234,6 +234,7 @@ const SetDetails = (props: Props) => {
               header={createDeleteFieldHeader(memberItem)}
               text={createDeleteFieldMessage(key ?? '')}
               item={member}
+              itemRaw={memberItem}
               suffix={suffix}
               deleting={deleting}
               closePopover={closePopover}
diff --git a/redisinsight/ui/src/pages/browser/components/zset-details/ZSetDetails.tsx b/redisinsight/ui/src/pages/browser/components/zset-details/ZSetDetails.tsx
index 6090df8e29..d8df6037ad 100644
--- a/redisinsight/ui/src/pages/browser/components/zset-details/ZSetDetails.tsx
+++ b/redisinsight/ui/src/pages/browser/components/zset-details/ZSetDetails.tsx
@@ -22,7 +22,7 @@ import { SCAN_COUNT_DEFAULT } from 'uiSrc/constants/api'
 import HelpTexts from 'uiSrc/constants/help-texts'
 import { NoResultsFoundText } from 'uiSrc/constants/texts'
 import { selectedKeyDataSelector, keysSelector, selectedKeySelector } from 'uiSrc/slices/browser/keys'
-import { RedisResponseBuffer } from 'uiSrc/slices/interfaces'
+import { RedisResponseBuffer, RedisString } from 'uiSrc/slices/interfaces'
 import { ZsetMember } from 'uiSrc/slices/interfaces/zset'
 import {
   bufferToString,
@@ -40,7 +40,6 @@ import InlineItemEditor from 'uiSrc/components/inline-item-editor/InlineItemEdit
 import { IColumnSearchState, ITableColumn, RelativeWidthSizes } from 'uiSrc/components/virtual-table/interfaces'
 import { StopPropagation } from 'uiSrc/components/virtual-table'
 import { getColumnWidth } from 'uiSrc/components/virtual-grid'
-import { stringToBuffer } from 'uiSrc/utils/formatters/bufferFormatters'
 import { AddMembersToZSetDto, SearchZSetMembersResponse } from 'apiSrc/modules/browser/dto'
 import PopoverDelete from '../popover-delete/PopoverDelete'
 
@@ -136,8 +135,8 @@ const ZSetDetails = (props: Props) => {
     })
   }
 
-  const handleDeleteMember = (member = '') => {
-    dispatch(deleteZSetMembers(key, [stringToBuffer(member, viewFormat)], onSuccessRemoved))
+  const handleDeleteMember = (member: RedisString | string = '') => {
+    dispatch(deleteZSetMembers(key, [member], onSuccessRemoved))
     closePopover()
   }
 
@@ -361,6 +360,7 @@ const ZSetDetails = (props: Props) => {
                 header={createDeleteFieldHeader(nameItem)}
                 text={createDeleteFieldMessage(key ?? '')}
                 item={name}
+                itemRaw={nameItem}
                 suffix={suffix}
                 deleting={deleting}
                 closePopover={closePopover}
diff --git a/redisinsight/ui/src/pages/home/HomePage.tsx b/redisinsight/ui/src/pages/home/HomePage.tsx
index 513b758107..5b4917b253 100644
--- a/redisinsight/ui/src/pages/home/HomePage.tsx
+++ b/redisinsight/ui/src/pages/home/HomePage.tsx
@@ -248,9 +248,8 @@ const HomePage = () => {
                             [styles.contentActive]: editDialogIsOpen,
                           })}
                           id="form"
-                          minSize="538px"
                           paddingSize="none"
-                          style={{ minWidth: '512px' }}
+                          style={{ minWidth: '494px' }}
                         >
                           {editDialogIsOpen && (
                             <AddDatabaseContainer
diff --git a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx
index 1f4f22b323..db5238e5ad 100644
--- a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx
+++ b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx
@@ -423,7 +423,6 @@ const AddStandaloneForm = (props: Props) => {
       <EuiButton
         fill
         color="secondary"
-        className="btn-add"
         type="submit"
         onClick={onClick}
         disabled={submitIsDisabled}
@@ -446,7 +445,7 @@ const AddStandaloneForm = (props: Props) => {
           alignItems="center"
           className="footerAddDatabase"
           gutterSize="none"
-          style={{ height: '68px' }}
+          responsive={false}
         >
           <EuiFlexItem className="btn-back" grow={false}>
             {instanceType !== InstanceType.Sentinel && (
@@ -475,7 +474,7 @@ const AddStandaloneForm = (props: Props) => {
           </EuiFlexItem>
 
           <EuiFlexItem grow={false}>
-            <EuiFlexGroup>
+            <EuiFlexGroup responsive={false}>
               {onClose && (
                 <EuiButton
                   onClick={onClose}
@@ -492,7 +491,7 @@ const AddStandaloneForm = (props: Props) => {
                 submitIsDisabled={submitIsDisable()}
               />
             </EuiFlexGroup>
-            </EuiFlexItem>
+          </EuiFlexItem>
         </EuiFlexGroup>,
         footerEl
       )
diff --git a/redisinsight/ui/src/pages/home/components/CloudConnection/CloudConnectionForm/CloudConnectionForm.tsx b/redisinsight/ui/src/pages/home/components/CloudConnection/CloudConnectionForm/CloudConnectionForm.tsx
index 34933ad2df..5f6e6517da 100644
--- a/redisinsight/ui/src/pages/home/components/CloudConnection/CloudConnectionForm/CloudConnectionForm.tsx
+++ b/redisinsight/ui/src/pages/home/components/CloudConnection/CloudConnectionForm/CloudConnectionForm.tsx
@@ -150,7 +150,6 @@ const CloudConnectionForm = (props: Props) => {
       <EuiButton
         fill
         color="secondary"
-        className="btn-add"
         type="submit"
         onClick={onClick}
         disabled={submitIsDisabled}
diff --git a/redisinsight/ui/src/pages/home/components/ClusterConnection/ClusterConnectionForm/ClusterConnectionForm.tsx b/redisinsight/ui/src/pages/home/components/ClusterConnection/ClusterConnectionForm/ClusterConnectionForm.tsx
index ecab1fac6e..424d72f71c 100644
--- a/redisinsight/ui/src/pages/home/components/ClusterConnection/ClusterConnectionForm/ClusterConnectionForm.tsx
+++ b/redisinsight/ui/src/pages/home/components/ClusterConnection/ClusterConnectionForm/ClusterConnectionForm.tsx
@@ -218,7 +218,6 @@ const ClusterConnectionForm = (props: Props) => {
       <EuiButton
         fill
         color="secondary"
-        className="btn-add"
         type="submit"
         onClick={onClick}
         disabled={submitIsDisabled}
diff --git a/redisinsight/ui/src/pages/home/styles.scss b/redisinsight/ui/src/pages/home/styles.scss
index 1483eef40d..130a8a3c0d 100644
--- a/redisinsight/ui/src/pages/home/styles.scss
+++ b/redisinsight/ui/src/pages/home/styles.scss
@@ -373,14 +373,10 @@
     padding: 12px;
   }
 
-  .euiButton.btn-add {
-    padding-left: 10px;
-    padding-right: 10px;
-  }
-
   .euiButton.btn-cancel,
   .euiButton.btn-back {
-    margin-right: 20px;
+    margin-right: 10px;
+    min-width: 71px !important;
   }
 
   .flexGroupResponsiveForm {
diff --git a/redisinsight/ui/src/pages/pubSub/components/publish-message/PublishMessage.tsx b/redisinsight/ui/src/pages/pubSub/components/publish-message/PublishMessage.tsx
index 5855b3893e..e50702ee21 100644
--- a/redisinsight/ui/src/pages/pubSub/components/publish-message/PublishMessage.tsx
+++ b/redisinsight/ui/src/pages/pubSub/components/publish-message/PublishMessage.tsx
@@ -121,7 +121,6 @@ const PublishMessage = () => {
           <EuiButton
             fill
             color="secondary"
-            className="btn-add"
             type="submit"
             data-testid="publish-message-submit"
           >
diff --git a/redisinsight/ui/src/pages/redisCloudDatabases/RedisCloudDatabases/RedisCloudDatabases.tsx b/redisinsight/ui/src/pages/redisCloudDatabases/RedisCloudDatabases/RedisCloudDatabases.tsx
index 6a619536f5..121c7df25d 100644
--- a/redisinsight/ui/src/pages/redisCloudDatabases/RedisCloudDatabases/RedisCloudDatabases.tsx
+++ b/redisinsight/ui/src/pages/redisCloudDatabases/RedisCloudDatabases/RedisCloudDatabases.tsx
@@ -168,7 +168,6 @@ const RedisCloudDatabasesPage = ({
         onClick={handleSubmit}
         isLoading={loading}
         color="secondary"
-        className="btn-add"
         iconType={isDisabled ? 'iInCircle' : undefined}
         data-testid="btn-add-databases"
       >
diff --git a/redisinsight/ui/src/pages/redisCloudDatabasesResult/RedisCloudDatabasesResult.tsx b/redisinsight/ui/src/pages/redisCloudDatabasesResult/RedisCloudDatabasesResult.tsx
index 2831a6df0b..6f531e16ea 100644
--- a/redisinsight/ui/src/pages/redisCloudDatabasesResult/RedisCloudDatabasesResult.tsx
+++ b/redisinsight/ui/src/pages/redisCloudDatabasesResult/RedisCloudDatabasesResult.tsx
@@ -152,7 +152,6 @@ const RedisCloudDatabaseListResult = ({ columns, onBack, onView }: Props) => {
                 size="m"
                 onClick={onView}
                 color="secondary"
-                className="btn-add"
                 data-testid="btn-view-databases"
               >
                 View Databases
diff --git a/redisinsight/ui/src/pages/redisCloudSubscriptions/RedisCloudSubscriptions/RedisCloudSubscriptions.tsx b/redisinsight/ui/src/pages/redisCloudSubscriptions/RedisCloudSubscriptions/RedisCloudSubscriptions.tsx
index 18f8e0f1dd..73793795e0 100644
--- a/redisinsight/ui/src/pages/redisCloudSubscriptions/RedisCloudSubscriptions/RedisCloudSubscriptions.tsx
+++ b/redisinsight/ui/src/pages/redisCloudSubscriptions/RedisCloudSubscriptions/RedisCloudSubscriptions.tsx
@@ -169,7 +169,6 @@ const RedisCloudSubscriptions = ({
         onClick={handleSubmit}
         isLoading={loading}
         color="secondary"
-        className="btn-add"
         iconType={isDisabled ? 'iInCircle' : undefined}
         data-testid="btn-show-databases"
       >
diff --git a/redisinsight/ui/src/pages/redisCluster/RedisClusterDatabases.tsx b/redisinsight/ui/src/pages/redisCluster/RedisClusterDatabases.tsx
index ae9cf41cb4..bcadaeb1b9 100644
--- a/redisinsight/ui/src/pages/redisCluster/RedisClusterDatabases.tsx
+++ b/redisinsight/ui/src/pages/redisCluster/RedisClusterDatabases.tsx
@@ -209,7 +209,6 @@ const RedisClusterDatabases = ({ columns, onClose, onBack, onSubmit }: Props) =>
                     onClick={handleSubmit}
                     isLoading={loading}
                     color="secondary"
-                    className="btn-add"
                     iconType={isSubmitDisabled() ? 'iInCircle' : undefined}
                     data-testid="btn-add-databases"
                   >
diff --git a/redisinsight/ui/src/pages/redisCluster/RedisClusterDatabasesResult.tsx b/redisinsight/ui/src/pages/redisCluster/RedisClusterDatabasesResult.tsx
index 6dcf2df0b3..8b10a1e9c1 100644
--- a/redisinsight/ui/src/pages/redisCluster/RedisClusterDatabasesResult.tsx
+++ b/redisinsight/ui/src/pages/redisCluster/RedisClusterDatabasesResult.tsx
@@ -157,7 +157,6 @@ const RedisClusterDatabasesResult = ({ columns, onBack, onView }: Props) => {
                 size="m"
                 onClick={() => onView(false)}
                 color="secondary"
-                className="btn-add"
                 data-testid="btn-view-databases"
               >
                 View Databases
diff --git a/redisinsight/ui/src/pages/sentinelDatabases/components/SentinelDatabases/SentinelDatabases.tsx b/redisinsight/ui/src/pages/sentinelDatabases/components/SentinelDatabases/SentinelDatabases.tsx
index d251cdf92e..3fdf55a474 100644
--- a/redisinsight/ui/src/pages/sentinelDatabases/components/SentinelDatabases/SentinelDatabases.tsx
+++ b/redisinsight/ui/src/pages/sentinelDatabases/components/SentinelDatabases/SentinelDatabases.tsx
@@ -177,7 +177,6 @@ const SentinelDatabases = ({
         <EuiButton
           fill
           color="secondary"
-          className="btn-add"
           type="submit"
           onClick={onClick}
           disabled={isSubmitDisabled()}
diff --git a/redisinsight/ui/src/pages/sentinelDatabasesResult/components/SentinelDatabasesResult/SentinelDatabasesResult.tsx b/redisinsight/ui/src/pages/sentinelDatabasesResult/components/SentinelDatabasesResult/SentinelDatabasesResult.tsx
index a38cef218d..a24f480bc2 100644
--- a/redisinsight/ui/src/pages/sentinelDatabasesResult/components/SentinelDatabasesResult/SentinelDatabasesResult.tsx
+++ b/redisinsight/ui/src/pages/sentinelDatabasesResult/components/SentinelDatabasesResult/SentinelDatabasesResult.tsx
@@ -158,7 +158,6 @@ const SentinelDatabasesResult = ({
                 size="m"
                 onClick={handleViewDatabases}
                 color="secondary"
-                className="btn-add"
                 data-testid="btn-view-databases"
               >
                 View Databases
diff --git a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.tsx b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.tsx
index 1de1cbc119..314a329aad 100644
--- a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.tsx
+++ b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResults/WBResults.tsx
@@ -3,6 +3,8 @@ import cx from 'classnames'
 import { EuiIcon, EuiText } from '@elastic/eui'
 
 import { Theme } from 'uiSrc/constants'
+import { ProfileQueryType } from 'uiSrc/pages/workbench/constants'
+import { generateProfileQueryForCommand } from 'uiSrc/pages/workbench/utils'
 import { CodeButtonParams } from 'uiSrc/pages/workbench/components/enablement-area/interfaces'
 import { Nullable } from 'uiSrc/utils'
 import QueryCard from 'uiSrc/components/query-card'
@@ -21,6 +23,7 @@ export interface Props {
   onQueryReRun: (query: string, commandId?: Nullable<string>, executeParams?: CodeButtonParams) => void
   onQueryDelete: (commandId: string) => void
   onQueryOpen: (commandId: string) => void
+  onQueryProfile: (query: string, commandId?: Nullable<string>, executeParams?: CodeButtonParams) => void
 }
 const WBResults = (props: Props) => {
   const {
@@ -28,6 +31,7 @@ const WBResults = (props: Props) => {
     activeMode,
     activeResultsMode,
     onQueryReRun,
+    onQueryProfile,
     onQueryDelete,
     onQueryOpen,
     scrollDivRef
@@ -48,6 +52,21 @@ const WBResults = (props: Props) => {
     </div>
   )
 
+  const handleQueryProfile = (
+    profileType: ProfileQueryType,
+    commandExecution: { command: string, mode?: RunQueryMode, resultsMode?: ResultsMode }
+  ) => {
+    const { command, mode, resultsMode } = commandExecution
+    const profileQuery = generateProfileQueryForCommand(command, profileType)
+    if (profileQuery) {
+      onQueryProfile(
+        profileQuery,
+        null,
+        { mode, results: resultsMode, clearEditor: false, },
+      )
+    }
+  }
+
   return (
     <div className={cx(styles.container)}>
       <div ref={scrollDivRef} />
@@ -86,6 +105,10 @@ const WBResults = (props: Props) => {
           resultsMode={resultsMode}
           db={db}
           onQueryOpen={() => onQueryOpen(id)}
+          onQueryProfile={(profileType) => handleQueryProfile(
+            profileType,
+            { command, mode, resultsMode },
+          )}
           onQueryReRun={() => onQueryReRun(
             command,
             null,
diff --git a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.tsx b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.tsx
index 9a23f7d2a7..ec91f806e5 100644
--- a/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.tsx
+++ b/redisinsight/ui/src/pages/workbench/components/wb-results/WBResultsWrapper.tsx
@@ -13,6 +13,7 @@ export interface Props {
   onQueryReRun: (query: string, commandId?: Nullable<string>, executeParams?: CodeButtonParams) => void
   onQueryOpen: (commandId: string) => void
   onQueryDelete: (commandId: string) => void
+  onQueryProfile: (query: string, commandId?: Nullable<string>, executeParams?: CodeButtonParams) => void
 }
 
 const WBResultsWrapper = (props: Props) => (
diff --git a/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.tsx b/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.tsx
index 0f7234359e..209e870737 100644
--- a/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.tsx
+++ b/redisinsight/ui/src/pages/workbench/components/wb-view/WBView/WBView.tsx
@@ -109,6 +109,11 @@ const WBView = (props: Props) => {
     onSubmit(query, commandId, executeParams)
   }
 
+  const handleProfile = (query?: string, commandId?: Nullable<string>, executeParams: CodeButtonParams = {}) => {
+    sendEventSubmitTelemetry(TelemetryEvent.WORKBENCH_COMMAND_PROFILE, query, executeParams)
+    onSubmit(query, commandId, executeParams)
+  }
+
   const sendEventSubmitTelemetry = (
     event: TelemetryEvent,
     commandInit = script,
@@ -227,6 +232,7 @@ const WBView = (props: Props) => {
                     activeResultsMode={resultsMode}
                     scrollDivRef={scrollDivRef}
                     onQueryReRun={handleReRun}
+                    onQueryProfile={handleProfile}
                     onQueryOpen={onQueryOpen}
                     onQueryDelete={onQueryDelete}
                   />
diff --git a/redisinsight/ui/src/pages/workbench/constants.ts b/redisinsight/ui/src/pages/workbench/constants.ts
index 0166a6d403..ba9e2d954a 100644
--- a/redisinsight/ui/src/pages/workbench/constants.ts
+++ b/redisinsight/ui/src/pages/workbench/constants.ts
@@ -27,6 +27,40 @@ export const VIEW_TYPE_OPTIONS = [
 export const getViewTypeOptions = () =>
   [...VIEW_TYPE_OPTIONS]
 
+
+export const SEARCH_COMMANDS = ['ft.search', 'ft.aggregate']
+export const GRAPH_COMMANDS = ['graph.query']
+
+const ALLOWED_PROFILE_COMMANDS = [...SEARCH_COMMANDS, ...GRAPH_COMMANDS]
+
+export const isCommandAllowedForProfile = (query: string) => {
+  return ALLOWED_PROFILE_COMMANDS.includes(query?.split(' ')?.[0]?.toLowerCase())
+}
+
+export enum ProfileQueryType {
+  Profile = 'Profile',
+  Explain = 'Explain'
+}
+
+const PROFILE_VIEW_TYPE_OPTIONS = [
+  {
+    id: ProfileQueryType.Profile,
+    text: 'Profile the command',
+    name: 'Profile',
+    value: WBQueryType.Text,
+  },
+  {
+    id: ProfileQueryType.Explain,
+    text: 'Explain the command',
+    name: 'Explain',
+    value: WBQueryType.Text,
+  },
+]
+
+export const getProfileViewTypeOptions = () =>
+  [...PROFILE_VIEW_TYPE_OPTIONS]
+
+
 export enum ModuleCommandPrefix {
   RediSearch = 'FT.',
 }
diff --git a/redisinsight/ui/src/pages/workbench/utils.spec.ts b/redisinsight/ui/src/pages/workbench/utils.spec.ts
new file mode 100644
index 0000000000..3d91dad1d8
--- /dev/null
+++ b/redisinsight/ui/src/pages/workbench/utils.spec.ts
@@ -0,0 +1,79 @@
+import { ProfileQueryType, SEARCH_COMMANDS, GRAPH_COMMANDS } from './constants'
+
+import {
+  generateGraphProfileQuery,
+  generateSearchProfileQuery,
+  generateProfileQueryForCommand,
+} from './utils'
+
+
+const generateGraphProfileQueryTests: Record<string, any>[] = [
+  { input: 'GRAPH.QUERY key "MATCH (n) RETURN n"', output: 'graph.profile key "MATCH (n) RETURN n"', type: ProfileQueryType.Profile },
+  { input: 'GRAPH.QUERY key "MATCH (n) RETURN n"', output: 'graph.explain key "MATCH (n) RETURN n"', type: ProfileQueryType.Explain },
+  { input: 'graph.query key "MATCH (n) RETURN n"', output: 'graph.profile key "MATCH (n) RETURN n"', type: ProfileQueryType.Profile },
+  { input: 'graph.query key "MATCH (n) RETURN n"', output: 'graph.explain key "MATCH (n) RETURN n"', type: ProfileQueryType.Explain },
+  { input: null, output: null, type: ProfileQueryType.Profile },
+  { input: null, output: null, type: ProfileQueryType.Explain },
+]
+
+describe('generateGraphProfileQuery', () => {
+  generateGraphProfileQueryTests.forEach(test => {
+    it(`should be output: ${test.output} for input: ${test.input} and type: ${test.type}`, () => {
+      const result = generateGraphProfileQuery(test.input, test.type);
+      expect(result).toEqual(test.output);
+    });
+  })
+});
+
+
+const generateSearchProfileQueryTests: Record<string, any>[] = [
+  { input: 'FT.SEARCH index tomatoes', output: 'ft.profile index SEARCH QUERY tomatoes', type: ProfileQueryType.Profile },
+  { input: 'FT.AGGREGATE index tomatoes', output: 'ft.profile index AGGREGATE QUERY tomatoes', type: ProfileQueryType.Profile },
+  { input: 'FT.SEARCH index tomatoes', output: 'ft.explain index tomatoes', type: ProfileQueryType.Explain },
+  { input: 'FT.AGGREGATE index tomatoes', output: 'ft.explain index tomatoes', type: ProfileQueryType.Explain },
+  { input: 'ft.search index tomatoes', output: 'ft.profile index search QUERY tomatoes', type: ProfileQueryType.Profile },
+  { input: 'ft.aggregate index tomatoes', output: 'ft.profile index aggregate QUERY tomatoes', type: ProfileQueryType.Profile },
+  { input: 'ft.search index tomatoes', output: 'ft.explain index tomatoes', type: ProfileQueryType.Explain },
+  { input: 'ft.aggregate index tomatoes', output: 'ft.explain index tomatoes', type: ProfileQueryType.Explain },
+  { input: 'ft.SEARCH index tomatoes', output: 'ft.profile index SEARCH QUERY tomatoes', type: ProfileQueryType.Profile },
+  { input: 'ft.AGGREGATE index tomatoes', output: 'ft.profile index AGGREGATE QUERY tomatoes', type: ProfileQueryType.Profile },
+  { input: 'ft.SEARCH index tomatoes', output: 'ft.explain index tomatoes', type: ProfileQueryType.Explain },
+  { input: 'ft.AGGREGATE index tomatoes', output: 'ft.explain index tomatoes', type: ProfileQueryType.Explain },
+  { input: null, output: null, type: ProfileQueryType.Profile },
+  { input: null, output: null, type: ProfileQueryType.Explain },
+]
+
+describe('generateSearchProfileQuery', () => {
+  generateSearchProfileQueryTests.forEach(test => {
+    it(`should be output: ${test.output} for input: ${test.input} and type: ${test.type}`, () => {
+      const result = generateSearchProfileQuery(test.input, test.type);
+      expect(result).toEqual(test.output);
+    });
+  })
+});
+
+const generateProfileQueryForCommandTests: Record<string, any>[] = [
+  ...generateGraphProfileQueryTests,
+  ...generateSearchProfileQueryTests,
+  { input: 'GRAPH.LIST', output: null, type: ProfileQueryType.Profile },
+  { input: 'GRAPH.LIST', output: null, type: ProfileQueryType.Explain },
+  { input: 'GRAPH.PROFILE key "MATCH (n) RETURN n"', output: null, type: ProfileQueryType.Profile },
+  { input: 'GRAPH.PROFILE key "MATCH (n) RETURN n"', output: null, type: ProfileQueryType.Explain },
+  { input: 'GRAPH.EXPLAIN key "MATCH (n) RETURN n"', output: null, type: ProfileQueryType.Profile },
+  { input: 'GRAPH.EXPLAIN key "MATCH (n) RETURN n"', output: null, type: ProfileQueryType.Explain },
+  { input: 'ft._LIST', output: null, type: ProfileQueryType.Profile },
+  { input: 'ft._LIST', output: null, type: ProfileQueryType.Explain },
+  { input: 'ft.profile index SEARCH QUERY tomatoes', output: null, type: ProfileQueryType.Profile },
+  { input: 'ft.profile index AGGREGATE QUERY tomatoes', output: null, type: ProfileQueryType.Explain },
+  { input: 'ft.explain index tomatoes', output: null, type: ProfileQueryType.Profile },
+  { input: 'ft.explain index tomatoes', output: null, type: ProfileQueryType.Explain },
+]
+describe('generateProfileQueryForCommand', () => {
+  generateProfileQueryForCommandTests.forEach(test => {
+    it(`should be output: ${test.output} for input: ${test.input} and type: ${test.type}`, () => {
+      const result = generateProfileQueryForCommand(test.input, test.type);
+
+      expect(result).toEqual(test.output);
+    });
+  })
+});
diff --git a/redisinsight/ui/src/pages/workbench/utils.ts b/redisinsight/ui/src/pages/workbench/utils.ts
new file mode 100644
index 0000000000..2bca2b87c2
--- /dev/null
+++ b/redisinsight/ui/src/pages/workbench/utils.ts
@@ -0,0 +1,41 @@
+import { ProfileQueryType, SEARCH_COMMANDS, GRAPH_COMMANDS } from './constants'
+
+export const generateGraphProfileQuery = (query: string, type: ProfileQueryType) => {
+  const q = query?.split(' ')?.slice(1)
+
+  if (q) {
+    return [`graph.${type.toLowerCase()}`, ...q].join(' ')
+  }
+
+  return null
+}
+
+export const generateSearchProfileQuery = (query: string, type: ProfileQueryType) => {
+  const commandSplit = query?.split(' ')
+  const cmd = commandSplit?.[0]
+
+  if (!commandSplit || !cmd) {
+    return null
+  }
+
+  if (type === ProfileQueryType.Explain) {
+    return [`ft.${type.toLowerCase()}`, ...commandSplit?.slice(1)].join(' ')
+  } else {
+    let index = commandSplit?.[1]
+
+    const queryType = cmd.split('.')?.[1] // SEARCH / AGGREGATE
+    return [`ft.${type.toLowerCase()}`, index, queryType, 'QUERY', ...commandSplit?.slice(2)].join(' ')
+  }
+}
+
+export const generateProfileQueryForCommand = (query: string, type: ProfileQueryType) => {
+  const cmd = query?.split(' ')?.[0]?.toLowerCase()
+
+  if (GRAPH_COMMANDS.includes(cmd)) {
+    return generateGraphProfileQuery(query, type)
+  } else if (SEARCH_COMMANDS.includes(cmd)) {
+    return generateSearchProfileQuery(query, type)
+  }
+
+  return null
+}
diff --git a/redisinsight/ui/src/styles/components/_popover.scss b/redisinsight/ui/src/styles/components/_popover.scss
index d0006058bc..fb4b659de4 100644
--- a/redisinsight/ui/src/styles/components/_popover.scss
+++ b/redisinsight/ui/src/styles/components/_popover.scss
@@ -1,3 +1,7 @@
+.euiPanel.euiPopover__panel {
+  box-shadow: 0 3px 15px var(--controlsBoxShadowColor) !important;
+}
+
 .popoverLikeTooltip {
   border: none;
   max-width: 267px !important;
diff --git a/redisinsight/ui/src/telemetry/events.ts b/redisinsight/ui/src/telemetry/events.ts
index 174365bdbb..16ed548e91 100644
--- a/redisinsight/ui/src/telemetry/events.ts
+++ b/redisinsight/ui/src/telemetry/events.ts
@@ -103,6 +103,7 @@ export enum TelemetryEvent {
 
   WORKBENCH_COMMAND_COPIED = 'WORKBENCH_COMMAND_COPIED',
   WORKBENCH_COMMAND_RUN_AGAIN = 'WORKBENCH_COMMAND_RUN_AGAIN',
+  WORKBENCH_COMMAND_PROFILE = 'WORKBENCH_COMMAND_PROFILE',
   WORKBENCH_COMMAND_DELETE_COMMAND = 'WORKBENCH_COMMAND_DELETE_COMMAND',
   WORKBENCH_RESULTS_IN_FULL_SCREEN = 'WORKBENCH_RESULTS_IN_FULL_SCREEN',
   WORKBENCH_RESULTS_COLLAPSED = 'WORKBENCH_RESULTS_COLLAPSED',
diff --git a/scripts/build-statics.cmd b/scripts/build-statics.cmd
index 008f587986..813518d7a4 100644
--- a/scripts/build-statics.cmd
+++ b/scripts/build-statics.cmd
@@ -40,7 +40,16 @@ if not exist "%PLUGINS_DIR%\redistimeseries-app\dist" mkdir "%PLUGINS_DIR%\redis
 xcopy "%REDISTIMESERSIES_DIR%\dist" "%PLUGINS_DIR%\redistimeseries-app\dist\" /s /e /y
 copy "%REDISTIMESERSIES_DIR%\package.json" "%PLUGINS_DIR%\redistimeseries-app\"
 
-: Build clients-list plugin
+:: Build ri-explain plugin
+set RI_EXPLIAIN_DIR=".\redisinsight\ui\src\packages\ri-explain"
+call yarn --cwd "%RI_EXPLIAIN_DIR%"
+call yarn --cwd "%RI_EXPLIAIN_DIR%" build
+if not exist "%PLUGINS_DIR%\ri-explain" mkdir "%PLUGINS_DIR%\ri-explain"
+if not exist "%PLUGINS_DIR%\ri-explain\dist" mkdir "%PLUGINS_DIR%\ri-explain\dist"
+xcopy "%RI_EXPLIAIN_DIR%\dist" "%PLUGINS_DIR%\ri-explain\dist\" /s /e /y
+copy "%RI_EXPLIAIN_DIR%\package.json" "%PLUGINS_DIR%\ri-explain\"
+
+:: Build clients-list plugin
 set CLIENTS_LIST_DIR=".\redisinsight\ui\src\packages\clients-list"
 call yarn --cwd "%CLIENTS_LIST_DIR%"
 call yarn --cwd "%CLIENTS_LIST_DIR%" build
diff --git a/scripts/build-statics.sh b/scripts/build-statics.sh
index 6c61681916..1f874c1435 100644
--- a/scripts/build-statics.sh
+++ b/scripts/build-statics.sh
@@ -35,6 +35,13 @@ yarn --cwd "${REDISTIMESERIES_DIR}" build
 mkdir -p "${PLUGINS_DIR}/redistimeseries-app"
 cp -R "${REDISTIMESERIES_DIR}/dist" "${REDISTIMESERIES_DIR}/package.json" "${PLUGINS_DIR}/redistimeseries-app"
 
+# Build ri-explain plugin
+RI_EXPLIAIN_DIR="./redisinsight/ui/src/packages/ri-explain"
+yarn --cwd "${RI_EXPLIAIN_DIR}"
+yarn --cwd "${RI_EXPLIAIN_DIR}" build
+mkdir -p "${PLUGINS_DIR}/ri-explain"
+cp -R "${RI_EXPLIAIN_DIR}/dist" "${RI_EXPLIAIN_DIR}/package.json" "${PLUGINS_DIR}/ri-explain"
+
 # Build clients-list plugin
 CLIENTS_LIST_DIR="./redisinsight/ui/src/packages/clients-list"
 yarn --cwd "${CLIENTS_LIST_DIR}"
diff --git a/tests/e2e/helpers/conf.ts b/tests/e2e/helpers/conf.ts
index 7ddafc8834..544fa9246b 100644
--- a/tests/e2e/helpers/conf.ts
+++ b/tests/e2e/helpers/conf.ts
@@ -109,7 +109,7 @@ export const ossStandaloneNoPermissionsConfig = {
 };
 
 export const ossStandaloneForSSHConfig = {
-    host: process.env.OSS_STANDALONE_HOST || '172.33.100.10',
+    host: process.env.OSS_STANDALONE_HOST || '172.33.100.111',
     port: process.env.OSS_STANDALONE_PORT || '6379',
     databaseName: `${process.env.OSS_STANDALONE_DATABASE_NAME || 'oss-standalone-for-ssh'}-${uniqueId}`,
     databaseUsername: process.env.OSS_STANDALONE_USERNAME,
diff --git a/tests/e2e/rte.docker-compose.yml b/tests/e2e/rte.docker-compose.yml
index e35d778a33..b27d84da05 100644
--- a/tests/e2e/rte.docker-compose.yml
+++ b/tests/e2e/rte.docker-compose.yml
@@ -52,9 +52,9 @@ services:
       - 8101:6379
     networks:
       default:
-        ipv4_address: 172.31.100.10
+        ipv4_address: 172.31.100.111
       ssh:
-        ipv4_address: 172.33.100.10
+        ipv4_address: 172.33.100.111
   # oss standalone redisearch
   oss-standalone-redisearch:
     image: redislabs/redismod
diff --git a/tests/e2e/rte/openvpn/docker-compose.yml b/tests/e2e/rte/openvpn/docker-compose.yml
new file mode 100644
index 0000000000..f172a60226
--- /dev/null
+++ b/tests/e2e/rte/openvpn/docker-compose.yml
@@ -0,0 +1,13 @@
+version: "3.4"
+
+services:
+  openvpn:
+    cap_add:
+      - NET_ADMIN
+    image: kylemanna/openvpn
+    container_name: openvpn
+    ports:
+      - "1194:1194/udp"
+    restart: always
+    volumes:
+      - ./openvpn-data/conf:/etc/openvpn
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/crl.pem b/tests/e2e/rte/openvpn/openvpn-data/conf/crl.pem
new file mode 100644
index 0000000000..6dd7b13985
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/crl.pem
@@ -0,0 +1,11 @@
+-----BEGIN X509 CRL-----
+MIIBqDCBkQIBATANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR0ZXN0Fw0yMTEx
+MDgwNzQ5MTZaFw0zMTExMDYwNzQ5MTZaoE4wTDBKBgNVHSMEQzBBgBQ/AarQse++
+Argn1cHxvXoG8W+Pc6ETpBEwDzENMAsGA1UEAwwEdGVzdIIUcqHj2uS8cK9SYQiJ
+moIR/7fU0PowDQYJKoZIhvcNAQELBQADggEBAD4eZq6iex+GdwiGaEGjtIcpQGJD
+eQC9xUmkZSphKOcwjFyPC6/qOZ/MAgPhqzP2urgyrgeluvhFsISXmH/Di+6yVn7f
+bV4c1e0CT6/H6filAelPnbkEclCv/48P6L3BN4o4S98QXzvMeF+YfpEYGyjO+/PW
+vd0UH4mdtsDpk94Z2FKxeUey76EJPSvwa08dY+/CLynSGDXdGavErtFTBVoc5qcj
+XdC3CI2ig3DnUUBvwiwSxiB5vzJ8Vhl3dxTag/4yYkfjmOS9EzdDRAhRfg7wsf+v
+t4HmeQ2ntBkld1MtXJSKaOQa/if5+nNyb+4ktQkLC6YBd4SNpO8yYq/dMJA=
+-----END X509 CRL-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/openvpn.conf b/tests/e2e/rte/openvpn/openvpn-data/conf/openvpn.conf
new file mode 100644
index 0000000000..1f58509e53
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/openvpn.conf
@@ -0,0 +1,30 @@
+server 192.168.255.0 255.255.255.0
+verb 3
+key /etc/openvpn/pki/private/localhost.key
+ca /etc/openvpn/pki/ca.crt
+cert /etc/openvpn/pki/issued/localhost.crt
+dh /etc/openvpn/pki/dh.pem
+tls-auth /etc/openvpn/pki/ta.key
+key-direction 0
+keepalive 10 60
+persist-key
+persist-tun
+
+proto udp
+# Rely on Docker to do port mapping, internally always 1194
+port 1194
+dev tun0
+status /tmp/openvpn-status.log
+
+user nobody
+group nogroup
+comp-lzo no
+
+### Push Configurations Below
+push "dhcp-option DNS 192.168.13.6"
+push "comp-lzo no"
+push "dhcp-option DOMAIN localhost"
+push "route 192.168.13.0 255.255.255.0"
+push "route 172.30.0.0 255.255.0.0"
+push "route 172.31.0.0 255.255.0.0"
+push "route 172.33.0.0 255.255.0.0"
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/openvpn.conf.1636357834.bak b/tests/e2e/rte/openvpn/openvpn-data/conf/openvpn.conf.1636357834.bak
new file mode 100644
index 0000000000..3f8e34df8e
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/openvpn.conf.1636357834.bak
@@ -0,0 +1,30 @@
+server 192.168.255.0 255.255.255.0
+verb 3
+key /etc/openvpn/pki/private/localhost.key
+ca /etc/openvpn/pki/ca.crt
+cert /etc/openvpn/pki/issued/localhost.crt
+dh /etc/openvpn/pki/dh.pem
+tls-auth /etc/openvpn/pki/ta.key
+key-direction 0
+keepalive 10 60
+persist-key
+persist-tun
+
+proto udp
+# Rely on Docker to do port mapping, internally always 1194
+port 1194
+dev tun0
+status /tmp/openvpn-status.log
+
+user nobody
+group nogroup
+comp-lzo no
+
+### Route Configurations Below
+route 192.168.254.0 255.255.255.0
+
+### Push Configurations Below
+push "block-outside-dns"
+push "dhcp-option DNS 8.8.8.8"
+push "dhcp-option DNS 8.8.4.4"
+push "comp-lzo no"
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/ovpn_env.sh b/tests/e2e/rte/openvpn/openvpn-data/conf/ovpn_env.sh
new file mode 100644
index 0000000000..9b3dabab03
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/ovpn_env.sh
@@ -0,0 +1,25 @@
+declare -x OVPN_AUTH=
+declare -x OVPN_CIPHER=
+declare -x OVPN_CLIENT_TO_CLIENT=
+declare -x OVPN_CN=localhost
+declare -x OVPN_COMP_LZO=0
+declare -x OVPN_DEFROUTE=0
+declare -x OVPN_DEVICE=tun
+declare -x OVPN_DEVICEN=0
+declare -x OVPN_DISABLE_PUSH_BLOCK_DNS=1
+declare -x OVPN_DNS=1
+declare -x OVPN_DNS_SERVERS=([0]="192.168.13.6")
+declare -x OVPN_ENV=/etc/openvpn/ovpn_env.sh
+declare -x OVPN_EXTRA_CLIENT_CONFIG=()
+declare -x OVPN_EXTRA_SERVER_CONFIG=()
+declare -x OVPN_FRAGMENT=
+declare -x OVPN_KEEPALIVE='10 60'
+declare -x OVPN_MTU=
+declare -x OVPN_NAT=1
+declare -x OVPN_PORT=1194
+declare -x OVPN_PROTO=udp
+declare -x OVPN_PUSH=([0]="dhcp-option DOMAIN localhost" [1]="route 192.168.13.0 255.255.255.0" [2]="route 172.17.0.0 255.255.0.0")
+declare -x OVPN_ROUTES=()
+declare -x OVPN_SERVER=192.168.255.0/24
+declare -x OVPN_SERVER_URL=udp://localhost
+declare -x OVPN_TLS_CIPHER=
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/ca.crt b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/ca.crt
new file mode 100644
index 0000000000..e43ba72148
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/ca.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAh6gAwIBAgIUcqHj2uS8cK9SYQiJmoIR/7fU0PowDQYJKoZIhvcNAQEL
+BQAwDzENMAsGA1UEAwwEdGVzdDAeFw0yMTExMDgwNzQ5MTBaFw0zMTExMDYwNzQ5
+MTBaMA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCibt8kh9lqTC0O631rPHN0kMQ4kMQ/eZ59mKhAJZ3rBchIBrQne2yTw2z+
+X1ESa3VTkW2jyJ5r7iuo+Xyc8246tfBwO3u0DJ2DeZZOYPzMg48nJNxs3ur3iXAT
+r6Aiwp0gtMNC2XcW7y5OPl8l+BhSt2PsWcdEdmLJgvRPJ2x+Ea8wivuw6FO6byK7
+Mxw7/CbNMw8Eey9eSz9kWDrgetS0kOgfqtt1ZnKDZkbLy8jFl0xW488VUrefUR1g
+lOje8QySjDvzT8sUR0lASyS+/J6j/3gLlSS42e4SxMz00jEus+ye56cO16Pc+vKI
+Xsev8cRPiSDTZTvc7Eaq/OcKVl11AgMBAAGjgYkwgYYwHQYDVR0OBBYEFD8BqtCx
+774CuCfVwfG9egbxb49zMEoGA1UdIwRDMEGAFD8BqtCx774CuCfVwfG9egbxb49z
+oROkETAPMQ0wCwYDVQQDDAR0ZXN0ghRyoePa5Lxwr1JhCImaghH/t9TQ+jAMBgNV
+HRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAXUrDhVAX
+TkbhKRBuhUGQb03RyACQKBFM/SwhrmwpQMXo7BUuqWJ27U5/TRHrfKJxDgppmwIs
+qmtrT07tA7e/OyFSZtZ9p/4H+5xM9FCsmu6YMQ3ZloHHGWmibrDNK70frVgRAEAS
+FyAsEgpKZCr6OJNd7v2dbvO4AniZVVvccU17cJAx177YC3fNIuRtpHkm93D3qI+1
+4SED7rktVfXUKs6RMFmqIum5WRzgiJBAtk2GVQMrAAu/xmUPS/aqzstNte4KQ+UY
+2qI9v1wYM8j+BT5nsBT02K+zOsYdkG39n7QEfcecPAjOkKsaFbSf/WZcsb6oCVgl
+d/Nz24kfh76SqQ==
+-----END CERTIFICATE-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/certs_by_serial/139D258986D24CF7F2000F4365EA7CDE.pem b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/certs_by_serial/139D258986D24CF7F2000F4365EA7CDE.pem
new file mode 100644
index 0000000000..723ee792b8
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/certs_by_serial/139D258986D24CF7F2000F4365EA7CDE.pem
@@ -0,0 +1,87 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            13:9d:25:89:86:d2:4c:f7:f2:00:0f:43:65:ea:7c:de
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=test
+        Validity
+            Not Before: Nov  8 07:49:15 2021 GMT
+            Not After : Feb 11 07:49:15 2024 GMT
+        Subject: CN=localhost
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:b8:d5:e2:66:d3:aa:e8:f7:2f:d8:76:b6:c6:67:
+                    5c:09:77:df:0b:1b:59:ca:f9:a9:fe:cc:50:91:91:
+                    a4:2a:96:55:54:8c:a9:17:25:23:8d:93:76:05:5c:
+                    9e:86:68:82:22:42:52:f6:7d:72:5f:85:5c:7c:61:
+                    d2:b2:a3:a2:5b:40:05:6f:eb:be:63:75:86:29:e7:
+                    97:e4:d7:20:1e:b4:c4:79:76:f7:cf:1d:70:ba:b0:
+                    10:ef:4e:9c:dc:15:4f:ee:b9:a7:b9:3f:f1:97:dd:
+                    77:0b:0e:3b:0b:c2:bd:b3:87:07:a4:95:2c:78:6b:
+                    7c:ac:7a:e4:02:c1:a0:3e:f5:ef:3a:51:f4:b3:4a:
+                    48:58:d0:16:10:8d:64:ba:a0:16:88:f0:62:55:fe:
+                    36:7b:9d:45:9f:f8:6d:e9:2a:1c:35:57:67:8e:2f:
+                    55:2f:27:87:dd:ce:df:a4:f3:9b:b5:80:7b:4a:f6:
+                    28:74:52:2d:cf:d9:ae:34:7f:6c:1d:89:f2:fc:00:
+                    aa:1c:fa:a0:30:22:14:19:76:65:9c:31:60:39:5d:
+                    0d:0a:15:80:b2:26:44:69:73:a2:0d:11:c0:b5:21:
+                    6f:52:cd:4a:2f:87:23:48:28:fc:8c:db:83:83:56:
+                    7a:a5:63:61:4c:6c:bb:3b:80:9f:ba:ad:66:63:b0:
+                    63:57
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            X509v3 Subject Key Identifier: 
+                DD:B7:0D:86:6B:E4:2F:30:5F:6C:C1:A8:A8:23:66:06:36:C4:30:BC
+            X509v3 Authority Key Identifier: 
+                keyid:3F:01:AA:D0:B1:EF:BE:02:B8:27:D5:C1:F1:BD:7A:06:F1:6F:8F:73
+                DirName:/CN=test
+                serial:72:A1:E3:DA:E4:BC:70:AF:52:61:08:89:9A:82:11:FF:B7:D4:D0:FA
+
+            X509v3 Extended Key Usage: 
+                TLS Web Server Authentication
+            X509v3 Key Usage: 
+                Digital Signature, Key Encipherment
+            X509v3 Subject Alternative Name: 
+                DNS:localhost
+    Signature Algorithm: sha256WithRSAEncryption
+         09:97:10:6a:b8:62:e7:e8:a5:a0:45:33:d2:85:0d:ca:61:73:
+         8c:85:27:1d:3d:68:8b:65:55:4b:51:d9:86:a8:89:92:52:6b:
+         98:4c:4b:75:05:ed:6e:e0:63:96:ce:44:b1:47:2a:71:32:32:
+         86:f2:e3:5d:68:bd:82:1c:66:23:7a:ff:9e:e4:c3:a2:cd:79:
+         2c:a0:63:9e:f5:cc:e4:71:60:0d:a5:69:5e:b5:c1:cb:4e:94:
+         18:c5:f9:cd:89:c3:7a:33:4d:5b:6c:ec:9d:0c:0b:fe:72:72:
+         07:b6:6d:ba:2b:10:e6:6e:0b:94:b6:3e:67:1a:c1:fe:73:e0:
+         dd:be:4c:1d:29:2b:01:fe:3e:ec:c6:d0:c8:de:04:77:ff:6a:
+         7e:81:8f:86:1b:42:70:38:d1:47:cd:b9:11:33:9c:b2:7d:fa:
+         b4:5e:a2:a4:cd:0c:ed:3e:b1:28:f6:3d:6f:df:ea:34:83:b2:
+         fc:c1:31:28:75:02:fb:64:20:06:89:a9:31:ff:7c:0a:bc:c0:
+         aa:11:45:a4:e0:f4:98:cc:f7:77:21:de:41:34:32:97:3b:d7:
+         88:58:47:7b:fb:c1:d2:9a:dc:5f:02:3f:4c:d9:99:71:f4:7b:
+         c8:31:c6:31:55:93:0e:42:28:b7:cb:43:e3:21:ce:84:de:0c:
+         a5:e1:7b:32
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgIQE50liYbSTPfyAA9DZep83jANBgkqhkiG9w0BAQsFADAP
+MQ0wCwYDVQQDDAR0ZXN0MB4XDTIxMTEwODA3NDkxNVoXDTI0MDIxMTA3NDkxNVow
+FDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAuNXiZtOq6Pcv2Ha2xmdcCXffCxtZyvmp/sxQkZGkKpZVVIypFyUjjZN2
+BVyehmiCIkJS9n1yX4VcfGHSsqOiW0AFb+u+Y3WGKeeX5NcgHrTEeXb3zx1wurAQ
+706c3BVP7rmnuT/xl913Cw47C8K9s4cHpJUseGt8rHrkAsGgPvXvOlH0s0pIWNAW
+EI1kuqAWiPBiVf42e51Fn/ht6SocNVdnji9VLyeH3c7fpPObtYB7SvYodFItz9mu
+NH9sHYny/ACqHPqgMCIUGXZlnDFgOV0NChWAsiZEaXOiDRHAtSFvUs1KL4cjSCj8
+jNuDg1Z6pWNhTGy7O4Cfuq1mY7BjVwIDAQABo4GxMIGuMAkGA1UdEwQCMAAwHQYD
+VR0OBBYEFN23DYZr5C8wX2zBqKgjZgY2xDC8MEoGA1UdIwRDMEGAFD8BqtCx774C
+uCfVwfG9egbxb49zoROkETAPMQ0wCwYDVQQDDAR0ZXN0ghRyoePa5Lxwr1JhCIma
+ghH/t9TQ+jATBgNVHSUEDDAKBggrBgEFBQcDATALBgNVHQ8EBAMCBaAwFAYDVR0R
+BA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQAJlxBquGLn6KWgRTPS
+hQ3KYXOMhScdPWiLZVVLUdmGqImSUmuYTEt1Be1u4GOWzkSxRypxMjKG8uNdaL2C
+HGYjev+e5MOizXksoGOe9czkcWANpWletcHLTpQYxfnNicN6M01bbOydDAv+cnIH
+tm26KxDmbguUtj5nGsH+c+DdvkwdKSsB/j7sxtDI3gR3/2p+gY+GG0JwONFHzbkR
+M5yyffq0XqKkzQztPrEo9j1v3+o0g7L8wTEodQL7ZCAGiakx/3wKvMCqEUWk4PSY
+zPd3Id5BNDKXO9eIWEd7+8HSmtxfAj9M2Zlx9HvIMcYxVZMOQii3y0PjIc6E3gyl
+4Xsy
+-----END CERTIFICATE-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/certs_by_serial/8055804ACAE0109030FB7947F31147A9.pem b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/certs_by_serial/8055804ACAE0109030FB7947F31147A9.pem
new file mode 100644
index 0000000000..eda326fd95
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/certs_by_serial/8055804ACAE0109030FB7947F31147A9.pem
@@ -0,0 +1,84 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            80:55:80:4a:ca:e0:10:90:30:fb:79:47:f3:11:47:a9
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=test
+        Validity
+            Not Before: Nov  8 07:51:56 2021 GMT
+            Not After : Feb 11 07:51:56 2024 GMT
+        Subject: CN=test
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:cd:ba:3a:57:9b:0f:9b:dd:5a:c3:8c:ac:f0:24:
+                    2e:20:8e:3b:33:6d:86:b2:cb:81:00:83:4a:4f:16:
+                    40:cd:b3:e5:1d:c5:7f:98:e7:4b:a0:f5:6f:f3:5b:
+                    1b:a2:6b:16:4d:5c:5b:fe:46:c3:58:8e:0e:13:f9:
+                    ec:69:68:37:f6:7d:e0:7e:8b:95:0f:71:ba:89:b1:
+                    5d:0e:ca:7c:9b:9e:07:57:c2:4b:e3:42:96:ef:5e:
+                    43:ea:fe:11:f2:38:3a:b4:0c:e3:e2:4c:28:e2:07:
+                    bb:9a:56:63:98:88:91:15:f5:27:4d:a5:d1:88:0c:
+                    49:48:24:8f:71:8d:7d:0e:48:1b:d9:95:a4:7b:f2:
+                    b7:f6:68:95:0c:14:2f:19:8d:ac:c5:cd:95:ac:42:
+                    93:ab:6e:60:33:40:90:f6:80:4e:a8:4b:f0:0f:d4:
+                    d6:c0:5d:f2:8f:dd:c0:41:2b:78:96:12:60:37:e7:
+                    c5:cc:ba:7a:36:de:0a:f0:e5:c9:90:51:3d:66:a6:
+                    d1:b9:d2:b4:d3:ad:cb:72:f9:46:45:33:65:4a:e3:
+                    e9:95:ee:23:37:92:b0:6b:a8:95:02:06:04:6b:7e:
+                    44:a9:4e:3c:fd:93:5b:32:4c:c3:40:24:9e:52:14:
+                    d1:ac:aa:c5:88:4b:88:75:51:1c:96:26:c2:d7:75:
+                    c6:7b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            X509v3 Subject Key Identifier: 
+                8E:9E:25:9F:4F:53:6D:1D:D6:2C:08:03:2C:66:C3:6F:90:16:53:96
+            X509v3 Authority Key Identifier: 
+                keyid:3F:01:AA:D0:B1:EF:BE:02:B8:27:D5:C1:F1:BD:7A:06:F1:6F:8F:73
+                DirName:/CN=test
+                serial:72:A1:E3:DA:E4:BC:70:AF:52:61:08:89:9A:82:11:FF:B7:D4:D0:FA
+
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication
+            X509v3 Key Usage: 
+                Digital Signature
+    Signature Algorithm: sha256WithRSAEncryption
+         00:67:d2:93:e6:69:cb:fd:f6:9f:df:f6:59:20:2a:f6:0f:03:
+         ba:b3:da:65:de:62:23:36:a2:8d:4f:27:22:0e:3d:01:80:d9:
+         59:cd:c5:f0:1a:9b:c5:e8:f4:6f:e2:c7:29:fc:37:21:2f:6f:
+         9d:b8:8c:f6:6e:37:c9:b1:4a:0d:9d:e5:cd:0a:4b:01:0a:98:
+         8f:46:e9:24:97:9c:ef:75:dd:a4:f7:33:7d:df:09:f3:4c:b6:
+         3c:38:a7:2e:26:1d:68:f9:87:9a:ae:6c:60:d9:de:32:f1:69:
+         66:97:cb:20:81:0d:b5:01:74:b5:73:8c:85:2b:5a:73:ea:cd:
+         e5:25:13:44:3a:24:0a:0a:72:4d:42:cc:0b:5a:c9:96:05:20:
+         37:fb:1b:95:18:8d:66:ff:10:f8:3a:d8:03:6c:6c:37:6e:de:
+         51:59:08:7e:d1:33:11:08:74:ed:fc:3f:4d:19:00:82:88:9f:
+         95:66:a6:e9:f1:73:55:e1:7a:3f:ae:a6:e1:b7:51:df:92:28:
+         19:42:1d:a5:a7:ed:b9:e4:00:ea:a7:55:e3:55:12:45:5f:f9:
+         e1:a5:1f:13:f1:ee:1a:31:e5:ae:9d:2e:ef:dd:d8:56:b2:7c:
+         f6:ba:08:41:db:13:16:31:0e:5d:41:b2:6d:98:01:e4:43:a2:
+         d1:34:9e:91
+-----BEGIN CERTIFICATE-----
+MIIDRTCCAi2gAwIBAgIRAIBVgErK4BCQMPt5R/MRR6kwDQYJKoZIhvcNAQELBQAw
+DzENMAsGA1UEAwwEdGVzdDAeFw0yMTExMDgwNzUxNTZaFw0yNDAyMTEwNzUxNTZa
+MA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDNujpXmw+b3VrDjKzwJC4gjjszbYayy4EAg0pPFkDNs+UdxX+Y50ug9W/zWxui
+axZNXFv+RsNYjg4T+expaDf2feB+i5UPcbqJsV0OynybngdXwkvjQpbvXkPq/hHy
+ODq0DOPiTCjiB7uaVmOYiJEV9SdNpdGIDElIJI9xjX0OSBvZlaR78rf2aJUMFC8Z
+jazFzZWsQpOrbmAzQJD2gE6oS/AP1NbAXfKP3cBBK3iWEmA358XMuno23grw5cmQ
+UT1mptG50rTTrcty+UZFM2VK4+mV7iM3krBrqJUCBgRrfkSpTjz9k1syTMNAJJ5S
+FNGsqsWIS4h1URyWJsLXdcZ7AgMBAAGjgZswgZgwCQYDVR0TBAIwADAdBgNVHQ4E
+FgQUjp4ln09TbR3WLAgDLGbDb5AWU5YwSgYDVR0jBEMwQYAUPwGq0LHvvgK4J9XB
+8b16BvFvj3OhE6QRMA8xDTALBgNVBAMMBHRlc3SCFHKh49rkvHCvUmEIiZqCEf+3
+1ND6MBMGA1UdJQQMMAoGCCsGAQUFBwMCMAsGA1UdDwQEAwIHgDANBgkqhkiG9w0B
+AQsFAAOCAQEAAGfSk+Zpy/32n9/2WSAq9g8DurPaZd5iIzaijU8nIg49AYDZWc3F
+8Bqbxej0b+LHKfw3IS9vnbiM9m43ybFKDZ3lzQpLAQqYj0bpJJec73XdpPczfd8J
+80y2PDinLiYdaPmHmq5sYNneMvFpZpfLIIENtQF0tXOMhStac+rN5SUTRDokCgpy
+TULMC1rJlgUgN/sblRiNZv8Q+DrYA2xsN27eUVkIftEzEQh07fw/TRkAgoiflWam
+6fFzVeF6P66m4bdR35IoGUIdpaftueQA6qdV41USRV/54aUfE/HuGjHlrp0u793Y
+VrJ89roIQdsTFjEOXUGybZgB5EOi0TSekQ==
+-----END CERTIFICATE-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/crl.pem b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/crl.pem
new file mode 100644
index 0000000000..6dd7b13985
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/crl.pem
@@ -0,0 +1,11 @@
+-----BEGIN X509 CRL-----
+MIIBqDCBkQIBATANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR0ZXN0Fw0yMTEx
+MDgwNzQ5MTZaFw0zMTExMDYwNzQ5MTZaoE4wTDBKBgNVHSMEQzBBgBQ/AarQse++
+Argn1cHxvXoG8W+Pc6ETpBEwDzENMAsGA1UEAwwEdGVzdIIUcqHj2uS8cK9SYQiJ
+moIR/7fU0PowDQYJKoZIhvcNAQELBQADggEBAD4eZq6iex+GdwiGaEGjtIcpQGJD
+eQC9xUmkZSphKOcwjFyPC6/qOZ/MAgPhqzP2urgyrgeluvhFsISXmH/Di+6yVn7f
+bV4c1e0CT6/H6filAelPnbkEclCv/48P6L3BN4o4S98QXzvMeF+YfpEYGyjO+/PW
+vd0UH4mdtsDpk94Z2FKxeUey76EJPSvwa08dY+/CLynSGDXdGavErtFTBVoc5qcj
+XdC3CI2ig3DnUUBvwiwSxiB5vzJ8Vhl3dxTag/4yYkfjmOS9EzdDRAhRfg7wsf+v
+t4HmeQ2ntBkld1MtXJSKaOQa/if5+nNyb+4ktQkLC6YBd4SNpO8yYq/dMJA=
+-----END X509 CRL-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/dh.pem b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/dh.pem
new file mode 100644
index 0000000000..3b1acc9dd4
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/dh.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEAlG3e5COo1wC8aPTfb2ilsHyfPSj8WHMDMFfZYAiJsLAW6sNaA33L
+9AfgsYDgb5CoHhil47Yrons97nvdC6lwVuG61Q7S77VX0MV6b12Gu+D8VJElnoNB
+yQP/z6Frfg7OKCDelIfkvqYYPqQD33S7XR2a+7vO2E/vnc7vcfHozUUPKHqFtxyt
+MNYuIs74l+2HHBHEO9fKWHc4IfHEkROQbehy0y6//qiKz/WqWAkQPX6eqgf26V23
+TyOT4UBvNv7nqOEpV4WS+zg+qH5c/kkcwSD/8jJMMi1cEWvz+9w+Kh7ponzQqOU0
+LOUysoYDcsZfuE/1SftOs44jUb4UCsKC4wIBAg==
+-----END DH PARAMETERS-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt
new file mode 100644
index 0000000000..7a38b10be0
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt
@@ -0,0 +1,2 @@
+V	240211074915Z		139D258986D24CF7F2000F4365EA7CDE	unknown	/CN=localhost
+V	240211075156Z		8055804ACAE0109030FB7947F31147A9	unknown	/CN=test
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt.attr b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt.attr
new file mode 100644
index 0000000000..3a7e39e6ee
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt.attr
@@ -0,0 +1 @@
+unique_subject = no
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt.attr.old b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt.attr.old
new file mode 100644
index 0000000000..3a7e39e6ee
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt.attr.old
@@ -0,0 +1 @@
+unique_subject = no
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt.old b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt.old
new file mode 100644
index 0000000000..62a33d15e5
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/index.txt.old
@@ -0,0 +1 @@
+V	240211074915Z		139D258986D24CF7F2000F4365EA7CDE	unknown	/CN=localhost
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/issued/localhost.crt b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/issued/localhost.crt
new file mode 100644
index 0000000000..723ee792b8
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/issued/localhost.crt
@@ -0,0 +1,87 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            13:9d:25:89:86:d2:4c:f7:f2:00:0f:43:65:ea:7c:de
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=test
+        Validity
+            Not Before: Nov  8 07:49:15 2021 GMT
+            Not After : Feb 11 07:49:15 2024 GMT
+        Subject: CN=localhost
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:b8:d5:e2:66:d3:aa:e8:f7:2f:d8:76:b6:c6:67:
+                    5c:09:77:df:0b:1b:59:ca:f9:a9:fe:cc:50:91:91:
+                    a4:2a:96:55:54:8c:a9:17:25:23:8d:93:76:05:5c:
+                    9e:86:68:82:22:42:52:f6:7d:72:5f:85:5c:7c:61:
+                    d2:b2:a3:a2:5b:40:05:6f:eb:be:63:75:86:29:e7:
+                    97:e4:d7:20:1e:b4:c4:79:76:f7:cf:1d:70:ba:b0:
+                    10:ef:4e:9c:dc:15:4f:ee:b9:a7:b9:3f:f1:97:dd:
+                    77:0b:0e:3b:0b:c2:bd:b3:87:07:a4:95:2c:78:6b:
+                    7c:ac:7a:e4:02:c1:a0:3e:f5:ef:3a:51:f4:b3:4a:
+                    48:58:d0:16:10:8d:64:ba:a0:16:88:f0:62:55:fe:
+                    36:7b:9d:45:9f:f8:6d:e9:2a:1c:35:57:67:8e:2f:
+                    55:2f:27:87:dd:ce:df:a4:f3:9b:b5:80:7b:4a:f6:
+                    28:74:52:2d:cf:d9:ae:34:7f:6c:1d:89:f2:fc:00:
+                    aa:1c:fa:a0:30:22:14:19:76:65:9c:31:60:39:5d:
+                    0d:0a:15:80:b2:26:44:69:73:a2:0d:11:c0:b5:21:
+                    6f:52:cd:4a:2f:87:23:48:28:fc:8c:db:83:83:56:
+                    7a:a5:63:61:4c:6c:bb:3b:80:9f:ba:ad:66:63:b0:
+                    63:57
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            X509v3 Subject Key Identifier: 
+                DD:B7:0D:86:6B:E4:2F:30:5F:6C:C1:A8:A8:23:66:06:36:C4:30:BC
+            X509v3 Authority Key Identifier: 
+                keyid:3F:01:AA:D0:B1:EF:BE:02:B8:27:D5:C1:F1:BD:7A:06:F1:6F:8F:73
+                DirName:/CN=test
+                serial:72:A1:E3:DA:E4:BC:70:AF:52:61:08:89:9A:82:11:FF:B7:D4:D0:FA
+
+            X509v3 Extended Key Usage: 
+                TLS Web Server Authentication
+            X509v3 Key Usage: 
+                Digital Signature, Key Encipherment
+            X509v3 Subject Alternative Name: 
+                DNS:localhost
+    Signature Algorithm: sha256WithRSAEncryption
+         09:97:10:6a:b8:62:e7:e8:a5:a0:45:33:d2:85:0d:ca:61:73:
+         8c:85:27:1d:3d:68:8b:65:55:4b:51:d9:86:a8:89:92:52:6b:
+         98:4c:4b:75:05:ed:6e:e0:63:96:ce:44:b1:47:2a:71:32:32:
+         86:f2:e3:5d:68:bd:82:1c:66:23:7a:ff:9e:e4:c3:a2:cd:79:
+         2c:a0:63:9e:f5:cc:e4:71:60:0d:a5:69:5e:b5:c1:cb:4e:94:
+         18:c5:f9:cd:89:c3:7a:33:4d:5b:6c:ec:9d:0c:0b:fe:72:72:
+         07:b6:6d:ba:2b:10:e6:6e:0b:94:b6:3e:67:1a:c1:fe:73:e0:
+         dd:be:4c:1d:29:2b:01:fe:3e:ec:c6:d0:c8:de:04:77:ff:6a:
+         7e:81:8f:86:1b:42:70:38:d1:47:cd:b9:11:33:9c:b2:7d:fa:
+         b4:5e:a2:a4:cd:0c:ed:3e:b1:28:f6:3d:6f:df:ea:34:83:b2:
+         fc:c1:31:28:75:02:fb:64:20:06:89:a9:31:ff:7c:0a:bc:c0:
+         aa:11:45:a4:e0:f4:98:cc:f7:77:21:de:41:34:32:97:3b:d7:
+         88:58:47:7b:fb:c1:d2:9a:dc:5f:02:3f:4c:d9:99:71:f4:7b:
+         c8:31:c6:31:55:93:0e:42:28:b7:cb:43:e3:21:ce:84:de:0c:
+         a5:e1:7b:32
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgIQE50liYbSTPfyAA9DZep83jANBgkqhkiG9w0BAQsFADAP
+MQ0wCwYDVQQDDAR0ZXN0MB4XDTIxMTEwODA3NDkxNVoXDTI0MDIxMTA3NDkxNVow
+FDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAuNXiZtOq6Pcv2Ha2xmdcCXffCxtZyvmp/sxQkZGkKpZVVIypFyUjjZN2
+BVyehmiCIkJS9n1yX4VcfGHSsqOiW0AFb+u+Y3WGKeeX5NcgHrTEeXb3zx1wurAQ
+706c3BVP7rmnuT/xl913Cw47C8K9s4cHpJUseGt8rHrkAsGgPvXvOlH0s0pIWNAW
+EI1kuqAWiPBiVf42e51Fn/ht6SocNVdnji9VLyeH3c7fpPObtYB7SvYodFItz9mu
+NH9sHYny/ACqHPqgMCIUGXZlnDFgOV0NChWAsiZEaXOiDRHAtSFvUs1KL4cjSCj8
+jNuDg1Z6pWNhTGy7O4Cfuq1mY7BjVwIDAQABo4GxMIGuMAkGA1UdEwQCMAAwHQYD
+VR0OBBYEFN23DYZr5C8wX2zBqKgjZgY2xDC8MEoGA1UdIwRDMEGAFD8BqtCx774C
+uCfVwfG9egbxb49zoROkETAPMQ0wCwYDVQQDDAR0ZXN0ghRyoePa5Lxwr1JhCIma
+ghH/t9TQ+jATBgNVHSUEDDAKBggrBgEFBQcDATALBgNVHQ8EBAMCBaAwFAYDVR0R
+BA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQAJlxBquGLn6KWgRTPS
+hQ3KYXOMhScdPWiLZVVLUdmGqImSUmuYTEt1Be1u4GOWzkSxRypxMjKG8uNdaL2C
+HGYjev+e5MOizXksoGOe9czkcWANpWletcHLTpQYxfnNicN6M01bbOydDAv+cnIH
+tm26KxDmbguUtj5nGsH+c+DdvkwdKSsB/j7sxtDI3gR3/2p+gY+GG0JwONFHzbkR
+M5yyffq0XqKkzQztPrEo9j1v3+o0g7L8wTEodQL7ZCAGiakx/3wKvMCqEUWk4PSY
+zPd3Id5BNDKXO9eIWEd7+8HSmtxfAj9M2Zlx9HvIMcYxVZMOQii3y0PjIc6E3gyl
+4Xsy
+-----END CERTIFICATE-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/issued/test.crt b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/issued/test.crt
new file mode 100644
index 0000000000..eda326fd95
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/issued/test.crt
@@ -0,0 +1,84 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            80:55:80:4a:ca:e0:10:90:30:fb:79:47:f3:11:47:a9
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=test
+        Validity
+            Not Before: Nov  8 07:51:56 2021 GMT
+            Not After : Feb 11 07:51:56 2024 GMT
+        Subject: CN=test
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:cd:ba:3a:57:9b:0f:9b:dd:5a:c3:8c:ac:f0:24:
+                    2e:20:8e:3b:33:6d:86:b2:cb:81:00:83:4a:4f:16:
+                    40:cd:b3:e5:1d:c5:7f:98:e7:4b:a0:f5:6f:f3:5b:
+                    1b:a2:6b:16:4d:5c:5b:fe:46:c3:58:8e:0e:13:f9:
+                    ec:69:68:37:f6:7d:e0:7e:8b:95:0f:71:ba:89:b1:
+                    5d:0e:ca:7c:9b:9e:07:57:c2:4b:e3:42:96:ef:5e:
+                    43:ea:fe:11:f2:38:3a:b4:0c:e3:e2:4c:28:e2:07:
+                    bb:9a:56:63:98:88:91:15:f5:27:4d:a5:d1:88:0c:
+                    49:48:24:8f:71:8d:7d:0e:48:1b:d9:95:a4:7b:f2:
+                    b7:f6:68:95:0c:14:2f:19:8d:ac:c5:cd:95:ac:42:
+                    93:ab:6e:60:33:40:90:f6:80:4e:a8:4b:f0:0f:d4:
+                    d6:c0:5d:f2:8f:dd:c0:41:2b:78:96:12:60:37:e7:
+                    c5:cc:ba:7a:36:de:0a:f0:e5:c9:90:51:3d:66:a6:
+                    d1:b9:d2:b4:d3:ad:cb:72:f9:46:45:33:65:4a:e3:
+                    e9:95:ee:23:37:92:b0:6b:a8:95:02:06:04:6b:7e:
+                    44:a9:4e:3c:fd:93:5b:32:4c:c3:40:24:9e:52:14:
+                    d1:ac:aa:c5:88:4b:88:75:51:1c:96:26:c2:d7:75:
+                    c6:7b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            X509v3 Subject Key Identifier: 
+                8E:9E:25:9F:4F:53:6D:1D:D6:2C:08:03:2C:66:C3:6F:90:16:53:96
+            X509v3 Authority Key Identifier: 
+                keyid:3F:01:AA:D0:B1:EF:BE:02:B8:27:D5:C1:F1:BD:7A:06:F1:6F:8F:73
+                DirName:/CN=test
+                serial:72:A1:E3:DA:E4:BC:70:AF:52:61:08:89:9A:82:11:FF:B7:D4:D0:FA
+
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication
+            X509v3 Key Usage: 
+                Digital Signature
+    Signature Algorithm: sha256WithRSAEncryption
+         00:67:d2:93:e6:69:cb:fd:f6:9f:df:f6:59:20:2a:f6:0f:03:
+         ba:b3:da:65:de:62:23:36:a2:8d:4f:27:22:0e:3d:01:80:d9:
+         59:cd:c5:f0:1a:9b:c5:e8:f4:6f:e2:c7:29:fc:37:21:2f:6f:
+         9d:b8:8c:f6:6e:37:c9:b1:4a:0d:9d:e5:cd:0a:4b:01:0a:98:
+         8f:46:e9:24:97:9c:ef:75:dd:a4:f7:33:7d:df:09:f3:4c:b6:
+         3c:38:a7:2e:26:1d:68:f9:87:9a:ae:6c:60:d9:de:32:f1:69:
+         66:97:cb:20:81:0d:b5:01:74:b5:73:8c:85:2b:5a:73:ea:cd:
+         e5:25:13:44:3a:24:0a:0a:72:4d:42:cc:0b:5a:c9:96:05:20:
+         37:fb:1b:95:18:8d:66:ff:10:f8:3a:d8:03:6c:6c:37:6e:de:
+         51:59:08:7e:d1:33:11:08:74:ed:fc:3f:4d:19:00:82:88:9f:
+         95:66:a6:e9:f1:73:55:e1:7a:3f:ae:a6:e1:b7:51:df:92:28:
+         19:42:1d:a5:a7:ed:b9:e4:00:ea:a7:55:e3:55:12:45:5f:f9:
+         e1:a5:1f:13:f1:ee:1a:31:e5:ae:9d:2e:ef:dd:d8:56:b2:7c:
+         f6:ba:08:41:db:13:16:31:0e:5d:41:b2:6d:98:01:e4:43:a2:
+         d1:34:9e:91
+-----BEGIN CERTIFICATE-----
+MIIDRTCCAi2gAwIBAgIRAIBVgErK4BCQMPt5R/MRR6kwDQYJKoZIhvcNAQELBQAw
+DzENMAsGA1UEAwwEdGVzdDAeFw0yMTExMDgwNzUxNTZaFw0yNDAyMTEwNzUxNTZa
+MA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDNujpXmw+b3VrDjKzwJC4gjjszbYayy4EAg0pPFkDNs+UdxX+Y50ug9W/zWxui
+axZNXFv+RsNYjg4T+expaDf2feB+i5UPcbqJsV0OynybngdXwkvjQpbvXkPq/hHy
+ODq0DOPiTCjiB7uaVmOYiJEV9SdNpdGIDElIJI9xjX0OSBvZlaR78rf2aJUMFC8Z
+jazFzZWsQpOrbmAzQJD2gE6oS/AP1NbAXfKP3cBBK3iWEmA358XMuno23grw5cmQ
+UT1mptG50rTTrcty+UZFM2VK4+mV7iM3krBrqJUCBgRrfkSpTjz9k1syTMNAJJ5S
+FNGsqsWIS4h1URyWJsLXdcZ7AgMBAAGjgZswgZgwCQYDVR0TBAIwADAdBgNVHQ4E
+FgQUjp4ln09TbR3WLAgDLGbDb5AWU5YwSgYDVR0jBEMwQYAUPwGq0LHvvgK4J9XB
+8b16BvFvj3OhE6QRMA8xDTALBgNVBAMMBHRlc3SCFHKh49rkvHCvUmEIiZqCEf+3
+1ND6MBMGA1UdJQQMMAoGCCsGAQUFBwMCMAsGA1UdDwQEAwIHgDANBgkqhkiG9w0B
+AQsFAAOCAQEAAGfSk+Zpy/32n9/2WSAq9g8DurPaZd5iIzaijU8nIg49AYDZWc3F
+8Bqbxej0b+LHKfw3IS9vnbiM9m43ybFKDZ3lzQpLAQqYj0bpJJec73XdpPczfd8J
+80y2PDinLiYdaPmHmq5sYNneMvFpZpfLIIENtQF0tXOMhStac+rN5SUTRDokCgpy
+TULMC1rJlgUgN/sblRiNZv8Q+DrYA2xsN27eUVkIftEzEQh07fw/TRkAgoiflWam
+6fFzVeF6P66m4bdR35IoGUIdpaftueQA6qdV41USRV/54aUfE/HuGjHlrp0u793Y
+VrJ89roIQdsTFjEOXUGybZgB5EOi0TSekQ==
+-----END CERTIFICATE-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/openssl-easyrsa.cnf b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/openssl-easyrsa.cnf
new file mode 100644
index 0000000000..5c4fc79e7e
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/openssl-easyrsa.cnf
@@ -0,0 +1,138 @@
+# For use with Easy-RSA 3.0+ and OpenSSL or LibreSSL
+
+####################################################################
+[ ca ]
+default_ca	= CA_default		# The default ca section
+
+####################################################################
+[ CA_default ]
+
+dir		= $ENV::EASYRSA_PKI	# Where everything is kept
+certs		= $dir			# Where the issued certs are kept
+crl_dir		= $dir			# Where the issued crl are kept
+database	= $dir/index.txt	# database index file.
+new_certs_dir	= $dir/certs_by_serial	# default place for new certs.
+
+certificate	= $dir/ca.crt	 	# The CA certificate
+serial		= $dir/serial 		# The current serial number
+crl		= $dir/crl.pem 		# The current CRL
+private_key	= $dir/private/ca.key	# The private key
+RANDFILE	= $dir/.rand		# private random number file
+
+x509_extensions	= basic_exts		# The extensions to add to the cert
+
+# This allows a V2 CRL. Ancient browsers don't like it, but anything Easy-RSA
+# is designed for will. In return, we get the Issuer attached to CRLs.
+crl_extensions	= crl_ext
+
+default_days	= $ENV::EASYRSA_CERT_EXPIRE	# how long to certify for
+default_crl_days= $ENV::EASYRSA_CRL_DAYS	# how long before next CRL
+default_md	= $ENV::EASYRSA_DIGEST		# use public key default MD
+preserve	= no			# keep passed DN ordering
+
+# This allows to renew certificates which have not been revoked
+unique_subject	= no
+
+# A few different ways of specifying how similar the request should look
+# For type CA, the listed attributes must be the same, and the optional
+# and supplied fields are just that :-)
+policy		= policy_anything
+
+# For the 'anything' policy, which defines allowed DN fields
+[ policy_anything ]
+countryName		= optional
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+name			= optional
+emailAddress		= optional
+
+####################################################################
+# Easy-RSA request handling
+# We key off $DN_MODE to determine how to format the DN
+[ req ]
+default_bits		= $ENV::EASYRSA_KEY_SIZE
+default_keyfile 	= privkey.pem
+default_md		= $ENV::EASYRSA_DIGEST
+distinguished_name	= $ENV::EASYRSA_DN
+x509_extensions		= easyrsa_ca	# The extensions to add to the self signed cert
+
+# A placeholder to handle the $EXTRA_EXTS feature:
+#%EXTRA_EXTS%	# Do NOT remove or change this line as $EXTRA_EXTS support requires it
+
+####################################################################
+# Easy-RSA DN (Subject) handling
+
+# Easy-RSA DN for cn_only support:
+[ cn_only ]
+commonName		= Common Name (eg: your user, host, or server name)
+commonName_max		= 64
+commonName_default	= $ENV::EASYRSA_REQ_CN
+
+# Easy-RSA DN for org support:
+[ org ]
+countryName			= Country Name (2 letter code)
+countryName_default		= $ENV::EASYRSA_REQ_COUNTRY
+countryName_min			= 2
+countryName_max			= 2
+
+stateOrProvinceName		= State or Province Name (full name)
+stateOrProvinceName_default	= $ENV::EASYRSA_REQ_PROVINCE
+
+localityName			= Locality Name (eg, city)
+localityName_default		= $ENV::EASYRSA_REQ_CITY
+
+0.organizationName		= Organization Name (eg, company)
+0.organizationName_default	= $ENV::EASYRSA_REQ_ORG
+
+organizationalUnitName		= Organizational Unit Name (eg, section)
+organizationalUnitName_default	= $ENV::EASYRSA_REQ_OU
+
+commonName			= Common Name (eg: your user, host, or server name)
+commonName_max			= 64
+commonName_default		= $ENV::EASYRSA_REQ_CN
+
+emailAddress			= Email Address
+emailAddress_default		= $ENV::EASYRSA_REQ_EMAIL
+emailAddress_max		= 64
+
+####################################################################
+# Easy-RSA cert extension handling
+
+# This section is effectively unused as the main script sets extensions
+# dynamically. This core section is left to support the odd usecase where
+# a user calls openssl directly.
+[ basic_exts ]
+basicConstraints	= CA:FALSE
+subjectKeyIdentifier	= hash
+authorityKeyIdentifier	= keyid,issuer:always
+
+# The Easy-RSA CA extensions
+[ easyrsa_ca ]
+
+# PKIX recommendations:
+
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer:always
+
+# This could be marked critical, but it's nice to support reading by any
+# broken clients who attempt to do so.
+basicConstraints = CA:true
+
+# Limit key usage to CA tasks. If you really want to use the generated pair as
+# a self-signed cert, comment this out.
+keyUsage = cRLSign, keyCertSign
+
+# nsCertType omitted by default. Let's try to let the deprecated stuff die.
+# nsCertType = sslCA
+
+# CRL extensions.
+[ crl_ext ]
+
+# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
+
+# issuerAltName=issuer:copy
+authorityKeyIdentifier=keyid:always,issuer:always
+
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/private/ca.key b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/private/ca.key
new file mode 100644
index 0000000000..d47b74f89d
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/private/ca.key
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-256-CBC,9953B10D522B006610527D745ED2B3FF
+
+xOtU092mS9pMlkXv5EZVQ3mAAnOPh/qb/0zmHagFTys1jHKKBGnXUWr8cYGD5Dyk
+NVDoEn3RjAKhNV0Hvs18m/MUDqsuqj1fNw55LWszQ0/OioOA3+CiZlRd3qUmOFIZ
+2oG+5l/k1XoH2S/zho4L53vxAMcTr62R+BXO++G4C1nMFwIchjpYInCoVZZblhP/
+Iue1lnYKkFhV609F5digBdM2mNIBJi5RST5T9rm0/EkxYNcfJgq9WMI4fN6ISXFm
+KgxAT9+22v90KEGTb7ehNoczOZ7YS3kYC4zMoniIZ78E5Fv0d83strIa0S6rkKL+
+hGZ6KmVrtJpisdUIQ6Vv6aD5UCJfxdC/mC64F+gs0ElrYFC4t+Rb1uA2YyNgfuue
+K0uAKcXPA4mpVyHd95TP5Yf332DiifnfO7/HqnULC+YQ+4Eo0zYJEfqbSbdI1hJD
+gcneKrtRMIFL0ypzD9d8mGZce5hOHeJXR+xSWweMlQADYT/lmILHwUkShnSxa9em
+S8ZgQNw56yIv1Ug3aBbtxxa/qYHWv11ZZeXA5vvkvXwt4lxmsFxYg8PySpoOqbE4
+XoJ4u5VeNS3EZZ2fHuDraTAkisfJoXRq+nYnNxK5Y+v03/y3/Ywj7UOSvH5b04Mu
+lMiauOstDwlMZWsH+BqN70LWbddffZ3z2t6RdQbgxWHucMA4WB9EN18ynM3IEIM/
+HfiNVM5JwyZfsXULAq1bwCbkvbuuZDzjF0itBi7nZA6H+bdETP9neHUtHHhqW+zP
+lQmQt4qq0JMkDNXQUt69p213iy8lTOnWzMhfLoTcqcJxFjUjujb3DUSOfcmFx8a8
+5sYaXbiSY8PbjWeX8S/dFx94Zwyy1pWj/rWiGVjeUjvxDzdfFyKf8JSSaXltCVvw
+HoKaQFycuB0cuWBo+UxHRI+sUDj0rzdNSR1MxdCJbnWmOJBOoQCZWPcodt9ttSux
+OxSNTU90bUMKRyAI9FevWXR7ZGx1o+VXPG0lGAD638eHIfBfc6RLqiYAyrDLOp8y
+/yRvTCJAFIvSfqPOjXjDX9OI6KhNpsQRpLeEJrTG8DPDLvjTqb+yCimryIe0GpM2
+H8OGu9bQkUzbotQ/c1wPXWRGUgk0wJG5vwNE58y9QpkxZEkToXcE9DZ/SdyXd7YU
+fA1V67Li0AfnBXAS921GHWvwH8di+OEpquy91ftv6Dwq429h2TFAqlPi3QpfGhgP
+QQlmv5y5Wfi9SVqOTa/lz31NyJ2CVZpMdC+8vGZg1YTisss/ARYZtPBlcozYp9Op
+ubovrEVugPzmzbTB8FxRuw+6GdCO0502B1k/32bvuV7XUMXltNJR094i0d/VqGeZ
+WxdGMVSYn+32ai9YZeAVvfAisBjAVmG49iNpCAkL4a5s2ONbJ+H7AhhQadDmBoxA
+JA4JNeV19LgSWUxfNE+8IMpoDewa8RQnr68VALZDIZ8TkJvMet2fC2xy86cSNTsJ
+MNbIzVZ8d+ZazE1Ki6jaToX9i4a/fBhftG4Ssi9TlmkpPli+/JgHA6WOY58+ZiZ/
+pFht4WjYeayos9hRDwGrXqVJ/pQph5swTZIbvOkIkCtNRiDkHW4VLq8gVI8eNcxg
+-----END RSA PRIVATE KEY-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/private/localhost.key b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/private/localhost.key
new file mode 100644
index 0000000000..4e185149a8
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/private/localhost.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC41eJm06ro9y/Y
+drbGZ1wJd98LG1nK+an+zFCRkaQqllVUjKkXJSONk3YFXJ6GaIIiQlL2fXJfhVx8
+YdKyo6JbQAVv675jdYYp55fk1yAetMR5dvfPHXC6sBDvTpzcFU/uuae5P/GX3XcL
+DjsLwr2zhweklSx4a3yseuQCwaA+9e86UfSzSkhY0BYQjWS6oBaI8GJV/jZ7nUWf
++G3pKhw1V2eOL1UvJ4fdzt+k85u1gHtK9ih0Ui3P2a40f2wdifL8AKoc+qAwIhQZ
+dmWcMWA5XQ0KFYCyJkRpc6INEcC1IW9SzUovhyNIKPyM24ODVnqlY2FMbLs7gJ+6
+rWZjsGNXAgMBAAECggEAC47EQ23E6CBcy4pQz4MzDByEw+sH6FtIN/iKqS+UNl2E
+JG9PO3VFDdtEq/0opHrweDfxfBxIBJUQPW7Yf/cfddlA/cid9RYqN4CVzOduyLzA
+9F9uC3Np0yKjTHN7938VqnXNeRX4g2iDwxs2sfuRZSJyZeY2C6mc+CQPEeUNoiIf
+iEevqy5uk08CcuZfT6mr/AM3EOhvtLc5Vz2jlDBR5DkkEibIzkiU9cBQqgfeoZee
+aYy0SvowJ+YfeF+sq/Hj3XBozBfIvYrHSLjMduI2ZBLrNgC3rGzYZqNXCoRoEB9q
+9par8S7bxvr8v0fPr+IgxOmYU3btOWdObD4WV8ZJYQKBgQDc9uIQwV8VcE+3oPn+
+bretrIn6gNSBpf5uHSN37Gj1SoZSA77hADRLb6S2nrEQe94ufA8wG7MbLW6n8QuA
+K8mPKS8jNlYm3UVX58mvusAdl6aX5eVoJFwDnlOAr1QXxxS4elmkkg1a+LhGMLY1
+sYcBzFuCb4V7w5+1X8COVeWxqQKBgQDWJIBCuDDOGUDqP4xDz6g2h73Lprd5SqFW
+S4wx+ANdW1KAqF8HC4F2wYtWOxNmhtSmcQDXoc46nAdc0K/ztt7DEaVIpmM0JkoB
+UQd3jlDSSyxR2dqIbYX8G/orPspeDvDo8hZIy2c7Q6X0ECXeRKQT1QKLtlgGWbwx
+uTjlLlyM/wKBgEgpjJzCOiZLPo2O0fYI/I2Iiqs3xa7tohEeDQZOO9zX0NQaCw16
+PpngRR+q5dKnUWFG/MLOWQjoJnpMW2ApbLMHVTCfvzUEEHBr708nozRG4Y4781a2
+gSJhY43kNIdradXxhzMay6fJEI1DvU39w0SQE9aeSy6nLZJTShRx8wi5AoGALYDY
+GFVXWZQYLS6PuaEYl23EsM+eURHAsrue8MdIv7+2Cky81JxnSDrcRtiKyNCBw1Rj
+324silu5XMmjeeAz+bN4MbXZgq1YMGttcMQ2/Fio9EOcojzTqbywLhxLmC0ImBdJ
+EPLX3soDK5d61H41d1leDx4SGldbHB3Frz1owTUCgYBTW5pDgCdGKLWumNc89wyX
+F0nGycd4/8sEJWozfgsQ+FmPlvqYjCke9nHTM6TIhTW9s6LxxmzIKIKIvcDPIMDR
+B2zNldkuL7+tU5LSzEXi9rTVKGhYuVEC10sbaeWMLgtOxWe08TBZrTDW+Hec1BUT
+tTqkU6SGHfgXMazbyF+DhA==
+-----END PRIVATE KEY-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/private/test.key b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/private/test.key
new file mode 100644
index 0000000000..389dd93f5d
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/private/test.key
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIppK+RhgYEmsCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECG/rQJN9VfmpBIIEyMxNUosBZiWi
+7ziO5LeP7tTeeNtTElo/BG7UgDfExEVyhfUvi/VF5yPNoGGzpIfSlUIdxs/IhkMA
+qvBBgHGZUzHTrPcxPv3HFA99MQ3sOXbLxV28ilzt/IHyNb2XuP6IHqmgdOIKIdJq
+0ln+WsToJLSJQy0wm56PJjcV5pnh+99wNQxnUO8N4PME+y1pkauBJ++i3y4t86Jn
+hJJd2ViSnJQ6B4xe9+iaV1qxGNq/b35T7P38hUI3r5FmmX3k8OFScmpExuSJKkwy
+G2PS5Q9V8jgYKCDHFqzdhRNMsfFOaeA4y6wlf8Vs8EvvFgwZuNWMZHLXrkLdsk/S
+pmVSMQZB584+2y/LrUATKo72Whx3yXxNxBXLL3/vqHef2luCDQMgxVHnTEnczppA
+2ABhgqXCz5/RwYiOL1ZIXrHpvL/j1UmCyZBA695hBNOLtSDwBmVeFaMZpfsQqu/h
+624mbu/ifSYyXDtrd4XFISqSIEd1eAzXSQNS90UWzxQJQ13Yv57PBPnCvbUxWiuI
+UhkHfgldYLvoswZ8B6Eenfw4b2EguFEksaYtrdiJ1H4F2EHP5i/ecXMFfBZ6f5+G
+SDzkODUUnniIW3j6XQKRERWp5t1bSYopSWLI259ntmGHTe6zzRjCf4D2POJxA6cy
+NDBXd1xxMZnjhDXO8y4vg8MIp4WhvNMvBAOS85mb2cFbL3eYZDokFe0XhTjEklai
+YdLSTGa0aU2x5u6FDGulvSwBSuHknHFfk9ABOZ0bVpMr7pYWQ0M/lB+OdU+msbkx
+liMVyrnsZjTfYhv/X8HQUKy087i7D6FNtcmNENkJKN7AAjnDaPiBizdMVWNSKrEa
+ox+V1uWpXba0HFtl57V1c3FvuXYtpQ7vSk3BrJMtSkkWalWmCxE6df7nJeygG4tj
+CskvgR75N6TOiNK6C8gKXZbirufICH47hJHzPbfDK+Wwl+tccXqL+5rcqGpqaHGw
+ED3Y5QkqLuk0wCBiyyuEX4E+l/Is64dRaiahjqp2M/SA4zuk1kIhEPRGyN9W6jx4
+T3yocMdXq7N87O+gA5XW+TPZlDxZeGIJK2V1qWpuvdbBFbT/PEdXVbFhErEVs2Vp
+KIxWGYxeajOruPdHBAbLtJaWiqqG84QCglbd240eG7fXse+onVHa9r0mhIgBdzOa
+Keheq5Wrjf6Zk9ljnzCEl79Bg92ZTWwOmOsXAWVL0eHS9VOkuSfjIVhEP0D69fxE
+dOeMB5ECy5vlnejkRnM0jtfaRuM+7ZNydKAL0z3gKjnBzYotNu8qcw/Pf/+c5qy3
+M1kZGeY/y+wdj+vHC9Tmi8dk21+ZEuZJ8Yb0kvv3lSo5UHdv8OxxQyVQdXc8M/Nx
+ZiMo8lryBhNbK6AIguukcTUo7HXXLg7+M78H7VKq/syZJvBVU9RT0NU7Z+amFgh+
+YXQPnu5IUCPAxTIEU0f17GXMLLkp2rRNMLiJVGZmyD+BTkWhc7z+z4jgtR16gqUA
+GBBzYI3ZlOekfNEKIemLYn3AaPAB79myaJxVsy/9KzNj2xv3r2ClAF0EWJLnhMrq
+dqHqhxkqjTeDAfqJwNrxWJ7Wvp5I9uJ+a2wIyrY5gluhEcdiaw3ehB9/ykLAMvtQ
+lpntxcSG4bJTbVuDW/JNRQ==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/reqs/localhost.req b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/reqs/localhost.req
new file mode 100644
index 0000000000..e13ce06215
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/reqs/localhost.req
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICWTCCAUECAQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAuNXiZtOq6Pcv2Ha2xmdcCXffCxtZyvmp/sxQkZGk
+KpZVVIypFyUjjZN2BVyehmiCIkJS9n1yX4VcfGHSsqOiW0AFb+u+Y3WGKeeX5Ncg
+HrTEeXb3zx1wurAQ706c3BVP7rmnuT/xl913Cw47C8K9s4cHpJUseGt8rHrkAsGg
+PvXvOlH0s0pIWNAWEI1kuqAWiPBiVf42e51Fn/ht6SocNVdnji9VLyeH3c7fpPOb
+tYB7SvYodFItz9muNH9sHYny/ACqHPqgMCIUGXZlnDFgOV0NChWAsiZEaXOiDRHA
+tSFvUs1KL4cjSCj8jNuDg1Z6pWNhTGy7O4Cfuq1mY7BjVwIDAQABoAAwDQYJKoZI
+hvcNAQELBQADggEBAJ6ELpvR6jUrCnMqg+/CDeiWXVoB72tC9EQQxprQhRHxxcE+
+MzThuE9/bdC6UwJur+272Ih72/bPRCPdRO3H8338M7RQHW8CVA3lVrLNxjxehx4U
+rmiSuZqo+BsRYkz3IYjndRe+1I5Dhbi5qrNcognuBg6yGnNAqsFQRTkoeR20smxt
+h1WNsAT+p9a0gRo6MCtJRvzsZX3B4N1C+n18hfHOHiiG3gMHHWR61O4BKYbgImhb
+B3e6mQox4a3a5tHNgJrO0Q1LMrfAml2VMv/Gmx46f6M7GWDKRifXiP0hyY8OVvrQ
+uoTvWF2Fhas7TTRNeAE+m2Bpac8i8Umuf6OeOcs=
+-----END CERTIFICATE REQUEST-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/reqs/test.req b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/reqs/test.req
new file mode 100644
index 0000000000..93d6d6bed8
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/reqs/test.req
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICVDCCATwCAQAwDzENMAsGA1UEAwwEdGVzdDCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAM26OlebD5vdWsOMrPAkLiCOOzNthrLLgQCDSk8WQM2z5R3F
+f5jnS6D1b/NbG6JrFk1cW/5Gw1iODhP57GloN/Z94H6LlQ9xuomxXQ7KfJueB1fC
+S+NClu9eQ+r+EfI4OrQM4+JMKOIHu5pWY5iIkRX1J02l0YgMSUgkj3GNfQ5IG9mV
+pHvyt/ZolQwULxmNrMXNlaxCk6tuYDNAkPaATqhL8A/U1sBd8o/dwEEreJYSYDfn
+xcy6ejbeCvDlyZBRPWam0bnStNOty3L5RkUzZUrj6ZXuIzeSsGuolQIGBGt+RKlO
+PP2TWzJMw0AknlIU0ayqxYhLiHVRHJYmwtd1xnsCAwEAAaAAMA0GCSqGSIb3DQEB
+CwUAA4IBAQAzh0IYj8G2kv5a4I5gHONFN7X3tsYV+hTsr+Oi8/4RzYGzHKjN+VyR
+73YaIAY2pQACuz6QBsx1Gd4EhGnobCAwHqRoad5fsa6LQorToEkF1ZNH7262zZzZ
+mrG9Ke2MTIWbW1GQbnBj1/UAl1FAzF82zYrgCvNaM/B9HnALPqLTnP3I4Am+WGkm
+/3yEfxI9RO56Rub5VeX/rW/6YORjrv0s7SgFB2ec+zG0zKSmQwx9H2QGL1GJhgMz
+c+oCf+hEHMBVa2leQoDJHTUvLlT+gHf+RqB/FWGmeDWpXwj3wY+EUiS3HCLPwcPj
+xQxQJZACPqFDaxSKyFH9JdfOojYqhmK+
+-----END CERTIFICATE REQUEST-----
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/safessl-easyrsa.cnf b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/safessl-easyrsa.cnf
new file mode 100644
index 0000000000..d42a92f42e
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/safessl-easyrsa.cnf
@@ -0,0 +1,138 @@
+# For use with Easy-RSA 3.0+ and OpenSSL or LibreSSL
+
+####################################################################
+[ ca ]
+default_ca	= CA_default		# The default ca section
+
+####################################################################
+[ CA_default ]
+
+dir		= /etc/openvpn/pki	# Where everything is kept
+certs		= /etc/openvpn/pki			# Where the issued certs are kept
+crl_dir		= /etc/openvpn/pki			# Where the issued crl are kept
+database	= /etc/openvpn/pki/index.txt	# database index file.
+new_certs_dir	= /etc/openvpn/pki/certs_by_serial	# default place for new certs.
+
+certificate	= /etc/openvpn/pki/ca.crt	 	# The CA certificate
+serial		= /etc/openvpn/pki/serial 		# The current serial number
+crl		= /etc/openvpn/pki/crl.pem 		# The current CRL
+private_key	= /etc/openvpn/pki/private/ca.key	# The private key
+RANDFILE	= /etc/openvpn/pki/.rand		# private random number file
+
+x509_extensions	= basic_exts		# The extensions to add to the cert
+
+# This allows a V2 CRL. Ancient browsers don't like it, but anything Easy-RSA
+# is designed for will. In return, we get the Issuer attached to CRLs.
+crl_extensions	= crl_ext
+
+default_days	= 825	# how long to certify for
+default_crl_days= 3650	# how long before next CRL
+default_md	= sha256		# use public key default MD
+preserve	= no			# keep passed DN ordering
+
+# This allows to renew certificates which have not been revoked
+unique_subject	= no
+
+# A few different ways of specifying how similar the request should look
+# For type CA, the listed attributes must be the same, and the optional
+# and supplied fields are just that :-)
+policy		= policy_anything
+
+# For the 'anything' policy, which defines allowed DN fields
+[ policy_anything ]
+countryName		= optional
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+name			= optional
+emailAddress		= optional
+
+####################################################################
+# Easy-RSA request handling
+# We key off $DN_MODE to determine how to format the DN
+[ req ]
+default_bits		= 2048
+default_keyfile 	= privkey.pem
+default_md		= sha256
+distinguished_name	= cn_only
+x509_extensions		= easyrsa_ca	# The extensions to add to the self signed cert
+
+# A placeholder to handle the $EXTRA_EXTS feature:
+#%EXTRA_EXTS%	# Do NOT remove or change this line as $EXTRA_EXTS support requires it
+
+####################################################################
+# Easy-RSA DN (Subject) handling
+
+# Easy-RSA DN for cn_only support:
+[ cn_only ]
+commonName		= Common Name (eg: your user, host, or server name)
+commonName_max		= 64
+commonName_default	= ChangeMe
+
+# Easy-RSA DN for org support:
+[ org ]
+countryName			= Country Name (2 letter code)
+countryName_default		= US
+countryName_min			= 2
+countryName_max			= 2
+
+stateOrProvinceName		= State or Province Name (full name)
+stateOrProvinceName_default	= California
+
+localityName			= Locality Name (eg, city)
+localityName_default		= San Francisco
+
+0.organizationName		= Organization Name (eg, company)
+0.organizationName_default	= Copyleft Certificate Co
+
+organizationalUnitName		= Organizational Unit Name (eg, section)
+organizationalUnitName_default	= My Organizational Unit
+
+commonName			= Common Name (eg: your user, host, or server name)
+commonName_max			= 64
+commonName_default		= ChangeMe
+
+emailAddress			= Email Address
+emailAddress_default		= me@example.net
+emailAddress_max		= 64
+
+####################################################################
+# Easy-RSA cert extension handling
+
+# This section is effectively unused as the main script sets extensions
+# dynamically. This core section is left to support the odd usecase where
+# a user calls openssl directly.
+[ basic_exts ]
+basicConstraints	= CA:FALSE
+subjectKeyIdentifier	= hash
+authorityKeyIdentifier	= keyid,issuer:always
+
+# The Easy-RSA CA extensions
+[ easyrsa_ca ]
+
+# PKIX recommendations:
+
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer:always
+
+# This could be marked critical, but it's nice to support reading by any
+# broken clients who attempt to do so.
+basicConstraints = CA:true
+
+# Limit key usage to CA tasks. If you really want to use the generated pair as
+# a self-signed cert, comment this out.
+keyUsage = cRLSign, keyCertSign
+
+# nsCertType omitted by default. Let's try to let the deprecated stuff die.
+# nsCertType = sslCA
+
+# CRL extensions.
+[ crl_ext ]
+
+# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
+
+# issuerAltName=issuer:copy
+authorityKeyIdentifier=keyid:always,issuer:always
+
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/serial b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/serial
new file mode 100644
index 0000000000..ae8764b339
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/serial
@@ -0,0 +1 @@
+8055804ACAE0109030FB7947F31147AA
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/serial.old b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/serial.old
new file mode 100644
index 0000000000..32e19cae7a
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/serial.old
@@ -0,0 +1 @@
+8055804acae0109030fb7947f31147a9
diff --git a/tests/e2e/rte/openvpn/openvpn-data/conf/pki/ta.key b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/ta.key
new file mode 100644
index 0000000000..c0d007b4fe
--- /dev/null
+++ b/tests/e2e/rte/openvpn/openvpn-data/conf/pki/ta.key
@@ -0,0 +1,21 @@
+#
+# 2048 bit OpenVPN static key
+#
+-----BEGIN OpenVPN Static key V1-----
+456226c4d5a6895c48dad7fd5d36ee57
+3eb280683fbbfe1699d63e9fd4e5ec5b
+70500489c3ec36e0c30d6b18f9c48b6b
+aede839a99d492fd26beb51317c08eb2
+ebb320a0b980da0b13a88e37559594f5
+03b21fa6d72548f7be5fdb41ad1de315
+82373a95c5c503c1101236f43a59ec68
+ddc9a83d4b4a4437f2db9e16bcbd433a
+5211d060bc8376f1efe99bbf2413e543
+4e4473d5028c95f33ad5df3637505c31
+bb7661b03e7d882c3ec1c5ca5f9c2277
+09e2e4323392efb0dff0abadbe6d6887
+27bddf4a2f7f795fe7c227813f76cac2
+9e919074c638ad36e5001a187d113c4b
+3faab93dde06734c15a198ad686a315a
+3e1f91612528d4f6c4281916625e54b1
+-----END OpenVPN Static key V1-----
diff --git a/tests/e2e/rte/openvpn/test.ovpn b/tests/e2e/rte/openvpn/test.ovpn
new file mode 100644
index 0000000000..a6124a8815
--- /dev/null
+++ b/tests/e2e/rte/openvpn/test.ovpn
@@ -0,0 +1,109 @@
+
+client
+nobind
+dev tun
+remote-cert-tls server
+
+remote 127.0.0.1 1194 udp
+
+<key>
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIppK+RhgYEmsCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECG/rQJN9VfmpBIIEyMxNUosBZiWi
+7ziO5LeP7tTeeNtTElo/BG7UgDfExEVyhfUvi/VF5yPNoGGzpIfSlUIdxs/IhkMA
+qvBBgHGZUzHTrPcxPv3HFA99MQ3sOXbLxV28ilzt/IHyNb2XuP6IHqmgdOIKIdJq
+0ln+WsToJLSJQy0wm56PJjcV5pnh+99wNQxnUO8N4PME+y1pkauBJ++i3y4t86Jn
+hJJd2ViSnJQ6B4xe9+iaV1qxGNq/b35T7P38hUI3r5FmmX3k8OFScmpExuSJKkwy
+G2PS5Q9V8jgYKCDHFqzdhRNMsfFOaeA4y6wlf8Vs8EvvFgwZuNWMZHLXrkLdsk/S
+pmVSMQZB584+2y/LrUATKo72Whx3yXxNxBXLL3/vqHef2luCDQMgxVHnTEnczppA
+2ABhgqXCz5/RwYiOL1ZIXrHpvL/j1UmCyZBA695hBNOLtSDwBmVeFaMZpfsQqu/h
+624mbu/ifSYyXDtrd4XFISqSIEd1eAzXSQNS90UWzxQJQ13Yv57PBPnCvbUxWiuI
+UhkHfgldYLvoswZ8B6Eenfw4b2EguFEksaYtrdiJ1H4F2EHP5i/ecXMFfBZ6f5+G
+SDzkODUUnniIW3j6XQKRERWp5t1bSYopSWLI259ntmGHTe6zzRjCf4D2POJxA6cy
+NDBXd1xxMZnjhDXO8y4vg8MIp4WhvNMvBAOS85mb2cFbL3eYZDokFe0XhTjEklai
+YdLSTGa0aU2x5u6FDGulvSwBSuHknHFfk9ABOZ0bVpMr7pYWQ0M/lB+OdU+msbkx
+liMVyrnsZjTfYhv/X8HQUKy087i7D6FNtcmNENkJKN7AAjnDaPiBizdMVWNSKrEa
+ox+V1uWpXba0HFtl57V1c3FvuXYtpQ7vSk3BrJMtSkkWalWmCxE6df7nJeygG4tj
+CskvgR75N6TOiNK6C8gKXZbirufICH47hJHzPbfDK+Wwl+tccXqL+5rcqGpqaHGw
+ED3Y5QkqLuk0wCBiyyuEX4E+l/Is64dRaiahjqp2M/SA4zuk1kIhEPRGyN9W6jx4
+T3yocMdXq7N87O+gA5XW+TPZlDxZeGIJK2V1qWpuvdbBFbT/PEdXVbFhErEVs2Vp
+KIxWGYxeajOruPdHBAbLtJaWiqqG84QCglbd240eG7fXse+onVHa9r0mhIgBdzOa
+Keheq5Wrjf6Zk9ljnzCEl79Bg92ZTWwOmOsXAWVL0eHS9VOkuSfjIVhEP0D69fxE
+dOeMB5ECy5vlnejkRnM0jtfaRuM+7ZNydKAL0z3gKjnBzYotNu8qcw/Pf/+c5qy3
+M1kZGeY/y+wdj+vHC9Tmi8dk21+ZEuZJ8Yb0kvv3lSo5UHdv8OxxQyVQdXc8M/Nx
+ZiMo8lryBhNbK6AIguukcTUo7HXXLg7+M78H7VKq/syZJvBVU9RT0NU7Z+amFgh+
+YXQPnu5IUCPAxTIEU0f17GXMLLkp2rRNMLiJVGZmyD+BTkWhc7z+z4jgtR16gqUA
+GBBzYI3ZlOekfNEKIemLYn3AaPAB79myaJxVsy/9KzNj2xv3r2ClAF0EWJLnhMrq
+dqHqhxkqjTeDAfqJwNrxWJ7Wvp5I9uJ+a2wIyrY5gluhEcdiaw3ehB9/ykLAMvtQ
+lpntxcSG4bJTbVuDW/JNRQ==
+-----END ENCRYPTED PRIVATE KEY-----
+</key>
+<cert>
+-----BEGIN CERTIFICATE-----
+MIIDRTCCAi2gAwIBAgIRAIBVgErK4BCQMPt5R/MRR6kwDQYJKoZIhvcNAQELBQAw
+DzENMAsGA1UEAwwEdGVzdDAeFw0yMTExMDgwNzUxNTZaFw0yNDAyMTEwNzUxNTZa
+MA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDNujpXmw+b3VrDjKzwJC4gjjszbYayy4EAg0pPFkDNs+UdxX+Y50ug9W/zWxui
+axZNXFv+RsNYjg4T+expaDf2feB+i5UPcbqJsV0OynybngdXwkvjQpbvXkPq/hHy
+ODq0DOPiTCjiB7uaVmOYiJEV9SdNpdGIDElIJI9xjX0OSBvZlaR78rf2aJUMFC8Z
+jazFzZWsQpOrbmAzQJD2gE6oS/AP1NbAXfKP3cBBK3iWEmA358XMuno23grw5cmQ
+UT1mptG50rTTrcty+UZFM2VK4+mV7iM3krBrqJUCBgRrfkSpTjz9k1syTMNAJJ5S
+FNGsqsWIS4h1URyWJsLXdcZ7AgMBAAGjgZswgZgwCQYDVR0TBAIwADAdBgNVHQ4E
+FgQUjp4ln09TbR3WLAgDLGbDb5AWU5YwSgYDVR0jBEMwQYAUPwGq0LHvvgK4J9XB
+8b16BvFvj3OhE6QRMA8xDTALBgNVBAMMBHRlc3SCFHKh49rkvHCvUmEIiZqCEf+3
+1ND6MBMGA1UdJQQMMAoGCCsGAQUFBwMCMAsGA1UdDwQEAwIHgDANBgkqhkiG9w0B
+AQsFAAOCAQEAAGfSk+Zpy/32n9/2WSAq9g8DurPaZd5iIzaijU8nIg49AYDZWc3F
+8Bqbxej0b+LHKfw3IS9vnbiM9m43ybFKDZ3lzQpLAQqYj0bpJJec73XdpPczfd8J
+80y2PDinLiYdaPmHmq5sYNneMvFpZpfLIIENtQF0tXOMhStac+rN5SUTRDokCgpy
+TULMC1rJlgUgN/sblRiNZv8Q+DrYA2xsN27eUVkIftEzEQh07fw/TRkAgoiflWam
+6fFzVeF6P66m4bdR35IoGUIdpaftueQA6qdV41USRV/54aUfE/HuGjHlrp0u793Y
+VrJ89roIQdsTFjEOXUGybZgB5EOi0TSekQ==
+-----END CERTIFICATE-----
+</cert>
+<ca>
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAh6gAwIBAgIUcqHj2uS8cK9SYQiJmoIR/7fU0PowDQYJKoZIhvcNAQEL
+BQAwDzENMAsGA1UEAwwEdGVzdDAeFw0yMTExMDgwNzQ5MTBaFw0zMTExMDYwNzQ5
+MTBaMA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCibt8kh9lqTC0O631rPHN0kMQ4kMQ/eZ59mKhAJZ3rBchIBrQne2yTw2z+
+X1ESa3VTkW2jyJ5r7iuo+Xyc8246tfBwO3u0DJ2DeZZOYPzMg48nJNxs3ur3iXAT
+r6Aiwp0gtMNC2XcW7y5OPl8l+BhSt2PsWcdEdmLJgvRPJ2x+Ea8wivuw6FO6byK7
+Mxw7/CbNMw8Eey9eSz9kWDrgetS0kOgfqtt1ZnKDZkbLy8jFl0xW488VUrefUR1g
+lOje8QySjDvzT8sUR0lASyS+/J6j/3gLlSS42e4SxMz00jEus+ye56cO16Pc+vKI
+Xsev8cRPiSDTZTvc7Eaq/OcKVl11AgMBAAGjgYkwgYYwHQYDVR0OBBYEFD8BqtCx
+774CuCfVwfG9egbxb49zMEoGA1UdIwRDMEGAFD8BqtCx774CuCfVwfG9egbxb49z
+oROkETAPMQ0wCwYDVQQDDAR0ZXN0ghRyoePa5Lxwr1JhCImaghH/t9TQ+jAMBgNV
+HRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAXUrDhVAX
+TkbhKRBuhUGQb03RyACQKBFM/SwhrmwpQMXo7BUuqWJ27U5/TRHrfKJxDgppmwIs
+qmtrT07tA7e/OyFSZtZ9p/4H+5xM9FCsmu6YMQ3ZloHHGWmibrDNK70frVgRAEAS
+FyAsEgpKZCr6OJNd7v2dbvO4AniZVVvccU17cJAx177YC3fNIuRtpHkm93D3qI+1
+4SED7rktVfXUKs6RMFmqIum5WRzgiJBAtk2GVQMrAAu/xmUPS/aqzstNte4KQ+UY
+2qI9v1wYM8j+BT5nsBT02K+zOsYdkG39n7QEfcecPAjOkKsaFbSf/WZcsb6oCVgl
+d/Nz24kfh76SqQ==
+-----END CERTIFICATE-----
+</ca>
+key-direction 1
+<tls-auth>
+#
+# 2048 bit OpenVPN static key
+#
+-----BEGIN OpenVPN Static key V1-----
+456226c4d5a6895c48dad7fd5d36ee57
+3eb280683fbbfe1699d63e9fd4e5ec5b
+70500489c3ec36e0c30d6b18f9c48b6b
+aede839a99d492fd26beb51317c08eb2
+ebb320a0b980da0b13a88e37559594f5
+03b21fa6d72548f7be5fdb41ad1de315
+82373a95c5c503c1101236f43a59ec68
+ddc9a83d4b4a4437f2db9e16bcbd433a
+5211d060bc8376f1efe99bbf2413e543
+4e4473d5028c95f33ad5df3637505c31
+bb7661b03e7d882c3ec1c5ca5f9c2277
+09e2e4323392efb0dff0abadbe6d6887
+27bddf4a2f7f795fe7c227813f76cac2
+9e919074c638ad36e5001a187d113c4b
+3faab93dde06734c15a198ad686a315a
+3e1f91612528d4f6c4281916625e54b1
+-----END OpenVPN Static key V1-----
+</tls-auth>
+
diff --git a/tests/e2e/rte/oss-cluster-7-rs/Dockerfile b/tests/e2e/rte/oss-cluster-7-rs/Dockerfile
index 956d5394ad..b3f1a97011 100644
--- a/tests/e2e/rte/oss-cluster-7-rs/Dockerfile
+++ b/tests/e2e/rte/oss-cluster-7-rs/Dockerfile
@@ -1,11 +1,19 @@
 FROM redislabs/rejson:1.0.8 as rejson
 
-FROM redislabs/redisearch:2.6.5 as redisearch
-
 FROM redis:7.0.8
 
 COPY redis.conf /etc/redis/
 COPY --from=rejson /usr/lib/redis/modules/rejson.so /etc/redis/modules/
-COPY --from=redisearch /usr/lib/redis/modules/redisearch.so /etc/redis/modules/
+
+CMD ls -la
+RUN ls -la /etc/redis/modules
+
+ADD https://s3.amazonaws.com/redisinsight.test/public/rte/modules/redisearch-coord/redisearch-coord.so.tar.gz .
+
+RUN ls -la
+RUN ls -la /etc/redis/modules
+RUN tar -xvzf redisearch-coord.so.tar.gz && rm redisearch-coord.so.tar.gz && cp redisearch-coord.so /etc/redis/modules
+RUN ls -la
+RUN ls -la /etc/redis/modules
 
 CMD [ "redis-server", "/etc/redis/redis.conf" ]
diff --git a/tests/e2e/rte/oss-cluster-7-rs/redis.conf b/tests/e2e/rte/oss-cluster-7-rs/redis.conf
index 3733dcdd32..1c7ab660d5 100644
--- a/tests/e2e/rte/oss-cluster-7-rs/redis.conf
+++ b/tests/e2e/rte/oss-cluster-7-rs/redis.conf
@@ -41,7 +41,7 @@
 # it will abort. It is possible to use multiple loadmodule directives.
 #
 loadmodule /etc/redis/modules/rejson.so
-loadmodule /etc/redis/modules/redisearch.so
+loadmodule /etc/redis/modules/redisearch-coord.so
 # loadmodule /path/to/other_module.so
 
 ################################## NETWORK #####################################
diff --git a/tests/e2e/tests/critical-path/browser/context.e2e.ts b/tests/e2e/tests/critical-path/browser/context.e2e.ts
index b18a28b95c..83d138a0bd 100644
--- a/tests/e2e/tests/critical-path/browser/context.e2e.ts
+++ b/tests/e2e/tests/critical-path/browser/context.e2e.ts
@@ -42,7 +42,7 @@ test('Verify that user can see saved CLI size on Browser page when he returns ba
     await t.drag(cliResizeButton, 0, -offsetY, { speed: 0.01 });
     await t.click(myRedisDatabasePage.myRedisDBButton);
     await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
-    await t.expect(await cliPage.cliArea.clientHeight > cliAreaHeightEnd).ok('Saved context for resizable cli is incorrect');
+    await t.expect(await cliPage.cliArea.clientHeight).gt(cliAreaHeightEnd, 'Saved context for resizable cli is incorrect');
 });
 test('Verify that user can see saved Key details and Keys tables size on Browser page when he returns back to Browser page', async t => {
     const offsetX = 200;
diff --git a/tests/e2e/tests/critical-path/cli/cli-critical.e2e.ts b/tests/e2e/tests/critical-path/cli/cli-critical.e2e.ts
index fa5651197f..cf7e2c3a3f 100644
--- a/tests/e2e/tests/critical-path/cli/cli-critical.e2e.ts
+++ b/tests/e2e/tests/critical-path/cli/cli-critical.e2e.ts
@@ -94,7 +94,7 @@ test
         const commandHints = [
             'index [data_type] [prefix] [filter] [default_lang] [lang_attribute] [default_score] [score_attribute] [payload_attribute] [maxtextfields] [seconds] [nooffsets] [nohl] [nofields] [nofreqs] [stopwords] [skipinitialscan] schema field [field ...]',
             'index [delete docs]',
-            'key [indent] [newline] [space] [paths [paths ...]]',
+            'key [indent] [newline] [space] [path [path ...]]',
             'key [path]'
         ];
         const commands = [
diff --git a/tests/e2e/vpn.docker-compose.yml b/tests/e2e/vpn.docker-compose.yml
new file mode 100644
index 0000000000..c93203db54
--- /dev/null
+++ b/tests/e2e/vpn.docker-compose.yml
@@ -0,0 +1,11 @@
+version: "3.4"
+
+services:
+  # openvpn server to reach private network from the host
+  openvpn:
+    extends:
+      file: ./rte/openvpn/docker-compose.yml
+      service: openvpn
+    networks:
+      default:
+        ipv4_address: 172.31.100.247