diff --git a/__tests__/cardActionMiddleware.js b/__tests__/cardActionMiddleware.js
index 1b13ab33b6..253359c2e6 100644
--- a/__tests__/cardActionMiddleware.js
+++ b/__tests__/cardActionMiddleware.js
@@ -1,4 +1,4 @@
-import { By } from 'selenium-webdriver';
+import { By, logging } from 'selenium-webdriver';
 
 import { imageSnapshotOptions, timeouts } from './constants.json';
 
@@ -98,7 +98,7 @@ test('card action "signin" when directLine.getSessionId is falsy', async () => {
     props: {
       cardActionMiddleware: ({ dispatch }) => next => ({ cardAction, getSignInUrl }) => {
         if (cardAction.type === 'signin') {
-          getSignInUrl().then(url => {
+          Promise.resolve(getSignInUrl()).then(url => {
             dispatch({
               type: 'WEB_CHAT/SEND_MESSAGE',
               payload: {
@@ -138,6 +138,6 @@ test('card action "signin" when directLine.getSessionId is falsy', async () => {
   expect(base64PNG).toMatchImageSnapshot(imageSnapshotOptions);
   expect(await pageObjects.getConsoleErrors()).toEqual([]);
   expect(await pageObjects.getConsoleWarnings()).toEqual([
-    'botframework-webchat: No-magic-code OAuth flow is not supported on this Direct Line adapter.'
+    'botframework-webchat: OAuth is not supported on this Direct Line adapter.'
   ]);
 });
diff --git a/__tests__/html/middleware.liveRegionAttachment.warning.returnRenderFunctionReturnFalse.html b/__tests__/html/middleware.liveRegionAttachment.warning.returnRenderFunctionReturnFalse.html
index 5c2a1dae36..d6e12b266c 100644
--- a/__tests__/html/middleware.liveRegionAttachment.warning.returnRenderFunctionReturnFalse.html
+++ b/__tests__/html/middleware.liveRegionAttachment.warning.returnRenderFunctionReturnFalse.html
@@ -21,9 +21,7 @@
         const RenderAttachmentForScreenReader = () => {
           const createAttachmentForScreenReaderRenderer = useCreateAttachmentForScreenReaderRenderer();
 
-          createAttachmentForScreenReaderRenderer({ activity: {}, attachment: {} })();
-
-          return false;
+          return createAttachmentForScreenReaderRenderer({ activity: {}, attachment: {} })();
         };
 
         const attachmentForScreenReaderMiddleware = () => next => (...args) => {
diff --git a/packages/api/src/hooks/Composer.js b/packages/api/src/hooks/Composer.js
index 224369d419..40c6870834 100644
--- a/packages/api/src/hooks/Composer.js
+++ b/packages/api/src/hooks/Composer.js
@@ -149,6 +149,7 @@ const Composer = ({
   activityStatusMiddleware,
   activityStatusRenderer,
   attachmentMiddleware,
+  attachmentForScreenReaderMiddleware,
   attachmentRenderer,
   avatarMiddleware,
   avatarRenderer,
@@ -280,13 +281,18 @@ const Composer = ({
 
     return (
       activityRenderer ||
-      applyMiddlewareForRenderer('activity', ...singleToArray(activityMiddleware), () => () => ({ activity }) => {
-        if (activity) {
-          throw new Error(`No renderer for activity of type "${activity.type}"`);
-        } else {
-          throw new Error('No activity to render');
+      applyMiddlewareForRenderer(
+        'activity',
+        { strict: false },
+        ...singleToArray(activityMiddleware),
+        () => () => ({ activity }) => {
+          if (activity) {
+            throw new Error(`No renderer for activity of type "${activity.type}"`);
+          } else {
+            throw new Error('No activity to render');
+          }
         }
-      })({})
+      )({})
     );
   }, [activityMiddleware, activityRenderer]);
 
@@ -298,53 +304,31 @@ const Composer = ({
 
     return (
       activityStatusRenderer ||
-      applyMiddlewareForRenderer('activity status', ...singleToArray(activityStatusMiddleware), () => () => () =>
-        false
+      applyMiddlewareForRenderer(
+        'activity status',
+        { strict: false },
+        ...singleToArray(activityStatusMiddleware),
+        () => () => () => false
       )({})
     );
   }, [activityStatusMiddleware, activityStatusRenderer]);
 
-  // const patchedAttachmentRenderer = useMemo(() => {
-  //   if (attachmentRenderer) {
-  //     console.warn(
-  //       'Web Chat: "attachmentRenderer" is deprecated and will be removed on 2022-06-15, please use "attachmentMiddleware" instead.'
-  //     );
-
-  //     return attachmentRenderer;
-  //   }
-
-  //   const renderer = applyMiddlewareForRenderer(
-  //     'attachment',
-  //     ...singleToArray(attachmentMiddleware),
-  //     () => () => ({ attachment }) => () => {
-  //       if (attachment) {
-  //         throw new Error(`No renderer for attachment of type "${attachment.contentType}"`);
-  //       } else {
-  //         throw new Error('No attachment to render');
-  //       }
-  //     }
-  //   )({});
-
-  //   let showDeprecationNotes = true;
-
-  //   return (...args) => {
-  //     const result = renderer(...args);
-
-  //     if (isValidElement(result)) {
-  //       if (showDeprecationNotes) {
-  //         console.warn(
-  //           'botframework-webchat: Please upgrade the attachment middleware with a new signature. For details, please see HOOKS.md#usecreateattachmentrenderer.'
-  //         );
-
-  //         showDeprecationNotes = false;
-  //       }
-
-  //       return () => result;
-  //     }
-
-  //     return result;
-  //   };
-  // }, [attachmentMiddleware, attachmentRenderer]);
+  const patchedAttachmentForScreenReaderRenderer = useMemo(
+    () =>
+      applyMiddlewareForRenderer(
+        'attachment for screen reader',
+        { strict: true },
+        ...singleToArray(attachmentForScreenReaderMiddleware),
+        () => () => ({ attachment }) => () => {
+          if (attachment) {
+            throw new Error(`No renderer for attachment of type "${attachment.contentType}"`);
+          } else {
+            throw new Error('No attachment to render');
+          }
+        }
+      )({}),
+    [attachmentForScreenReaderMiddleware]
+  );
 
   const patchedAttachmentRenderer = useMemo(() => {
     if (attachmentRenderer) {
@@ -373,7 +357,9 @@ const Composer = ({
 
     return (
       avatarRenderer ||
-      applyMiddlewareForRenderer('avatar', ...singleToArray(avatarMiddleware), () => () => () => false)({})
+      applyMiddlewareForRenderer('avatar', { strict: false }, ...singleToArray(avatarMiddleware), () => () => () =>
+        false
+      )({})
     );
   }, [avatarMiddleware, avatarRenderer]);
 
@@ -385,13 +371,18 @@ const Composer = ({
 
     return (
       toastRenderer ||
-      applyMiddlewareForRenderer('toast', ...singleToArray(toastMiddleware), () => () => ({ notification }) => {
-        if (notification) {
-          throw new Error(`No renderer for notification of type "${notification.contentType}"`);
-        } else {
-          throw new Error('No notification to render');
+      applyMiddlewareForRenderer(
+        'toast',
+        { strict: false },
+        ...singleToArray(toastMiddleware),
+        () => () => ({ notification }) => {
+          if (notification) {
+            throw new Error(`No renderer for notification of type "${notification.contentType}"`);
+          } else {
+            throw new Error('No notification to render');
+          }
         }
-      })({})
+      )({})
     );
   }, [toastMiddleware, toastRenderer]);
 
@@ -403,8 +394,11 @@ const Composer = ({
 
     return (
       typingIndicatorRenderer ||
-      applyMiddlewareForRenderer('typing indicator', ...singleToArray(typingIndicatorMiddleware), () => () => () =>
-        false
+      applyMiddlewareForRenderer(
+        'typing indicator',
+        { strict: false },
+        ...singleToArray(typingIndicatorMiddleware),
+        () => () => () => false
       )({})
     );
   }, [typingIndicatorMiddleware, typingIndicatorRenderer]);
@@ -427,6 +421,7 @@ const Composer = ({
       ...hoistedDispatchers,
       activityRenderer: patchedActivityRenderer,
       activityStatusRenderer: patchedActivityStatusRenderer,
+      attachmentForScreenReaderRenderer: patchedAttachmentForScreenReaderRenderer,
       attachmentRenderer: patchedAttachmentRenderer,
       avatarRenderer: patchedAvatarRenderer,
       dir: patchedDir,
@@ -463,6 +458,7 @@ const Composer = ({
       onTelemetry,
       patchedActivityRenderer,
       patchedActivityStatusRenderer,
+      patchedAttachmentForScreenReaderRenderer,
       patchedAttachmentRenderer,
       patchedAvatarRenderer,
       patchedDir,
@@ -540,6 +536,7 @@ Composer.defaultProps = {
   activityRenderer: undefined,
   activityStatusMiddleware: undefined,
   activityStatusRenderer: undefined,
+  attachmentForScreenReaderMiddleware: undefined,
   attachmentMiddleware: undefined,
   attachmentRenderer: undefined,
   avatarMiddleware: undefined,
@@ -574,6 +571,7 @@ Composer.propTypes = {
   activityRenderer: PropTypes.func,
   activityStatusMiddleware: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.func), PropTypes.func]),
   activityStatusRenderer: PropTypes.func,
+  attachmentForScreenReaderMiddleware: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.func), PropTypes.func]),
   attachmentMiddleware: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.func), PropTypes.func]),
   attachmentRenderer: PropTypes.func,
   avatarMiddleware: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.func), PropTypes.func]),
diff --git a/packages/api/src/hooks/index.js b/packages/api/src/hooks/index.js
index b429ec2143..be92e44884 100644
--- a/packages/api/src/hooks/index.js
+++ b/packages/api/src/hooks/index.js
@@ -7,7 +7,6 @@ import useConnectivityStatus from './useConnectivityStatus';
 import useCreateActivityRenderer from './useCreateActivityRenderer';
 import useCreateActivityStatusRenderer from './useCreateActivityStatusRenderer';
 import useCreateAttachmentForScreenReaderRenderer from './useCreateAttachmentForScreenReaderRenderer';
-import useCreateAttachmentRenderer from './useCreateAttachmentRenderer';
 import useCreateAvatarRenderer from './useCreateAvatarRenderer';
 import useDateFormatter from './useDateFormatter';
 import useDebouncedNotifications from './useDebouncedNotifications';
@@ -71,7 +70,6 @@ export {
   useCreateActivityRenderer,
   useCreateActivityStatusRenderer,
   useCreateAttachmentForScreenReaderRenderer,
-  useCreateAttachmentRenderer,
   useCreateAvatarRenderer,
   useDateFormatter,
   useDebouncedNotifications,
diff --git a/packages/api/src/hooks/middleware/applyMiddleware.js b/packages/api/src/hooks/middleware/applyMiddleware.js
index 97d90a588e..5528cbb05c 100644
--- a/packages/api/src/hooks/middleware/applyMiddleware.js
+++ b/packages/api/src/hooks/middleware/applyMiddleware.js
@@ -11,10 +11,10 @@ export default function applyMiddleware(type, ...middleware) {
     });
 }
 
-export function forRenderer(type, ...middleware) {
+export function forRenderer(type, { strict = false } = {}, ...middleware) {
   return (...setupArgs) => {
     const runMiddleware = concatMiddleware(...middleware)(...setupArgs)(() => (
-      <ErrorBox error={new Error(`reached terminator of ${type}`)} message={`reached terminator of ${type}`} />
+      <ErrorBox error={new Error(`reached terminator of ${type}`)} type={type} />
     ));
 
     // The createRendererArgs is "what to render", for example, activity.
@@ -28,14 +28,30 @@ export function forRenderer(type, ...middleware) {
         if (!render) {
           return false;
         } else if (isValidElement(render)) {
+          if (strict) {
+            console.error(`botframework-webchat: ${type} should only return either false or a render function.`);
+
+            return false;
+          }
+
           return <UserlandBoundary type={`render of ${type}`}>{render}</UserlandBoundary>;
         } else {
           return (...renderTimeArgs) => (
-            <UserlandBoundary type={`render of ${type}`}>{() => render(...renderTimeArgs)}</UserlandBoundary>
+            <UserlandBoundary type={`render of ${type}`}>
+              {() => {
+                const element = render(...renderTimeArgs);
+
+                if (strict && !isValidElement(element)) {
+                  console.error(`botframework-webchat: ${type} should return React element only.`);
+                }
+
+                return element;
+              }}
+            </UserlandBoundary>
           );
         }
       } catch (err) {
-        return <ErrorBox error={err} message={`initialization of ${type}`} />;
+        return <ErrorBox error={err} type={type} />;
       }
     };
   };
diff --git a/packages/api/src/hooks/middleware/createActivityRenderer.js b/packages/api/src/hooks/middleware/createActivityRenderer.js
deleted file mode 100644
index a1a39c4a3b..0000000000
--- a/packages/api/src/hooks/middleware/createActivityRenderer.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import applyMiddleware from './applyMiddleware';
-
-const createActivityRenderer = (...middleware) =>
-  applyMiddleware('activity middleware', ...middleware);
-
-export default createActivityRenderer;
diff --git a/packages/api/src/hooks/middleware/createActivityStatusRenderer.js b/packages/api/src/hooks/middleware/createActivityStatusRenderer.js
deleted file mode 100644
index 9c5f4d82a2..0000000000
--- a/packages/api/src/hooks/middleware/createActivityStatusRenderer.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import applyMiddleware from './applyMiddleware';
-
-const createActivityStatusRenderer = (...middleware) =>
-  applyMiddleware('activity status middleware', ...middleware, () => () => () => false);
-
-export default createActivityStatusRenderer;
diff --git a/packages/api/src/hooks/middleware/createAttachmentRenderer.js b/packages/api/src/hooks/middleware/createAttachmentRenderer.js
deleted file mode 100644
index a284d25f02..0000000000
--- a/packages/api/src/hooks/middleware/createAttachmentRenderer.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import applyMiddleware from './applyMiddleware';
-
-const createAttachmentRenderer = (...middleware) =>
-  applyMiddleware('attachment middleware', ...middleware, () => () => ({ attachment }) => {
-    if (attachment) {
-      throw new Error(`No renderer for attachment of type "${attachment.contentType}"`);
-    } else {
-      throw new Error('No attachment to render');
-    }
-  });
-
-export default createAttachmentRenderer;
diff --git a/packages/api/src/hooks/middleware/createAvatarRenderer.js b/packages/api/src/hooks/middleware/createAvatarRenderer.js
deleted file mode 100644
index 6b33f9450f..0000000000
--- a/packages/api/src/hooks/middleware/createAvatarRenderer.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import applyMiddleware from './applyMiddleware';
-
-const createAvatarRenderer = (...middleware) =>
-  applyMiddleware('avatar middleware', ...middleware, () => () => () => false);
-
-export default createAvatarRenderer;
diff --git a/packages/api/src/hooks/middleware/createToastRenderer.js b/packages/api/src/hooks/middleware/createToastRenderer.js
deleted file mode 100644
index 89284c89aa..0000000000
--- a/packages/api/src/hooks/middleware/createToastRenderer.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import applyMiddleware from './applyMiddleware';
-
-const createToastRenderer = (...middleware) =>
-  applyMiddleware('toast middleware', ...middleware, () => () => ({ notification }) => {
-    if (notification) {
-      throw new Error(`No renderer for notification of type "${notification.contentType}"`);
-    } else {
-      throw new Error('No notification to render');
-    }
-  });
-
-export default createToastRenderer;
diff --git a/packages/api/src/hooks/middleware/createTypingIndicatorRenderer.js b/packages/api/src/hooks/middleware/createTypingIndicatorRenderer.js
deleted file mode 100644
index d403a05c21..0000000000
--- a/packages/api/src/hooks/middleware/createTypingIndicatorRenderer.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import applyMiddleware from './applyMiddleware';
-
-const createTypingIndicator = (...middleware) =>
-  applyMiddleware('typing indicator middleware', ...middleware, () => () => () => {
-    throw new Error(`No renderer for typing indicator`);
-  });
-
-export default createTypingIndicator;
diff --git a/packages/api/src/hooks/useCreateAttachmentForScreenReaderRenderer.js b/packages/api/src/hooks/useCreateAttachmentForScreenReaderRenderer.js
new file mode 100644
index 0000000000..2a0fe23642
--- /dev/null
+++ b/packages/api/src/hooks/useCreateAttachmentForScreenReaderRenderer.js
@@ -0,0 +1,5 @@
+import useWebChatAPIContext from './internal/useWebChatAPIContext';
+
+export default function useCreateAttachmentForScreenReaderRenderer() {
+  return useWebChatAPIContext().attachmentForScreenReaderRenderer;
+}
diff --git a/packages/bundle/src/adaptiveCards/Attachment/HeroCardAttachment.js b/packages/bundle/src/adaptiveCards/Attachment/HeroCardAttachment.js
index eb66864816..4ba7b71feb 100644
--- a/packages/bundle/src/adaptiveCards/Attachment/HeroCardAttachment.js
+++ b/packages/bundle/src/adaptiveCards/Attachment/HeroCardAttachment.js
@@ -16,7 +16,7 @@ HeroCardAttachment.propTypes = {
       buttons: PropTypes.any,
       images: PropTypes.arrayOf(
         PropTypes.shape({
-          alt: PropTypes.string.isRequired,
+          alt: PropTypes.string,
           tap: PropTypes.any,
           url: PropTypes.string.isRequired
         })
diff --git a/packages/bundle/src/adaptiveCards/Attachment/HeroCardContent.js b/packages/bundle/src/adaptiveCards/Attachment/HeroCardContent.js
index d940b0e0c5..8bd89d2f5d 100644
--- a/packages/bundle/src/adaptiveCards/Attachment/HeroCardContent.js
+++ b/packages/bundle/src/adaptiveCards/Attachment/HeroCardContent.js
@@ -44,7 +44,7 @@ HeroCardContent.propTypes = {
   content: PropTypes.shape({
     images: PropTypes.arrayOf(
       PropTypes.shape({
-        alt: PropTypes.string.isRequired,
+        alt: PropTypes.string,
         tap: PropTypes.any,
         url: PropTypes.string.isRequired
       })
diff --git a/packages/component/package-lock.json b/packages/component/package-lock.json
index df46196bc4..128f4d925d 100644
--- a/packages/component/package-lock.json
+++ b/packages/component/package-lock.json
@@ -33,7 +33,6 @@
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
 			"integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-			"dev": true,
 			"requires": {
 				"@babel/highlight": "^7.10.4"
 			}
@@ -255,6 +254,33 @@
 				}
 			}
 		},
+		"@babel/generator": {
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz",
+			"integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==",
+			"requires": {
+				"@babel/types": "^7.12.1",
+				"jsesc": "^2.5.1",
+				"source-map": "^0.5.0"
+			},
+			"dependencies": {
+				"@babel/types": {
+					"version": "7.12.1",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
+					"integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.10.4",
+						"lodash": "^4.17.19",
+						"to-fast-properties": "^2.0.0"
+					}
+				},
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+				}
+			}
+		},
 		"@babel/helper-annotate-as-pure": {
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
@@ -610,6 +636,48 @@
 				}
 			}
 		},
+		"@babel/helper-function-name": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+			"integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.10.4",
+				"@babel/template": "^7.10.4",
+				"@babel/types": "^7.10.4"
+			},
+			"dependencies": {
+				"@babel/types": {
+					"version": "7.12.1",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
+					"integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.10.4",
+						"lodash": "^4.17.19",
+						"to-fast-properties": "^2.0.0"
+					}
+				}
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+			"integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+			"requires": {
+				"@babel/types": "^7.10.4"
+			},
+			"dependencies": {
+				"@babel/types": {
+					"version": "7.12.1",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
+					"integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.10.4",
+						"lodash": "^4.17.19",
+						"to-fast-properties": "^2.0.0"
+					}
+				}
+			}
+		},
 		"@babel/helper-hoist-variables": {
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
@@ -1013,6 +1081,26 @@
 				}
 			}
 		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.11.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+			"integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+			"requires": {
+				"@babel/types": "^7.11.0"
+			},
+			"dependencies": {
+				"@babel/types": {
+					"version": "7.12.1",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
+					"integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.10.4",
+						"lodash": "^4.17.19",
+						"to-fast-properties": "^2.0.0"
+					}
+				}
+			}
+		},
 		"@babel/helper-validator-identifier": {
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
@@ -1252,13 +1340,17 @@
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
 			"integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-			"dev": true,
 			"requires": {
 				"@babel/helper-validator-identifier": "^7.10.4",
 				"chalk": "^2.0.0",
 				"js-tokens": "^4.0.0"
 			}
 		},
+		"@babel/parser": {
+			"version": "7.12.3",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz",
+			"integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw=="
+		},
 		"@babel/plugin-proposal-async-generator-functions": {
 			"version": "7.10.5",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
@@ -2558,6 +2650,56 @@
 				}
 			}
 		},
+		"@babel/template": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+			"integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+			"requires": {
+				"@babel/code-frame": "^7.10.4",
+				"@babel/parser": "^7.10.4",
+				"@babel/types": "^7.10.4"
+			},
+			"dependencies": {
+				"@babel/types": {
+					"version": "7.12.1",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
+					"integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.10.4",
+						"lodash": "^4.17.19",
+						"to-fast-properties": "^2.0.0"
+					}
+				}
+			}
+		},
+		"@babel/traverse": {
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz",
+			"integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==",
+			"requires": {
+				"@babel/code-frame": "^7.10.4",
+				"@babel/generator": "^7.12.1",
+				"@babel/helper-function-name": "^7.10.4",
+				"@babel/helper-split-export-declaration": "^7.11.0",
+				"@babel/parser": "^7.12.1",
+				"@babel/types": "^7.12.1",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0",
+				"lodash": "^4.17.19"
+			},
+			"dependencies": {
+				"@babel/types": {
+					"version": "7.12.1",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
+					"integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.10.4",
+						"lodash": "^4.17.19",
+						"to-fast-properties": "^2.0.0"
+					}
+				}
+			}
+		},
 		"@babel/types": {
 			"version": "7.8.7",
 			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz",
@@ -2701,9 +2843,9 @@
 			"dev": true
 		},
 		"@types/json-schema": {
-			"version": "7.0.5",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
-			"integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="
+			"version": "7.0.6",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+			"integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="
 		},
 		"@types/node": {
 			"version": "14.6.0",
@@ -2916,12 +3058,6 @@
 			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
 			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
 		},
-		"abbrev": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-			"dev": true
-		},
 		"acorn": {
 			"version": "7.4.0",
 			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
@@ -2934,12 +3070,6 @@
 			"integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
 			"dev": true
 		},
-		"adm-zip": {
-			"version": "0.4.11",
-			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz",
-			"integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==",
-			"dev": true
-		},
 		"ajv": {
 			"version": "6.12.3",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
@@ -3061,23 +3191,15 @@
 			"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
 			"integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
 		},
-		"asn1": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-			"dev": true,
-			"requires": {
-				"safer-buffer": "~2.1.0"
-			}
-		},
 		"asn1.js": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-			"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+			"version": "5.4.1",
+			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+			"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
 			"requires": {
 				"bn.js": "^4.0.0",
 				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0"
+				"minimalistic-assert": "^1.0.0",
+				"safer-buffer": "^2.1.0"
 			},
 			"dependencies": {
 				"bn.js": {
@@ -3111,12 +3233,6 @@
 				}
 			}
 		},
-		"assert-plus": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"dev": true
-		},
 		"assign-symbols": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -3134,29 +3250,11 @@
 			"integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
 			"optional": true
 		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true
-		},
 		"atob": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
 			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
 		},
-		"aws-sign2": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-			"dev": true
-		},
-		"aws4": {
-			"version": "1.10.1",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
-			"integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==",
-			"dev": true
-		},
 		"babel-loader": {
 			"version": "8.1.0",
 			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
@@ -3268,15 +3366,6 @@
 			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
 			"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
 		},
-		"bcrypt-pbkdf": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-			"dev": true,
-			"requires": {
-				"tweetnacl": "^0.14.3"
-			}
-		},
 		"big.js": {
 			"version": "5.2.2",
 			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -3303,9 +3392,9 @@
 			"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
 		},
 		"bn.js": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
-			"integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA=="
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+			"integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ=="
 		},
 		"bowser": {
 			"version": "1.9.4",
@@ -3529,12 +3618,6 @@
 			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001118.tgz",
 			"integrity": "sha512-RNKPLojZo74a0cP7jFMidQI7nvLER40HgNfgKQEJ2PFm225L0ectUungNQoK3Xk3StQcFbpBPNEvoWD59436Hg=="
 		},
-		"caseless": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-			"dev": true
-		},
 		"ccount": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.4.tgz",
@@ -3638,74 +3721,6 @@
 			"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
 			"integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
 		},
-		"cldr-data": {
-			"version": "36.0.0",
-			"resolved": "https://registry.npmjs.org/cldr-data/-/cldr-data-36.0.0.tgz",
-			"integrity": "sha512-F3n+9DUs41vhys8eF/hsCgkmYlgXMCiwaE75uGZjUbS/jkszBnLylXj7xW3bBlMU1d2IuAptpoNAb6lTCu/RSg==",
-			"dev": true,
-			"requires": {
-				"cldr-data-downloader": "0.3.x",
-				"glob": "5.x.x"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "5.0.15",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-					"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-					"dev": true,
-					"requires": {
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "2 || 3",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				}
-			}
-		},
-		"cldr-data-downloader": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/cldr-data-downloader/-/cldr-data-downloader-0.3.5.tgz",
-			"integrity": "sha512-uyIMa1K98DAp/PE7dYpq2COIrkWn681Atjng1GgEzeJzYb1jANtugtp9wre6+voE+qzVC8jtWv6E/xZ1GTJdlw==",
-			"dev": true,
-			"requires": {
-				"adm-zip": "0.4.11",
-				"mkdirp": "0.5.0",
-				"nopt": "3.0.x",
-				"progress": "1.1.8",
-				"q": "1.0.1",
-				"request": "~2.87.0",
-				"request-progress": "0.3.1"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-					"integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"progress": {
-					"version": "1.1.8",
-					"resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-					"integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-					"dev": true
-				}
-			}
-		},
-		"cldrjs": {
-			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/cldrjs/-/cldrjs-0.5.1.tgz",
-			"integrity": "sha512-xyiP8uAm8K1IhmpDndZLraloW1yqu0L+HYdQ7O1aGPxx9Cr+BMnPANlNhSt++UKfxytL2hd2NPXgTjiy7k43Ew=="
-		},
 		"cliui": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -3716,12 +3731,6 @@
 				"wrap-ansi": "^5.1.0"
 			}
 		},
-		"co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-			"dev": true
-		},
 		"collapse-white-space": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.5.tgz",
@@ -3749,15 +3758,6 @@
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
 			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
 		},
-		"combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"dev": true,
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
 		"commander": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
@@ -3989,15 +3989,6 @@
 			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
 			"integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
 		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
 		"date-fns": {
 			"version": "2.15.0",
 			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.15.0.tgz",
@@ -4085,12 +4076,6 @@
 				}
 			}
 		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true
-		},
 		"des.js": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
@@ -4189,16 +4174,6 @@
 				"xtend": "^4.0.0"
 			}
 		},
-		"ecc-jsbn": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-			"dev": true,
-			"requires": {
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.1.0"
-			}
-		},
 		"electron-to-chromium": {
 			"version": "1.3.549",
 			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.549.tgz",
@@ -4343,60 +4318,6 @@
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
 		},
-		"escodegen": {
-			"version": "1.14.3",
-			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
-			"integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
-			"dev": true,
-			"requires": {
-				"esprima": "^4.0.1",
-				"estraverse": "^4.2.0",
-				"esutils": "^2.0.2",
-				"optionator": "^0.8.1",
-				"source-map": "~0.6.1"
-			},
-			"dependencies": {
-				"levn": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-					"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-					"dev": true,
-					"requires": {
-						"prelude-ls": "~1.1.2",
-						"type-check": "~0.3.2"
-					}
-				},
-				"optionator": {
-					"version": "0.8.3",
-					"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-					"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-					"dev": true,
-					"requires": {
-						"deep-is": "~0.1.3",
-						"fast-levenshtein": "~2.0.6",
-						"levn": "~0.3.0",
-						"prelude-ls": "~1.1.2",
-						"type-check": "~0.3.2",
-						"word-wrap": "~1.2.3"
-					}
-				},
-				"prelude-ls": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-					"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-					"dev": true
-				},
-				"type-check": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-					"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-					"dev": true,
-					"requires": {
-						"prelude-ls": "~1.1.2"
-					}
-				}
-			}
-		},
 		"eslint": {
 			"version": "7.7.0",
 			"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz",
@@ -4685,14 +4606,6 @@
 				"webpack-cli": "3.3.12"
 			},
 			"dependencies": {
-				"@babel/code-frame": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-					"integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-					"requires": {
-						"@babel/highlight": "^7.10.4"
-					}
-				},
 				"@babel/core": {
 					"version": "7.11.1",
 					"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz",
@@ -4716,87 +4629,10 @@
 						"source-map": "^0.5.0"
 					}
 				},
-				"@babel/generator": {
-					"version": "7.11.0",
-					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-					"integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
-					"requires": {
-						"@babel/types": "^7.11.0",
-						"jsesc": "^2.5.1",
-						"source-map": "^0.5.0"
-					}
-				},
-				"@babel/helper-function-name": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-					"integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-					"requires": {
-						"@babel/helper-get-function-arity": "^7.10.4",
-						"@babel/template": "^7.10.4",
-						"@babel/types": "^7.10.4"
-					}
-				},
-				"@babel/helper-get-function-arity": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-					"integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-					"requires": {
-						"@babel/types": "^7.10.4"
-					}
-				},
-				"@babel/helper-split-export-declaration": {
-					"version": "7.11.0",
-					"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-					"integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-					"requires": {
-						"@babel/types": "^7.11.0"
-					}
-				},
-				"@babel/highlight": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-					"integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-					"requires": {
-						"@babel/helper-validator-identifier": "^7.10.4",
-						"chalk": "^2.0.0",
-						"js-tokens": "^4.0.0"
-					}
-				},
-				"@babel/parser": {
-					"version": "7.11.2",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.2.tgz",
-					"integrity": "sha512-Vuj/+7vLo6l1Vi7uuO+1ngCDNeVmNbTngcJFKCR/oEtz8tKz0CJxZEGmPt9KcIloZhOZ3Zit6xbpXT2MDlS9Vw=="
-				},
-				"@babel/template": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-					"integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-					"requires": {
-						"@babel/code-frame": "^7.10.4",
-						"@babel/parser": "^7.10.4",
-						"@babel/types": "^7.10.4"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.11.0",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-					"integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
-					"requires": {
-						"@babel/code-frame": "^7.10.4",
-						"@babel/generator": "^7.11.0",
-						"@babel/helper-function-name": "^7.10.4",
-						"@babel/helper-split-export-declaration": "^7.11.0",
-						"@babel/parser": "^7.11.0",
-						"@babel/types": "^7.11.0",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0",
-						"lodash": "^4.17.19"
-					}
-				},
 				"@babel/types": {
-					"version": "7.11.0",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-					"integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+					"version": "7.12.1",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
+					"integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -4960,12 +4796,6 @@
 				}
 			}
 		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true
-		},
 		"fast-deep-equal": {
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -5119,23 +4949,6 @@
 			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
 			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
 		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true
-		},
-		"form-data": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-			"dev": true,
-			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.6",
-				"mime-types": "^2.1.12"
-			}
-		},
 		"fragment-cache": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -5217,15 +5030,6 @@
 			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
 			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
 		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
 		"glamor": {
 			"version": "2.20.40",
 			"resolved": "https://registry.npmjs.org/glamor/-/glamor-2.20.40.tgz",
@@ -5322,33 +5126,6 @@
 				}
 			}
 		},
-		"globalize": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/globalize/-/globalize-1.5.0.tgz",
-			"integrity": "sha512-76fcPQO/WLthtSwjgIZ/Zv2XSXqv9ifvl1PwIxJNCZNFHigGCpg3fBZ0poJ30b2kdDgofPkYl478lVZA6esESQ==",
-			"requires": {
-				"cldrjs": "^0.5.0"
-			}
-		},
-		"globalize-compiler": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/globalize-compiler/-/globalize-compiler-1.1.1.tgz",
-			"integrity": "sha512-oZIwVp3L/waDidle7Qrw4FiCCmOLAqvdM9P7W8nEO4OfXO//l/abBiA+RL2+mYZPOpTAlRDVS2FLfFVWxHovWA==",
-			"dev": true,
-			"requires": {
-				"escodegen": "^1.6.1",
-				"esprima": "^2.3.0",
-				"nopt": "^3.0.3"
-			},
-			"dependencies": {
-				"esprima": {
-					"version": "2.7.3",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-					"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-					"dev": true
-				}
-			}
-		},
 		"globals": {
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -5365,48 +5142,6 @@
 			"integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
 			"dev": true
 		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"dev": true
-		},
-		"har-validator": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-			"integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-			"dev": true,
-			"requires": {
-				"ajv": "^5.1.0",
-				"har-schema": "^2.0.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "5.5.2",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-					"dev": true,
-					"requires": {
-						"co": "^4.6.0",
-						"fast-deep-equal": "^1.0.0",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.3.0"
-					}
-				},
-				"fast-deep-equal": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-					"dev": true
-				},
-				"json-schema-traverse": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-					"dev": true
-				}
-			}
-		},
 		"has": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -5534,17 +5269,6 @@
 				"entities": "^2.0.0"
 			}
 		},
-		"http-signature": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0",
-				"jsprim": "^1.2.2",
-				"sshpk": "^1.7.0"
-			}
-		},
 		"https-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -5555,12 +5279,6 @@
 			"resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz",
 			"integrity": "sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ=="
 		},
-		"iana-tz-data": {
-			"version": "2019.1.0",
-			"resolved": "https://registry.npmjs.org/iana-tz-data/-/iana-tz-data-2019.1.0.tgz",
-			"integrity": "sha512-T7+26Skkyxqjp4mg20/O065j9J5qP39nWVQj/2ArxQ0gSPkL+T9lwerRmiOAzFRNsNXepX45QqchqTVENwNvig==",
-			"dev": true
-		},
 		"iconv-lite": {
 			"version": "0.4.24",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -5884,12 +5602,6 @@
 				"has-symbols": "^1.0.1"
 			}
 		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
-		},
 		"is-whitespace-character": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz",
@@ -5934,12 +5646,6 @@
 				"whatwg-fetch": ">=0.10.0"
 			}
 		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true
-		},
 		"istanbul-lib-coverage": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
@@ -5981,12 +5687,6 @@
 				"esprima": "^4.0.0"
 			}
 		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"dev": true
-		},
 		"jsesc": {
 			"version": "2.5.2",
 			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -5997,12 +5697,6 @@
 			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
 			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
 		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"dev": true
-		},
 		"json-schema-traverse": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -6014,12 +5708,6 @@
 			"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
 			"dev": true
 		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"dev": true
-		},
 		"json5": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
@@ -6028,18 +5716,6 @@
 				"minimist": "^1.2.5"
 			}
 		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			}
-		},
 		"jsx-ast-utils": {
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz",
@@ -6275,21 +5951,6 @@
 				}
 			}
 		},
-		"mime-db": {
-			"version": "1.44.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-			"integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
-			"dev": true
-		},
-		"mime-types": {
-			"version": "2.1.27",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-			"integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
-			"dev": true,
-			"requires": {
-				"mime-db": "1.44.0"
-			}
-		},
 		"minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -6504,15 +6165,6 @@
 			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz",
 			"integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="
 		},
-		"nopt": {
-			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-			"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-			"dev": true,
-			"requires": {
-				"abbrev": "1"
-			}
-		},
 		"normalize-package-data": {
 			"version": "2.5.0",
 			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -6531,12 +6183,6 @@
 			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 			"optional": true
 		},
-		"oauth-sign": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-			"dev": true
-		},
 		"object-assign": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -6721,13 +6367,12 @@
 			}
 		},
 		"parse-asn1": {
-			"version": "5.1.5",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-			"integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+			"version": "5.1.6",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+			"integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
 			"requires": {
-				"asn1.js": "^4.0.0",
+				"asn1.js": "^5.2.0",
 				"browserify-aes": "^1.0.0",
-				"create-hash": "^1.1.0",
 				"evp_bytestokey": "^1.0.0",
 				"pbkdf2": "^3.0.3",
 				"safe-buffer": "^5.1.1"
@@ -6815,12 +6460,6 @@
 				"sha.js": "^2.4.8"
 			}
 		},
-		"performance-now": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"dev": true
-		},
 		"picomatch": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
@@ -6986,18 +6625,6 @@
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
 			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 		},
-		"q": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
-			"integrity": "sha1-EYcq7t7okmgRCxCnGESP+xARKhQ=",
-			"dev": true
-		},
-		"qs": {
-			"version": "6.5.2",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-			"dev": true
-		},
 		"querystring": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -7313,43 +6940,6 @@
 			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
 			"integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs="
 		},
-		"request": {
-			"version": "2.87.0",
-			"resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
-			"integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
-			"dev": true,
-			"requires": {
-				"aws-sign2": "~0.7.0",
-				"aws4": "^1.6.0",
-				"caseless": "~0.12.0",
-				"combined-stream": "~1.0.5",
-				"extend": "~3.0.1",
-				"forever-agent": "~0.6.1",
-				"form-data": "~2.3.1",
-				"har-validator": "~5.0.3",
-				"http-signature": "~1.2.0",
-				"is-typedarray": "~1.0.0",
-				"isstream": "~0.1.2",
-				"json-stringify-safe": "~5.0.1",
-				"mime-types": "~2.1.17",
-				"oauth-sign": "~0.8.2",
-				"performance-now": "^2.1.0",
-				"qs": "~6.5.1",
-				"safe-buffer": "^5.1.1",
-				"tough-cookie": "~2.3.3",
-				"tunnel-agent": "^0.6.0",
-				"uuid": "^3.1.0"
-			}
-		},
-		"request-progress": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
-			"integrity": "sha1-ByHBBdipasayzossia4tXs/Pazo=",
-			"dev": true,
-			"requires": {
-				"throttleit": "~0.0.2"
-			}
-		},
 		"require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -7455,9 +7045,9 @@
 			}
 		},
 		"safe-buffer": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-			"integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
 		},
 		"safe-regex": {
 			"version": "1.1.0",
@@ -7484,13 +7074,26 @@
 			}
 		},
 		"schema-utils": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-			"integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
 			"requires": {
-				"@types/json-schema": "^7.0.4",
-				"ajv": "^6.12.2",
-				"ajv-keywords": "^3.4.1"
+				"@types/json-schema": "^7.0.5",
+				"ajv": "^6.12.4",
+				"ajv-keywords": "^3.5.2"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "6.12.6",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+					"requires": {
+						"fast-deep-equal": "^3.1.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
+				}
 			}
 		},
 		"semver": {
@@ -7499,9 +7102,9 @@
 			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
 		},
 		"serialize-javascript": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-			"integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+			"integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
 			"requires": {
 				"randombytes": "^2.1.0"
 			}
@@ -7828,23 +7431,6 @@
 			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
 			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
 		},
-		"sshpk": {
-			"version": "1.16.1",
-			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-			"dev": true,
-			"requires": {
-				"asn1": "~0.2.3",
-				"assert-plus": "^1.0.0",
-				"bcrypt-pbkdf": "^1.0.0",
-				"dashdash": "^1.12.0",
-				"ecc-jsbn": "~0.1.1",
-				"getpass": "^0.1.1",
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.0.2",
-				"tweetnacl": "~0.14.0"
-			}
-		},
 		"ssri": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
@@ -8049,15 +7635,15 @@
 			}
 		},
 		"terser-webpack-plugin": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz",
-			"integrity": "sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==",
+			"version": "1.4.5",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
+			"integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
 			"requires": {
 				"cacache": "^12.0.2",
 				"find-cache-dir": "^2.1.0",
 				"is-wsl": "^1.1.0",
 				"schema-utils": "^1.0.0",
-				"serialize-javascript": "^3.1.0",
+				"serialize-javascript": "^4.0.0",
 				"source-map": "^0.6.1",
 				"terser": "^4.1.2",
 				"webpack-sources": "^1.4.0",
@@ -8093,12 +7679,6 @@
 			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
 			"dev": true
 		},
-		"throttleit": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
-			"integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",
-			"dev": true
-		},
 		"through": {
 			"version": "2.3.8",
 			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -8174,23 +7754,6 @@
 				"repeat-string": "^1.6.1"
 			}
 		},
-		"tough-cookie": {
-			"version": "2.3.4",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
-			"integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
-			"dev": true,
-			"requires": {
-				"punycode": "^1.4.1"
-			},
-			"dependencies": {
-				"punycode": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-					"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-					"dev": true
-				}
-			}
-		},
 		"tree-kill": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
@@ -8222,21 +7785,6 @@
 			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
 			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
 		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"dev": true
-		},
 		"type-check": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -8481,12 +8029,6 @@
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
 		},
-		"uuid": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-			"dev": true
-		},
 		"v8-compile-cache": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
@@ -8502,17 +8044,6 @@
 				"spdx-expression-parse": "^3.0.0"
 			}
 		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
-			}
-		},
 		"vfile": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/vfile/-/vfile-3.0.1.tgz",
@@ -8595,9 +8126,9 @@
 					}
 				},
 				"chokidar": {
-					"version": "3.4.2",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-					"integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+					"version": "3.4.3",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
+					"integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
 					"optional": true,
 					"requires": {
 						"anymatch": "~3.1.1",
@@ -8607,7 +8138,7 @@
 						"is-binary-path": "~2.1.0",
 						"is-glob": "~4.0.1",
 						"normalize-path": "~3.0.0",
-						"readdirp": "~3.4.0"
+						"readdirp": "~3.5.0"
 					}
 				},
 				"fill-range": {
@@ -8650,9 +8181,9 @@
 					"optional": true
 				},
 				"readdirp": {
-					"version": "3.4.0",
-					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-					"integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+					"version": "3.5.0",
+					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+					"integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
 					"optional": true,
 					"requires": {
 						"picomatch": "^2.2.1"
@@ -8709,9 +8240,9 @@
 			},
 			"dependencies": {
 				"acorn": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-					"integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
+					"version": "6.4.2",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+					"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
 				},
 				"eslint-scope": {
 					"version": "4.0.3",
diff --git a/packages/component/package.json b/packages/component/package.json
index 3e0e248745..a47bb78939 100644
--- a/packages/component/package.json
+++ b/packages/component/package.json
@@ -52,14 +52,18 @@
     "botframework-webchat-core": "0.0.0-0",
     "classnames": "2.2.6",
     "create-emotion": "10.0.27",
+    "event-target-shim": "5.0.1",
+    "event-target-shim-es5": "1.2.0",
     "markdown-it": "11.0.0",
     "math-random": "2.0.1",
     "memoize-one": "5.1.1",
     "prop-types": "15.7.2",
     "react-dictate-button": "1.2.3-master.6b4fe72",
     "react-film": "3.0.0",
+    "react-redux": "7.2.0",
     "react-say": "2.0.2-master.ee7cd76",
     "react-scroll-to-bottom": "4.0.0",
+    "redux": "4.0.5",
     "remark": "10.0.1",
     "sanitize-html": "^1.27.4",
     "simple-update-in": "2.2.0",
diff --git a/packages/component/src/Composer.js b/packages/component/src/Composer.js
index a56cc4888b..ace22debbf 100644
--- a/packages/component/src/Composer.js
+++ b/packages/component/src/Composer.js
@@ -1,3 +1,5 @@
+/* eslint-disable react/prop-types */
+/* eslint-disable react/destructuring-assignment */
 import { Composer as APIComposer, hooks } from 'botframework-webchat-api';
 import { Composer as SayComposer } from 'react-say';
 import { Composer as ScrollToBottomComposer } from 'react-scroll-to-bottom';
@@ -15,6 +17,7 @@ import addTargetBlankToHyperlinksMarkdown from './Utils/addTargetBlankToHyperlin
 import createCSSKey from './Utils/createCSSKey';
 import createDefaultActivityMiddleware from './Middleware/Activity/createCoreMiddleware';
 import createDefaultActivityStatusMiddleware from './Middleware/ActivityStatus/createCoreMiddleware';
+import createDefaultAttachmentForScreenReaderMiddleware from './Middleware/AttachmentForScreenReader/createCoreMiddleware';
 import createDefaultAttachmentMiddleware from './Middleware/Attachment/createCoreMiddleware';
 import createDefaultAvatarMiddleware from './Middleware/Avatar/createCoreMiddleware';
 import createDefaultCardActionMiddleware from './Middleware/CardAction/createCoreMiddleware';
@@ -203,6 +206,7 @@ ComposerCore.propTypes = {
 const Composer = ({
   activityMiddleware,
   activityStatusMiddleware,
+  attachmentForScreenReaderMiddleware,
   attachmentMiddleware,
   avatarMiddleware,
   cardActionMiddleware,
@@ -228,6 +232,14 @@ const Composer = ({
     [activityStatusMiddleware]
   );
 
+  const patchedAttachmentForScreenReaderMiddleware = useMemo(
+    () => [
+      ...singleToArray(attachmentForScreenReaderMiddleware),
+      ...createDefaultAttachmentForScreenReaderMiddleware()
+    ],
+    [attachmentForScreenReaderMiddleware]
+  );
+
   const patchedAttachmentMiddleware = useMemo(
     () => [...singleToArray(attachmentMiddleware), ...createDefaultAttachmentMiddleware()],
     [attachmentMiddleware]
@@ -257,6 +269,7 @@ const Composer = ({
       <APIComposer
         activityMiddleware={patchedActivityMiddleware}
         activityStatusMiddleware={patchedActivityStatusMiddleware}
+        attachmentForScreenReaderMiddleware={patchedAttachmentForScreenReaderMiddleware}
         attachmentMiddleware={patchedAttachmentMiddleware}
         avatarMiddleware={patchedAvatarMiddleware}
         cardActionMiddleware={patchedCardActionMiddleware}
@@ -293,6 +306,7 @@ Composer.defaultProps = {
   activityRenderer: undefined,
   activityStatusMiddleware: undefined,
   activityStatusRenderer: undefined,
+  attachmentForScreenReaderMiddleware: undefined,
   attachmentMiddleware: undefined,
   attachmentRenderer: undefined,
   avatarMiddleware: undefined,
@@ -315,6 +329,7 @@ Composer.propTypes = {
   activityRenderer: PropTypes.func,
   activityStatusMiddleware: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.func), PropTypes.func]),
   activityStatusRenderer: PropTypes.func,
+  attachmentForScreenReaderMiddleware: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.func), PropTypes.func]),
   attachmentMiddleware: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.func), PropTypes.func]),
   attachmentRenderer: PropTypes.func,
   avatarMiddleware: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.func), PropTypes.func]),
diff --git a/packages/component/src/Middleware/AttachmentForScreenReader/AudioAttachment.js b/packages/component/src/Middleware/AttachmentForScreenReader/AudioAttachment.js
index 168fd3ea22..866e7f5f3d 100644
--- a/packages/component/src/Middleware/AttachmentForScreenReader/AudioAttachment.js
+++ b/packages/component/src/Middleware/AttachmentForScreenReader/AudioAttachment.js
@@ -1,6 +1,7 @@
+import { hooks } from 'botframework-webchat-api';
 import React from 'react';
 
-import useLocalizer from '../../hooks/useLocalizer';
+const { useLocalizer } = hooks;
 
 const AudioAttachment = () => {
   const localize = useLocalizer();
diff --git a/packages/component/src/Middleware/AttachmentForScreenReader/FileAttachment.js b/packages/component/src/Middleware/AttachmentForScreenReader/FileAttachment.js
index ef846fcd11..7b9e5788f7 100644
--- a/packages/component/src/Middleware/AttachmentForScreenReader/FileAttachment.js
+++ b/packages/component/src/Middleware/AttachmentForScreenReader/FileAttachment.js
@@ -1,7 +1,8 @@
+import { hooks } from 'botframework-webchat-api';
 import PropTypes from 'prop-types';
 import React from 'react';
 
-import useLocalizer from '../../hooks/useLocalizer';
+const { useLocalizer } = hooks;
 
 const FileAttachment = ({ attachment: { name = '' } = {} }) => {
   const localize = useLocalizer();
diff --git a/packages/component/src/Middleware/AttachmentForScreenReader/ImageAttachment.js b/packages/component/src/Middleware/AttachmentForScreenReader/ImageAttachment.js
index 804de52af2..cbebad14b9 100644
--- a/packages/component/src/Middleware/AttachmentForScreenReader/ImageAttachment.js
+++ b/packages/component/src/Middleware/AttachmentForScreenReader/ImageAttachment.js
@@ -1,6 +1,7 @@
+import { hooks } from 'botframework-webchat-api';
 import React from 'react';
 
-import useLocalizer from '../../hooks/useLocalizer';
+const { useLocalizer } = hooks;
 
 const ImageAttachment = () => {
   const localize = useLocalizer();
diff --git a/packages/component/src/Middleware/AttachmentForScreenReader/TextAttachment.js b/packages/component/src/Middleware/AttachmentForScreenReader/TextAttachment.js
index 66d8fcca6d..0c5164ffc2 100644
--- a/packages/component/src/Middleware/AttachmentForScreenReader/TextAttachment.js
+++ b/packages/component/src/Middleware/AttachmentForScreenReader/TextAttachment.js
@@ -1,7 +1,8 @@
+import { hooks } from 'botframework-webchat-api';
 import PropTypes from 'prop-types';
 import React from 'react';
 
-import useLocalizer from '../../hooks/useLocalizer';
+const { useLocalizer } = hooks;
 
 const TextAttachment = ({ attachment: { content = '' } = {} }) => {
   const localize = useLocalizer();
diff --git a/packages/component/src/Middleware/AttachmentForScreenReader/VideoAttachment.js b/packages/component/src/Middleware/AttachmentForScreenReader/VideoAttachment.js
index 00d47970c1..b37da1040a 100644
--- a/packages/component/src/Middleware/AttachmentForScreenReader/VideoAttachment.js
+++ b/packages/component/src/Middleware/AttachmentForScreenReader/VideoAttachment.js
@@ -1,6 +1,7 @@
+import { hooks } from 'botframework-webchat-api';
 import React from 'react';
 
-import useLocalizer from '../../hooks/useLocalizer';
+const { useLocalizer } = hooks;
 
 const VideoAttachment = () => {
   const localize = useLocalizer();
diff --git a/packages/component/src/Middleware/AttachmentForScreenReader/createCoreMiddleware.js b/packages/component/src/Middleware/AttachmentForScreenReader/createCoreMiddleware.js
index c8d3e7d56d..e136d88c18 100644
--- a/packages/component/src/Middleware/AttachmentForScreenReader/createCoreMiddleware.js
+++ b/packages/component/src/Middleware/AttachmentForScreenReader/createCoreMiddleware.js
@@ -7,23 +7,29 @@ import TextAttachment from './TextAttachment';
 import VideoAttachment from './VideoAttachment';
 
 export default function createCoreMiddleware() {
-  return () => next => (...args) => {
-    const [
-      { activity: { from: { role } = {} } = {}, attachment, attachment: { contentType, contentUrl, thumbnailUrl } = {} }
-    ] = args;
+  return [
+    () => next => (...args) => {
+      const [
+        {
+          activity: { from: { role } = {} } = {},
+          attachment,
+          attachment: { contentType, contentUrl, thumbnailUrl } = {}
+        }
+      ] = args;
 
-    return role === 'user' && !/^text\//u.test(contentType) && !thumbnailUrl
-      ? () => <FileAttachment attachment={attachment} />
-      : /^audio\//u.test(contentType)
-      ? () => <AudioAttachment />
-      : /^image\//u.test(contentType)
-      ? () => <ImageAttachment />
-      : /^video\//u.test(contentType)
-      ? () => <VideoAttachment />
-      : contentUrl || contentType === 'application/octet-stream'
-      ? () => <FileAttachment attachment={attachment} />
-      : /^text\//u.test(contentType)
-      ? () => <TextAttachment attachment={attachment} />
-      : next(...args);
-  };
+      return role === 'user' && !/^text\//u.test(contentType) && !thumbnailUrl
+        ? () => <FileAttachment attachment={attachment} />
+        : /^audio\//u.test(contentType)
+        ? () => <AudioAttachment />
+        : /^image\//u.test(contentType)
+        ? () => <ImageAttachment />
+        : /^video\//u.test(contentType)
+        ? () => <VideoAttachment />
+        : contentUrl || contentType === 'application/octet-stream'
+        ? () => <FileAttachment attachment={attachment} />
+        : /^text\//u.test(contentType)
+        ? () => <TextAttachment attachment={attachment} />
+        : next(...args);
+    }
+  ];
 }
diff --git a/packages/component/src/Middleware/applyAttachmentForScreenReaderMiddleware.js b/packages/component/src/Middleware/applyAttachmentForScreenReaderMiddleware.js
deleted file mode 100644
index 60922c1c1f..0000000000
--- a/packages/component/src/Middleware/applyAttachmentForScreenReaderMiddleware.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* eslint no-magic-numbers: ["error", { "ignore": [2] }] */
-
-import React from 'react';
-
-import concatMiddleware from './concatMiddleware';
-import createCoreMiddleware from './AttachmentForScreenReader/createCoreMiddleware';
-import ErrorBox from '../ErrorBox';
-
-export default function applyAttachmentForScreenReaderMiddleware(additionalMiddleware) {
-  const activityMiddleware = concatMiddleware(additionalMiddleware, createCoreMiddleware())({});
-
-  return (...args) => {
-    try {
-      return activityMiddleware(() => false)(...args);
-    } catch (err) {
-      const FailedRenderAttachmentForScreenReader = () => (
-        <ErrorBox error={err} message="Failed to render attachment for screen reader">
-          <pre>{JSON.stringify(err, null, 2)}</pre>
-        </ErrorBox>
-      );
-
-      return FailedRenderAttachmentForScreenReader;
-    }
-  };
-}
diff --git a/packages/component/src/hooks/useCreateAttachmentForScreenReaderRenderer.js b/packages/component/src/hooks/useCreateAttachmentForScreenReaderRenderer.js
deleted file mode 100644
index f945ec439c..0000000000
--- a/packages/component/src/hooks/useCreateAttachmentForScreenReaderRenderer.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import useWebChatUIContext from './internal/useWebChatUIContext';
-
-export default function useCreateAttachmentForScreenReaderRenderer() {
-  return useWebChatUIContext().createAttachmentForScreenReaderRenderer;
-}