diff --git a/CHANGELOG.md b/CHANGELOG.md
index b25bacde8c38..3f69230f3e76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 6.0.0-beta.8 (May 17, 2020)
+
+### Features
+
+* Addon-toolbars: Show tool icons for all viewModes ([#10810](https://github.com/storybookjs/storybook/pull/10810))
+
+### Bug Fixes
+
+* Addon-docs: Eval argTypes default value ([#10812](https://github.com/storybookjs/storybook/pull/10812))
+
+### Maintenance
+
+* Scripts: parallel execution on build package scripts ([#10808](https://github.com/storybookjs/storybook/pull/10808))
+
 ## 6.0.0-beta.7 (May 15, 2020)
 
 ### Breaking changes
diff --git a/addons/a11y/package.json b/addons/a11y/package.json
index e02a047f177d..e9417d44e9d5 100644
--- a/addons/a11y/package.json
+++ b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -33,14 +33,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/channels": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/channels": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "axe-core": "^3.5.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
diff --git a/addons/actions/package.json b/addons/actions/package.json
index 46ac7ca201c8..bd20ac71f0da 100644
--- a/addons/actions/package.json
+++ b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "fast-deep-equal": "^3.1.1",
     "global": "^4.3.2",
diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
index d7dd82747290..f00e3537b153 100644
--- a/addons/backgrounds/package.json
+++ b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -32,12 +32,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "memoizerific": "^1.11.3",
     "react": "^16.8.3",
diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json
index 75810c3b9a85..d08f0734811a 100644
--- a/addons/cssresources/package.json
+++ b/addons/cssresources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-cssresources",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "A storybook addon to switch between css resources at runtime for your story",
   "keywords": [
     "addon",
@@ -32,11 +32,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
diff --git a/addons/design-assets/package.json b/addons/design-assets/package.json
index 5ba3d947e2c2..0e87f5b206b6 100644
--- a/addons/design-assets/package.json
+++ b/addons/design-assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-design-assets",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Design asset preview for storybook",
   "keywords": [
     "addon",
@@ -34,12 +34,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
diff --git a/addons/docs/package.json b/addons/docs/package.json
index fe4a1d7bdb06..a2617634829c 100644
--- a/addons/docs/package.json
+++ b/addons/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Superior documentation for your components",
   "keywords": [
     "addon",
@@ -48,17 +48,17 @@
     "@mdx-js/loader": "^1.5.1",
     "@mdx-js/mdx": "^1.5.1",
     "@mdx-js/react": "^1.5.1",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
     "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.0.0-beta.7",
-    "@storybook/postinstall": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/postinstall": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "acorn": "^7.1.0",
     "acorn-jsx": "^5.1.0",
     "acorn-walk": "^7.0.0",
@@ -84,8 +84,8 @@
     "@babel/core": "^7.9.6",
     "@emotion/core": "^10.0.20",
     "@emotion/styled": "^10.0.17",
-    "@storybook/react": "6.0.0-beta.7",
-    "@storybook/web-components": "6.0.0-beta.7",
+    "@storybook/react": "6.0.0-beta.8",
+    "@storybook/web-components": "6.0.0-beta.8",
     "@types/cross-spawn": "^6.0.1",
     "@types/doctrine": "^0.0.3",
     "@types/enzyme": "^3.10.3",
diff --git a/addons/docs/src/frameworks/react/extractArgTypes.ts b/addons/docs/src/frameworks/react/extractArgTypes.ts
index 6af5403fd8e6..fa35147a79ad 100644
--- a/addons/docs/src/frameworks/react/extractArgTypes.ts
+++ b/addons/docs/src/frameworks/react/extractArgTypes.ts
@@ -1,26 +1,30 @@
 import { PropDef, PropsTableRowsProps } from '@storybook/components';
 import { ArgTypes } from '@storybook/api';
 import { ArgTypesExtractor } from '../../lib/docgen';
-import { trimQuotes } from '../../lib/sbtypes/utils';
 import { extractProps } from './extractProps';
 
-const trim = (val: any) => (val && typeof val === 'string' ? trimQuotes(val) : val);
-
 export const extractArgTypes: ArgTypesExtractor = (component) => {
   if (component) {
     const props = extractProps(component);
     const { rows } = props as PropsTableRowsProps;
     if (rows) {
       return rows.reduce((acc: ArgTypes, row: PropDef) => {
-        const { type, sbType, defaultValue, jsDocTags, required } = row;
+        const { type, sbType, defaultValue: defaultSummary, jsDocTags, required } = row;
+        let defaultValue = defaultSummary && (defaultSummary.detail || defaultSummary.summary);
+        try {
+          // eslint-disable-next-line no-eval
+          defaultValue = eval(defaultValue);
+          // eslint-disable-next-line no-empty
+        } catch {}
+
         acc[row.name] = {
           ...row,
-          defaultValue: defaultValue && trim(defaultValue.detail || defaultValue.summary),
+          defaultValue,
           type: { required, ...sbType },
           table: {
             type,
             jsDocTags,
-            defaultValue,
+            defaultValue: defaultSummary,
           },
         };
         return acc;
diff --git a/addons/essentials/package.json b/addons/essentials/package.json
index c34a0a90701e..7ab5683ace27 100644
--- a/addons/essentials/package.json
+++ b/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-essentials",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Curated addons to bring out the best of Storybook",
   "keywords": [
     "addon",
@@ -28,13 +28,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/node-logger": "6.0.0-beta.7",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "regenerator-runtime": "^0.13.3",
     "ts-dedent": "^1.1.1"
diff --git a/addons/events/package.json b/addons/events/package.json
index aae78157e44b..17afb09398bf 100644
--- a/addons/events/package.json
+++ b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -31,11 +31,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "format-json": "^1.0.3",
     "lodash": "^4.17.15",
diff --git a/addons/google-analytics/package.json b/addons/google-analytics/package.json
index 431a6f7e1973..639c8d69e6a4 100644
--- a/addons/google-analytics/package.json
+++ b/addons/google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-google-analytics",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -20,8 +20,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react-ga": "^2.5.7",
diff --git a/addons/graphql/package.json b/addons/graphql/package.json
index cd36c53a5a9f..eb968a200e8d 100644
--- a/addons/graphql/package.json
+++ b/addons/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "addon",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@babel/core": "^7.9.0",
     "@babel/plugin-transform-classes": "^7.9.2",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
     "@types/webpack": "^4.41.9",
     "babel-loader": "^8.0.6",
     "core-js": "^3.0.1",
diff --git a/addons/jest/package.json b/addons/jest/package.json
index d7064df15fb2..3e820362e890 100644
--- a/addons/jest/package.json
+++ b/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -35,11 +35,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
diff --git a/addons/knobs/package.json b/addons/knobs/package.json
index c5b2d9eda4ce..580e6af4fab5 100644
--- a/addons/knobs/package.json
+++ b/addons/knobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook Addon Prop Editor Component",
   "keywords": [
     "addon",
@@ -29,13 +29,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/channels": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/channels": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "@types/react-color": "^3.0.1",
     "copy-to-clipboard": "^3.0.8",
     "core-js": "^3.0.1",
diff --git a/addons/links/package.json b/addons/links/package.json
index ff83b8c6d0bd..b99ca01982b5 100644
--- a/addons/links/package.json
+++ b/addons/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Story Links addon for storybook",
   "keywords": [
     "addon",
@@ -29,11 +29,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
     "@storybook/csf": "0.0.1",
-    "@storybook/router": "6.0.0-beta.7",
+    "@storybook/router": "6.0.0-beta.8",
     "@types/qs": "^6.9.0",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
diff --git a/addons/queryparams/package.json b/addons/queryparams/package.json
index 67ff133a9885..684d78a42578 100644
--- a/addons/queryparams/package.json
+++ b/addons/queryparams/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-queryparams",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "parameter addon for storybook",
   "keywords": [
     "addon",
@@ -30,12 +30,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "qs": "^6.6.0",
diff --git a/addons/storyshots/storyshots-core/package.json b/addons/storyshots/storyshots-core/package.json
index 60cdeed6f8c0..084bfb907b19 100644
--- a/addons/storyshots/storyshots-core/package.json
+++ b/addons/storyshots/storyshots-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
   "keywords": [
     "addon",
@@ -33,9 +33,9 @@
   },
   "dependencies": {
     "@jest/transform": "^26.0.0",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
     "@types/glob": "^7.1.1",
     "@types/jest": "^25.1.1",
     "@types/jest-specific-snapshot": "^0.5.3",
@@ -50,8 +50,8 @@
     "ts-dedent": "^1.1.1"
   },
   "devDependencies": {
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/react": "6.0.0-beta.7",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/react": "6.0.0-beta.8",
     "babel-loader": "^8.0.6",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.4.1",
diff --git a/addons/storyshots/storyshots-puppeteer/package.json b/addons/storyshots/storyshots-puppeteer/package.json
index a0ee2e8d1054..e26919ae1246 100644
--- a/addons/storyshots/storyshots-puppeteer/package.json
+++ b/addons/storyshots/storyshots-puppeteer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots-puppeteer",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Image snapshots addition to StoryShots based on puppeteer",
   "keywords": [
     "addon",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.0.0-beta.7",
+    "@storybook/node-logger": "6.0.0-beta.8",
     "@types/jest-image-snapshot": "^2.8.0",
     "@wordpress/jest-puppeteer-axe": "^1.5.0",
     "core-js": "^3.0.1",
@@ -42,7 +42,7 @@
     "@types/puppeteer": "^2.0.0"
   },
   "peerDependencies": {
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
     "puppeteer": "^2.0.0 || ^3.0.0"
   },
   "peerDependenciesMeta": {
diff --git a/addons/storysource/package.json b/addons/storysource/package.json
index 0dfd605676d3..963802b32d73 100644
--- a/addons/storysource/package.json
+++ b/addons/storysource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storysource",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Stories addon for storybook",
   "keywords": [
     "addon",
@@ -29,13 +29,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/router": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/router": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "estraverse": "^4.2.0",
     "loader-utils": "^2.0.0",
diff --git a/addons/toolbars/package.json b/addons/toolbars/package.json
index 4986d297e1c9..7523f4e3df11 100644
--- a/addons/toolbars/package.json
+++ b/addons/toolbars/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-toolbars",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook toolbars addon",
   "keywords": [
     "addon",
@@ -30,10 +30,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
     "core-js": "^3.0.1"
   },
   "peerDependencies": {
diff --git a/addons/toolbars/src/register.tsx b/addons/toolbars/src/register.tsx
index bf8a19cca549..552f00c81ed5 100644
--- a/addons/toolbars/src/register.tsx
+++ b/addons/toolbars/src/register.tsx
@@ -7,7 +7,7 @@ addons.register(ID, (api) =>
   addons.add(ID, {
     title: ID,
     type: types.TOOL,
-    match: ({ viewMode }) => viewMode === 'story',
+    match: () => true,
     render: () => <ToolbarManager />,
   })
 );
diff --git a/addons/viewport/package.json b/addons/viewport/package.json
index a855afcefa3e..0fefe3569de8 100644
--- a/addons/viewport/package.json
+++ b/addons/viewport/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook addon to change the viewport size to mobile",
   "keywords": [
     "addon",
@@ -29,12 +29,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "memoizerific": "^1.11.3",
diff --git a/app/angular/package.json b/app/angular/package.json
index f7ff8a7e61fa..7d51783c545a 100644
--- a/app/angular/package.json
+++ b/app/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -34,9 +34,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
-    "@storybook/node-logger": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.8",
     "@types/webpack-env": "^1.15.2",
     "autoprefixer": "^9.7.6",
     "core-js": "^3.0.1",
diff --git a/app/aurelia/package.json b/app/aurelia/package.json
index 3a1d9f72e36a..36fa58ae5283 100644
--- a/app/aurelia/package.json
+++ b/app/aurelia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/aurelia",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for Aurelia: Develop Aurelia Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -26,10 +26,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
-    "@storybook/node-logger": "6.0.0-beta.7",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.8",
     "fork-ts-checker-webpack-plugin": "^4.0.3",
     "global": "^4.3.2",
     "ts-loader": "^6.0.1",
diff --git a/app/ember/package.json b/app/ember/package.json
index 1a7ef879fff6..71c5269c5994 100644
--- a/app/ember/package.json
+++ b/app/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/ember",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybookjs/storybook/tree/master/app/ember",
   "bugs": {
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@ember/test-helpers": "^1.7.0",
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/core": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3",
diff --git a/app/html/package.json b/app/html/package.json
index 9e87fcf2024c..7b23898b6adc 100644
--- a/app/html/package.json
+++ b/app/html/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -34,8 +34,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
diff --git a/app/marionette/package.json b/app/marionette/package.json
index 8c8691fb40ce..c71b11e858c6 100644
--- a/app/marionette/package.json
+++ b/app/marionette/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/marionette",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for Marionette: Develop Marionette.js component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -25,7 +25,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/core": "6.0.0-beta.8",
     "common-tags": "^1.8.0",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
diff --git a/app/marko/package.json b/app/marko/package.json
index fe49a49c5b4b..16ece24c7ba5 100644
--- a/app/marko/package.json
+++ b/app/marko/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/marko",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for Marko: Develop Marko Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -34,8 +34,8 @@
   },
   "dependencies": {
     "@marko/webpack": "^2.1.0",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3",
diff --git a/app/mithril/package.json b/app/mithril/package.json
index 0e333700fdb1..9034b1240597 100644
--- a/app/mithril/package.json
+++ b/app/mithril/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/mithril",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for Mithril: Develop Mithril Component in isolation.",
   "keywords": [
     "storybook"
@@ -36,8 +36,8 @@
   "dependencies": {
     "@babel/core": "^7.9.6",
     "@babel/plugin-transform-react-jsx": "^7.3.0",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
     "@types/mithril": "^2.0.0",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
diff --git a/app/preact/package.json b/app/preact/package.json
index 14b5000ccf2b..040c01f6d553 100644
--- a/app/preact/package.json
+++ b/app/preact/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/preact",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for Preact: Develop Preact Component in isolation.",
   "keywords": [
     "storybook"
@@ -35,8 +35,8 @@
   },
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "^7.3.0",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
diff --git a/app/rax/package.json b/app/rax/package.json
index fcfa7b0b19db..da6e69dd53e3 100644
--- a/app/rax/package.json
+++ b/app/rax/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/rax",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for Rax: Develop Rax Component in isolation.",
   "keywords": [
     "rax",
@@ -34,7 +34,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/core": "6.0.0-beta.8",
     "babel-preset-rax": "^1.0.0-beta.0",
     "core-js": "^3.0.1",
     "driver-dom": "^2.0.0",
diff --git a/app/react/package.json b/app/react/package.json
index 2bfe6fd65353..db5f73e1e3b9 100644
--- a/app/react/package.json
+++ b/app/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/react",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -37,9 +37,9 @@
     "@babel/plugin-transform-react-constant-elements": "^7.6.3",
     "@babel/preset-flow": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
-    "@storybook/node-logger": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.8",
     "@svgr/webpack": "^5.4.0",
     "@types/webpack-env": "^1.15.2",
     "babel-plugin-add-react-displayname": "^0.0.5",
@@ -56,7 +56,7 @@
     "webpack": "^4.43.0"
   },
   "devDependencies": {
-    "@storybook/client-api": "6.0.0-beta.7",
+    "@storybook/client-api": "6.0.0-beta.8",
     "@types/node": "^13.13.4",
     "@types/webpack": "^4.41.12"
   },
diff --git a/app/riot/package.json b/app/riot/package.json
index ad737624d15a..06e9b8334572 100644
--- a/app/riot/package.json
+++ b/app/riot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/riot",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for riot.js: View riot snippets in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -34,7 +34,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/core": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "raw-loader": "^4.0.1",
diff --git a/app/server/package.json b/app/server/package.json
index 08406a15c9c1..015e868c9098 100644
--- a/app/server/package.json
+++ b/app/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/server",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -34,8 +34,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
     "@storybook/node-logger": "^5.2.8",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
diff --git a/app/svelte/package.json b/app/svelte/package.json
index 3259c39d1b51..d8c62735f677 100644
--- a/app/svelte/package.json
+++ b/app/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/svelte",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -34,8 +34,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3",
diff --git a/app/vue/package.json b/app/vue/package.json
index 161eda3bf5f0..f2b0487a8e2a 100644
--- a/app/vue/package.json
+++ b/app/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/vue",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -34,8 +34,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
diff --git a/app/web-components/package.json b/app/web-components/package.json
index c5a009ea46b3..148dc3b67ae0 100644
--- a/app/web-components/package.json
+++ b/app/web-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/web-components",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.",
   "keywords": [
     "lit-html",
@@ -38,8 +38,8 @@
   "dependencies": {
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-syntax-import-meta": "^7.2.0",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
     "@types/webpack-env": "^1.15.2",
     "babel-plugin-bundled-import-meta": "^0.3.1",
     "core-js": "^3.0.1",
diff --git a/dev-kits/addon-decorator/package.json b/dev-kits/addon-decorator/package.json
index 73651bc46761..88e296abff1a 100644
--- a/dev-kits/addon-decorator/package.json
+++ b/dev-kits/addon-decorator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-decorator",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "decorator addon for storybook",
   "keywords": [
     "addon",
@@ -24,8 +24,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.4.0"
   },
diff --git a/dev-kits/addon-parameter/package.json b/dev-kits/addon-parameter/package.json
index cd0019054e21..a8d3361c24f7 100644
--- a/dev-kits/addon-parameter/package.json
+++ b/dev-kits/addon-parameter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-parameter",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "parameter addon for storybook",
   "keywords": [
     "addon",
@@ -24,12 +24,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
diff --git a/dev-kits/addon-preview-wrapper/package.json b/dev-kits/addon-preview-wrapper/package.json
index ba8eff56e66c..da7a29c98b42 100644
--- a/dev-kits/addon-preview-wrapper/package.json
+++ b/dev-kits/addon-preview-wrapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-preview-wrapper",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "preview wrapper addon for storybook",
   "keywords": [
     "addon",
@@ -24,7 +24,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
     "react": "^16.8.3"
   },
   "publishConfig": {
diff --git a/dev-kits/addon-roundtrip/package.json b/dev-kits/addon-roundtrip/package.json
index 418c8555a5c9..e3f21d7a8326 100644
--- a/dev-kits/addon-roundtrip/package.json
+++ b/dev-kits/addon-roundtrip/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-roundtrip",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "roundtrip addon for storybook",
   "keywords": [
     "addon",
@@ -24,13 +24,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "react": "^16.8.3",
diff --git a/docs/src/versions/next.json b/docs/src/versions/next.json
index 91daf0a5313f..efb268af7e75 100644
--- a/docs/src/versions/next.json
+++ b/docs/src/versions/next.json
@@ -1 +1 @@
-{"version":"6.0.0-beta.7","info":{"plain":"### Breaking changes\n\n- Cleanup: Remove support for babel-loader < 8 ([#10781](https://github.com/storybookjs/storybook/pull/10781))\n\n### Features\n\n- Composition: Zero-config composition from dependencies ([#10753](https://github.com/storybookjs/storybook/pull/10753))\n\n### Bug Fixes\n\n- Core: Detect local addons for windows machine ([#10786](https://github.com/storybookjs/storybook/pull/10786))\n- Composition: Rename `mapper` to `storyMapper` and fix loading bugs ([#10780](https://github.com/storybookjs/storybook/pull/10780))\n\n### Maintenance\n\n- CLI: HTML stories homogenization ([#10705](https://github.com/storybookjs/storybook/pull/10705))\n- CLI: web-components stories homogenization ([#10703](https://github.com/storybookjs/storybook/pull/10703))\n\n### Dependency Upgrades\n\n- Update jest-preset-angular to 8.2.0 ([#10778](https://github.com/storybookjs/storybook/pull/10778))"}}
\ No newline at end of file
+{"version":"6.0.0-beta.8","info":{"plain":"### Features\n\n* Addon-toolbars: Show tool icons for all viewModes ([#10810](https://github.com/storybookjs/storybook/pull/10810))\n\n### Bug Fixes\n\n* Addon-docs: Eval argTypes default value ([#10812](https://github.com/storybookjs/storybook/pull/10812))\n\n### Maintenance\n\n* Scripts: parallel execution on build package scripts ([#10808](https://github.com/storybookjs/storybook/pull/10808))"}}
\ No newline at end of file
diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
index 641c6e65d1c5..b849f62b5a9a 100644
--- a/examples/angular-cli/package.json
+++ b/examples/angular-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-cli",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -37,18 +37,18 @@
     "@angular/cli": "^9.1.0",
     "@angular/compiler-cli": "^9.1.0",
     "@compodoc/compodoc": "^1.1.11",
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-jest": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/angular": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-jest": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/angular": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
     "@types/core-js": "^2.5.0",
     "@types/jest": "^25.1.1",
     "@types/node": "^13.13.4",
diff --git a/examples/aurelia-kitchen-sink/package.json b/examples/aurelia-kitchen-sink/package.json
index 930ecacb1521..062b77cb69a2 100644
--- a/examples/aurelia-kitchen-sink/package.json
+++ b/examples/aurelia-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-kitchen-sink",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "description": "An Aurelia client application.",
   "repository": {
@@ -25,18 +25,18 @@
     "@aurelia/jit-html-browser": "^0.6.0",
     "@aurelia/runtime": "^0.6.0",
     "@aurelia/webpack-loader": "dev",
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-jest": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/aurelia": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-jest": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/aurelia": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
     "@types/node": "^12.0.0",
     "css-loader": "^3.0.0",
     "file-loader": "^4.2.0",
diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json
index 988b415929fe..74d495bc2057 100644
--- a/examples/cra-kitchen-sink/package.json
+++ b/examples/cra-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cra-kitchen-sink",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -18,19 +18,19 @@
     "react-lifecycles-compat": "^3.0.4"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-events": "6.0.0-beta.7",
-    "@storybook/addon-jest": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/react": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-events": "6.0.0-beta.8",
+    "@storybook/addon-jest": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/react": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "react-scripts": "^3.0.1"
   },
   "storybook": {
diff --git a/examples/cra-react15/package.json b/examples/cra-react15/package.json
index 7199f514dc22..a61beae8da64 100644
--- a/examples/cra-react15/package.json
+++ b/examples/cra-react15/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cra-react15",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -18,11 +18,11 @@
     "react-scripts": "3.0.1"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/react": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/react": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "babel-core": "6",
     "babel-runtime": "6"
   },
diff --git a/examples/cra-ts-essentials/package.json b/examples/cra-ts-essentials/package.json
index 0a04c7331a64..119463849245 100644
--- a/examples/cra-ts-essentials/package.json
+++ b/examples/cra-ts-essentials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cra-ts-essentials",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -34,10 +34,10 @@
     "typescript": "3.8.3"
   },
   "devDependencies": {
-    "@storybook/addon-essentials": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
+    "@storybook/addon-essentials": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
     "@storybook/preset-create-react-app": "^2.1.1",
-    "@storybook/react": "6.0.0-beta.7"
+    "@storybook/react": "6.0.0-beta.8"
   },
   "storybook": {
     "chromatic": {
diff --git a/examples/cra-ts-kitchen-sink/package.json b/examples/cra-ts-kitchen-sink/package.json
index 04dd4a74280c..2f2980a51f03 100644
--- a/examples/cra-ts-kitchen-sink/package.json
+++ b/examples/cra-ts-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cra-ts-kitchen-sink",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build": "react-scripts build",
@@ -34,14 +34,14 @@
     "typescript": "3.8.3"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
     "@storybook/preset-create-react-app": "^2.1.1",
-    "@storybook/react": "6.0.0-beta.7",
+    "@storybook/react": "6.0.0-beta.8",
     "@types/enzyme": "^3.9.0",
     "enzyme": "^3.9.0",
     "enzyme-adapter-react-16": "^1.9.1",
diff --git a/examples/dev-kits/package.json b/examples/dev-kits/package.json
index 2e3116417379..05830bbf9b2a 100644
--- a/examples/dev-kits/package.json
+++ b/examples/dev-kits/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/example-devkits",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./",
@@ -8,18 +8,18 @@
     "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./ --no-dll"
   },
   "devDependencies": {
-    "@storybook/addon-decorator": "6.0.0-beta.7",
-    "@storybook/addon-parameter": "6.0.0-beta.7",
-    "@storybook/addon-preview-wrapper": "6.0.0-beta.7",
-    "@storybook/addon-roundtrip": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/node-logger": "6.0.0-beta.7",
-    "@storybook/react": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addon-decorator": "6.0.0-beta.8",
+    "@storybook/addon-parameter": "6.0.0-beta.8",
+    "@storybook/addon-preview-wrapper": "6.0.0-beta.8",
+    "@storybook/addon-roundtrip": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/react": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "cors": "^2.8.5",
     "cross-env": "^7.0.0",
     "enzyme-to-json": "^3.4.1",
diff --git a/examples/ember-cli/package.json b/examples/ember-cli/package.json
index 5609fce91412..a32b78a816a8 100644
--- a/examples/ember-cli/package.json
+++ b/examples/ember-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-example",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build": "ember build --output-path ember-output",
@@ -16,18 +16,18 @@
   "devDependencies": {
     "@babel/core": "^7.9.6",
     "@ember/optional-features": "^1.3.0",
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/ember": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/ember": "6.0.0-beta.8",
     "@storybook/ember-cli-storybook": "^0.2.1",
-    "@storybook/source-loader": "6.0.0-beta.7",
+    "@storybook/source-loader": "6.0.0-beta.8",
     "babel-loader": "^8",
     "broccoli-asset-rev": "^3.0.0",
     "cross-env": "^7.0.0",
diff --git a/examples/html-kitchen-sink/package.json b/examples/html-kitchen-sink/package.json
index b736c16047cc..e7471d349e30 100644
--- a/examples/html-kitchen-sink/package.json
+++ b/examples/html-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "html-kitchen-sink",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "description": "",
   "keywords": [],
@@ -13,23 +13,23 @@
     "storybook": "start-storybook -p 9006"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-events": "6.0.0-beta.7",
-    "@storybook/addon-jest": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/html": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-events": "6.0.0-beta.8",
+    "@storybook/addon-jest": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/html": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
     "eventemitter3": "^4.0.0",
     "format-json": "^1.0.3",
     "global": "^4.3.2",
diff --git a/examples/marko-cli/package.json b/examples/marko-cli/package.json
index ff169982c1bd..659def7ff0db 100644
--- a/examples/marko-cli/package.json
+++ b/examples/marko-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "marko-cli",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "description": "Demo of how to build an app using marko-starter",
   "repository": {
@@ -23,13 +23,13 @@
     "marko-starter": "^2.1.0"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/marko": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/marko": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
     "prettier": "^2.0.5",
     "webpack": "^4.33.0"
   },
diff --git a/examples/mithril-kitchen-sink/package.json b/examples/mithril-kitchen-sink/package.json
index 0520b4aaefb9..071c9c4d3b18 100644
--- a/examples/mithril-kitchen-sink/package.json
+++ b/examples/mithril-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mithril-example",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build-storybook": "build-storybook",
@@ -10,17 +10,17 @@
     "mithril": "^1.1.6"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/mithril": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/mithril": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
     "webpack": "^4.33.0"
   },
   "storybook": {
diff --git a/examples/official-storybook/main.js b/examples/official-storybook/main.js
index 71770c99b4cc..6eea9d783a01 100644
--- a/examples/official-storybook/main.js
+++ b/examples/official-storybook/main.js
@@ -3,7 +3,7 @@ module.exports = {
     // FIXME: Breaks e2e tests './intro.stories.mdx',
     '../../lib/ui/src/**/*.stories.(js|tsx|mdx)',
     '../../lib/components/src/**/*.stories.(js|tsx|mdx)',
-    './stories/**/*.stories.(js|tsx|mdx)',
+    './stories/**/*.stories.(js|ts|tsx|mdx)',
     './../../addons/docs/**/*.stories.tsx',
   ],
   addons: [
diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json
index e520884dec27..ce692a817332 100644
--- a/examples/official-storybook/package.json
+++ b/examples/official-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "official-storybook",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build-storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true build-storybook -c ./",
@@ -14,31 +14,31 @@
   },
   "devDependencies": {
     "@packtracker/webpack-plugin": "^2.0.1",
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-cssresources": "6.0.0-beta.7",
-    "@storybook/addon-design-assets": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-events": "6.0.0-beta.7",
-    "@storybook/addon-graphql": "6.0.0-beta.7",
-    "@storybook/addon-jest": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-queryparams": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addon-storyshots-puppeteer": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addon-toolbars": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/cli": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/node-logger": "6.0.0-beta.7",
-    "@storybook/react": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-cssresources": "6.0.0-beta.8",
+    "@storybook/addon-design-assets": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-events": "6.0.0-beta.8",
+    "@storybook/addon-graphql": "6.0.0-beta.8",
+    "@storybook/addon-jest": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-queryparams": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addon-storyshots-puppeteer": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addon-toolbars": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/cli": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/react": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "chromatic": "^4.0.2",
     "cors": "^2.8.5",
     "cross-env": "^7.0.0",
diff --git a/examples/preact-kitchen-sink/package.json b/examples/preact-kitchen-sink/package.json
index bd65a195c8db..72edbca88a7d 100644
--- a/examples/preact-kitchen-sink/package.json
+++ b/examples/preact-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "preact-example",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@@ -15,17 +15,17 @@
   "devDependencies": {
     "@babel/core": "^7.9.6",
     "@babel/plugin-transform-runtime": "^7.9.6",
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/preact": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/preact": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
     "babel-loader": "^8.0.4",
     "cross-env": "^7.0.0",
     "file-loader": "^6.0.0",
diff --git a/examples/rax-kitchen-sink/package.json b/examples/rax-kitchen-sink/package.json
index f3ca5c09a893..df4b53036aa5 100644
--- a/examples/rax-kitchen-sink/package.json
+++ b/examples/rax-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rax-kitchen-sink",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build": "build-scripts build",
@@ -20,20 +20,20 @@
   "devDependencies": {
     "@alib/build-scripts": "^0.1.8",
     "@babel/preset-react": "^7.7.4",
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-events": "6.0.0-beta.7",
-    "@storybook/addon-jest": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/rax": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-events": "6.0.0-beta.8",
+    "@storybook/addon-jest": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/rax": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "babel-eslint": "^10.0.3",
     "build-plugin-rax-app": "^0.2.0",
     "stylesheet-loader": "^0.8.0"
diff --git a/examples/riot-kitchen-sink/package.json b/examples/riot-kitchen-sink/package.json
index cec7bda5a298..12acb41bfef3 100644
--- a/examples/riot-kitchen-sink/package.json
+++ b/examples/riot-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "riot-example",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@@ -15,17 +15,17 @@
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/riot": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/riot": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
     "babel-loader": "^8.0.4",
     "cross-env": "^7.0.0",
     "file-loader": "^6.0.0",
diff --git a/examples/server-kitchen-sink/package.json b/examples/server-kitchen-sink/package.json
index 686c81363ef5..7be403ebe52b 100644
--- a/examples/server-kitchen-sink/package.json
+++ b/examples/server-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "server-kitchen-sink",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "description": "",
   "keywords": [],
@@ -14,13 +14,13 @@
     "storybook": "SERVER_PORT=1137 start-storybook -p 9006 --quiet"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/node-logger": "6.0.0-beta.7",
-    "@storybook/server": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/server": "6.0.0-beta.8",
     "concurrently": "^5.2.0",
     "cors": "^2.8.5",
     "express": "~4.17.1",
diff --git a/examples/standalone-preview/package.json b/examples/standalone-preview/package.json
index 22b997d43a8f..882597c30356 100644
--- a/examples/standalone-preview/package.json
+++ b/examples/standalone-preview/package.json
@@ -1,12 +1,12 @@
 {
   "name": "standalone-preview",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "storybook": "parcel ./storybook.html --port 1337"
   },
   "devDependencies": {
-    "@storybook/react": "6.0.0-beta.7",
+    "@storybook/react": "6.0.0-beta.8",
     "parcel": "^1.12.3",
     "react": "^16.8.4",
     "react-dom": "^16.8.4"
diff --git a/examples/svelte-kitchen-sink/package.json b/examples/svelte-kitchen-sink/package.json
index 1727624bc0ed..dd67bccecadc 100644
--- a/examples/svelte-kitchen-sink/package.json
+++ b/examples/svelte-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte-example",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build-storybook": "build-storybook -s public",
@@ -10,18 +10,18 @@
     "global": "^4.3.2"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
-    "@storybook/svelte": "6.0.0-beta.7"
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/svelte": "6.0.0-beta.8"
   },
   "storybook": {
     "chromatic": {
diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json
index 4978ac6c7844..faac00b0f1af 100644
--- a/examples/vue-kitchen-sink/package.json
+++ b/examples/vue-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-example",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules",
@@ -14,18 +14,18 @@
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
-    "@storybook/vue": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/vue": "6.0.0-beta.8",
     "babel-core": "^7.0.0-bridge.0",
     "babel-loader": "^8.0.5",
     "cross-env": "^7.0.0",
diff --git a/examples/web-components-kitchen-sink/package.json b/examples/web-components-kitchen-sink/package.json
index 2c544d4d7472..f5c50cce76bb 100644
--- a/examples/web-components-kitchen-sink/package.json
+++ b/examples/web-components-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web-components-kitchen-sink",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "private": true,
   "description": "",
   "keywords": [],
@@ -12,23 +12,23 @@
     "storybook": "start-storybook -p 9006"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "6.0.0-beta.7",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-backgrounds": "6.0.0-beta.7",
-    "@storybook/addon-docs": "6.0.0-beta.7",
-    "@storybook/addon-events": "6.0.0-beta.7",
-    "@storybook/addon-jest": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addon-storysource": "6.0.0-beta.7",
-    "@storybook/addon-viewport": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/core": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/source-loader": "6.0.0-beta.7",
-    "@storybook/web-components": "6.0.0-beta.7",
+    "@storybook/addon-a11y": "6.0.0-beta.8",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-backgrounds": "6.0.0-beta.8",
+    "@storybook/addon-docs": "6.0.0-beta.8",
+    "@storybook/addon-events": "6.0.0-beta.8",
+    "@storybook/addon-jest": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addon-storysource": "6.0.0-beta.8",
+    "@storybook/addon-viewport": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/core": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/source-loader": "6.0.0-beta.8",
+    "@storybook/web-components": "6.0.0-beta.8",
     "babel-loader": "^8.0.5",
     "eventemitter3": "^4.0.0",
     "format-json": "^1.0.3",
diff --git a/lerna.json b/lerna.json
index 72595b43cb8b..06a2417d80bd 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,5 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "registry": "https://registry.npmjs.org",
-  "version": "6.0.0-beta.7"
+  "version": "6.0.0-beta.8"
 }
diff --git a/lib/addons/package.json b/lib/addons/package.json
index 7e61d3a1d955..d394f979b005 100644
--- a/lib/addons/package.json
+++ b/lib/addons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addons",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook addons store",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/channels": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/router": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/channels": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/router": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "regenerator-runtime": "^0.13.3"
diff --git a/lib/api/package.json b/lib/api/package.json
index ce303b825f2f..f09e9611af3a 100644
--- a/lib/api/package.json
+++ b/lib/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/api",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Core Storybook API & Context",
   "keywords": [
     "storybook"
@@ -28,12 +28,12 @@
   },
   "dependencies": {
     "@reach/router": "^1.3.3",
-    "@storybook/channels": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
+    "@storybook/channels": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
     "@storybook/csf": "0.0.1",
-    "@storybook/router": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/router": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "@types/reach__router": "^1.2.3",
     "core-js": "^3.0.1",
     "fast-deep-equal": "^3.1.1",
diff --git a/lib/api/src/version.ts b/lib/api/src/version.ts
index e4c4abfb3e05..19af512dd8f6 100644
--- a/lib/api/src/version.ts
+++ b/lib/api/src/version.ts
@@ -1 +1 @@
-export const version = '6.0.0-beta.7';
+export const version = '6.0.0-beta.8';
diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json
index b3b84d1e2fec..79f18d14a4c0 100644
--- a/lib/channel-postmessage/package.json
+++ b/lib/channel-postmessage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-postmessage",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "",
   "keywords": [
     "storybook"
@@ -28,9 +28,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/channels": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
+    "@storybook/channels": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "telejson": "^4.0.0"
diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json
index 6937b7f763ca..3e1ce98decd9 100644
--- a/lib/channel-websocket/package.json
+++ b/lib/channel-websocket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channel-websocket",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "",
   "keywords": [
     "storybook"
@@ -28,7 +28,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/channels": "6.0.0-beta.7",
+    "@storybook/channels": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "global": "^4.3.2",
     "telejson": "^4.0.0"
diff --git a/lib/channels/package.json b/lib/channels/package.json
index ac29ccc3374a..4285316ec597 100644
--- a/lib/channels/package.json
+++ b/lib/channels/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/channels",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/lib/cli-sb/package.json b/lib/cli-sb/package.json
index c6846fa254a2..f6d0bf2c5f5b 100644
--- a/lib/cli-sb/package.json
+++ b/lib/cli-sb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sb",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"
@@ -22,7 +22,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/cli": "6.0.0-beta.7"
+    "@storybook/cli": "6.0.0-beta.8"
   },
   "publishConfig": {
     "access": "public"
diff --git a/lib/cli-storybook/package.json b/lib/cli-storybook/package.json
index 7fe2a851b474..6a19cf6a1875 100644
--- a/lib/cli-storybook/package.json
+++ b/lib/cli-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "storybook",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook CLI",
   "keywords": [
     "storybook"
@@ -23,7 +23,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/cli": "6.0.0-beta.7"
+    "@storybook/cli": "6.0.0-beta.8"
   },
   "publishConfig": {
     "access": "public"
diff --git a/lib/cli/package.json b/lib/cli/package.json
index 669139e559bb..d3e883e60697 100644
--- a/lib/cli/package.json
+++ b/lib/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",
@@ -39,8 +39,8 @@
   "dependencies": {
     "@babel/core": "^7.9.6",
     "@babel/preset-env": "^7.9.6",
-    "@storybook/codemod": "6.0.0-beta.7",
-    "@storybook/node-logger": "6.0.0-beta.7",
+    "@storybook/codemod": "6.0.0-beta.8",
+    "@storybook/node-logger": "6.0.0-beta.8",
     "chalk": "^4.0.0",
     "commander": "^5.0.0",
     "core-js": "^3.0.1",
@@ -62,30 +62,30 @@
     "update-notifier": "^4.0.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-graphql": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/addon-links": "6.0.0-beta.7",
-    "@storybook/addon-storyshots": "6.0.0-beta.7",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/angular": "6.0.0-beta.7",
-    "@storybook/channel-postmessage": "6.0.0-beta.7",
-    "@storybook/channel-websocket": "6.0.0-beta.7",
-    "@storybook/channels": "6.0.0-beta.7",
-    "@storybook/ember": "6.0.0-beta.7",
-    "@storybook/html": "6.0.0-beta.7",
-    "@storybook/marionette": "6.0.0-beta.7",
-    "@storybook/marko": "6.0.0-beta.7",
-    "@storybook/mithril": "6.0.0-beta.7",
-    "@storybook/preact": "6.0.0-beta.7",
-    "@storybook/rax": "6.0.0-beta.7",
-    "@storybook/react": "6.0.0-beta.7",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-graphql": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/addon-links": "6.0.0-beta.8",
+    "@storybook/addon-storyshots": "6.0.0-beta.8",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/angular": "6.0.0-beta.8",
+    "@storybook/channel-postmessage": "6.0.0-beta.8",
+    "@storybook/channel-websocket": "6.0.0-beta.8",
+    "@storybook/channels": "6.0.0-beta.8",
+    "@storybook/ember": "6.0.0-beta.8",
+    "@storybook/html": "6.0.0-beta.8",
+    "@storybook/marionette": "6.0.0-beta.8",
+    "@storybook/marko": "6.0.0-beta.8",
+    "@storybook/mithril": "6.0.0-beta.8",
+    "@storybook/preact": "6.0.0-beta.8",
+    "@storybook/rax": "6.0.0-beta.8",
+    "@storybook/react": "6.0.0-beta.8",
     "@storybook/react-native": "6.0.0-alpha.0",
-    "@storybook/riot": "6.0.0-beta.7",
-    "@storybook/svelte": "6.0.0-beta.7",
-    "@storybook/ui": "6.0.0-beta.7",
-    "@storybook/vue": "6.0.0-beta.7",
-    "@storybook/web-components": "6.0.0-beta.7",
+    "@storybook/riot": "6.0.0-beta.8",
+    "@storybook/svelte": "6.0.0-beta.8",
+    "@storybook/ui": "6.0.0-beta.8",
+    "@storybook/vue": "6.0.0-beta.8",
+    "@storybook/web-components": "6.0.0-beta.8",
     "@types/cross-spawn": "^6.0.1",
     "@types/inquirer": "^6.5.0",
     "@types/puppeteer-core": "^2.0.0",
diff --git a/lib/client-api/package.json b/lib/client-api/package.json
index 810734a89e13..cc5379e42d50 100644
--- a/lib/client-api/package.json
+++ b/lib/client-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-api",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook Client API",
   "keywords": [
     "storybook"
@@ -28,11 +28,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/channel-postmessage": "6.0.0-beta.7",
-    "@storybook/channels": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/channel-postmessage": "6.0.0-beta.8",
+    "@storybook/channels": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
     "@storybook/csf": "0.0.1",
     "@types/webpack-env": "^1.15.2",
     "core-js": "^3.0.1",
diff --git a/lib/client-logger/package.json b/lib/client-logger/package.json
index 704cca7eff79..0321ba6c71ce 100644
--- a/lib/client-logger/package.json
+++ b/lib/client-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/client-logger",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/lib/codemod/package.json b/lib/codemod/package.json
index f3922bbcd604..64b59d883baa 100644
--- a/lib/codemod/package.json
+++ b/lib/codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/codemod",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "A collection of codemod scripts written with JSCodeshift",
   "keywords": [
     "storybook"
@@ -30,7 +30,7 @@
   "dependencies": {
     "@mdx-js/mdx": "^1.5.1",
     "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.0.0-beta.7",
+    "@storybook/node-logger": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "cross-spawn": "^7.0.0",
     "globby": "^11.0.0",
diff --git a/lib/components/package.json b/lib/components/package.json
index 471a275d8185..5bd3bcaf414a 100644
--- a/lib/components/package.json
+++ b/lib/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/components",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Core Storybook Components",
   "keywords": [
     "storybook"
@@ -28,9 +28,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/client-logger": "6.0.0-beta.7",
+    "@storybook/client-logger": "6.0.0-beta.8",
     "@storybook/csf": "0.0.1",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/theming": "6.0.0-beta.8",
     "@types/overlayscrollbars": "^1.9.0",
     "@types/react-color": "^3.0.1",
     "@types/react-syntax-highlighter": "11.0.4",
diff --git a/lib/core-events/package.json b/lib/core-events/package.json
index 7f838d7151e1..092e8c59c091 100644
--- a/lib/core-events/package.json
+++ b/lib/core-events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core-events",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Event names used in storybook core",
   "keywords": [
     "storybook"
diff --git a/lib/core/package.json b/lib/core/package.json
index 9c0aee4f2c01..c9b8d4b7283a 100644
--- a/lib/core/package.json
+++ b/lib/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/core",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook framework-agnostic API",
   "keywords": [
     "storybook"
@@ -38,17 +38,17 @@
     "@babel/preset-react": "^7.8.3",
     "@babel/preset-typescript": "^7.8.3",
     "@babel/register": "^7.8.3",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/channel-postmessage": "6.0.0-beta.7",
-    "@storybook/client-api": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/channel-postmessage": "6.0.0-beta.8",
+    "@storybook/client-api": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
     "@storybook/csf": "0.0.1",
-    "@storybook/node-logger": "6.0.0-beta.7",
-    "@storybook/router": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
-    "@storybook/ui": "6.0.0-beta.7",
+    "@storybook/node-logger": "6.0.0-beta.8",
+    "@storybook/router": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
+    "@storybook/ui": "6.0.0-beta.8",
     "@types/node-fetch": "^2.5.4",
     "airbnb-js-shims": "^2.2.1",
     "ansi-to-html": "^0.6.11",
diff --git a/lib/node-logger/package.json b/lib/node-logger/package.json
index 937317cd0730..6cf0d0dddf00 100644
--- a/lib/node-logger/package.json
+++ b/lib/node-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/node-logger",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "",
   "keywords": [
     "storybook"
diff --git a/lib/postinstall/package.json b/lib/postinstall/package.json
index bb85491ee343..d83cf824c1f9 100644
--- a/lib/postinstall/package.json
+++ b/lib/postinstall/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/postinstall",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Storybook addons postinstall utilities",
   "keywords": [
     "api",
diff --git a/lib/router/package.json b/lib/router/package.json
index c62821b3b8ee..6e9f69f47ce5 100644
--- a/lib/router/package.json
+++ b/lib/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/router",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Core Storybook Router",
   "keywords": [
     "storybook"
diff --git a/lib/source-loader/package.json b/lib/source-loader/package.json
index 686ada331b15..4c624f348897 100644
--- a/lib/source-loader/package.json
+++ b/lib/source-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/source-loader",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Source loader",
   "keywords": [
     "lib",
@@ -29,8 +29,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
     "@storybook/csf": "0.0.1",
     "core-js": "^3.0.1",
     "estraverse": "^4.2.0",
diff --git a/lib/theming/package.json b/lib/theming/package.json
index 7633a66ade83..f1dd0a60aaff 100644
--- a/lib/theming/package.json
+++ b/lib/theming/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/theming",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Core Storybook Components",
   "keywords": [
     "storybook"
@@ -31,7 +31,7 @@
     "@emotion/core": "^10.0.20",
     "@emotion/is-prop-valid": "^0.8.6",
     "@emotion/styled": "^10.0.17",
-    "@storybook/client-logger": "6.0.0-beta.7",
+    "@storybook/client-logger": "6.0.0-beta.8",
     "core-js": "^3.0.1",
     "deep-object-diff": "^1.1.0",
     "emotion-theming": "^10.0.19",
diff --git a/lib/ui/package.json b/lib/ui/package.json
index f7eebb25a88e..5fc5dbb3c9db 100644
--- a/lib/ui/package.json
+++ b/lib/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/ui",
-  "version": "6.0.0-beta.7",
+  "version": "6.0.0-beta.8",
   "description": "Core Storybook UI",
   "keywords": [
     "storybook"
@@ -29,14 +29,14 @@
   },
   "dependencies": {
     "@emotion/core": "^10.0.20",
-    "@storybook/addons": "6.0.0-beta.7",
-    "@storybook/api": "6.0.0-beta.7",
-    "@storybook/channels": "6.0.0-beta.7",
-    "@storybook/client-logger": "6.0.0-beta.7",
-    "@storybook/components": "6.0.0-beta.7",
-    "@storybook/core-events": "6.0.0-beta.7",
-    "@storybook/router": "6.0.0-beta.7",
-    "@storybook/theming": "6.0.0-beta.7",
+    "@storybook/addons": "6.0.0-beta.8",
+    "@storybook/api": "6.0.0-beta.8",
+    "@storybook/channels": "6.0.0-beta.8",
+    "@storybook/client-logger": "6.0.0-beta.8",
+    "@storybook/components": "6.0.0-beta.8",
+    "@storybook/core-events": "6.0.0-beta.8",
+    "@storybook/router": "6.0.0-beta.8",
+    "@storybook/theming": "6.0.0-beta.8",
     "@types/markdown-to-jsx": "^6.9.1",
     "@types/rfdc": "^1.1.0",
     "copy-to-clipboard": "^3.0.8",
@@ -66,9 +66,9 @@
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",
-    "@storybook/addon-actions": "6.0.0-beta.7",
-    "@storybook/addon-knobs": "6.0.0-beta.7",
-    "@storybook/react": "6.0.0-beta.7",
+    "@storybook/addon-actions": "6.0.0-beta.8",
+    "@storybook/addon-knobs": "6.0.0-beta.8",
+    "@storybook/react": "6.0.0-beta.8",
     "@testing-library/react": "^10.0.3",
     "babel-loader": "^8.0.6",
     "chromatic": "^4.0.2",
diff --git a/scripts/build-package.js b/scripts/build-package.js
index 7a7663c1446b..71e36dd6e81f 100644
--- a/scripts/build-package.js
+++ b/scripts/build-package.js
@@ -136,14 +136,23 @@ function run() {
           .map((key) => key.suffix)
           .filter(Boolean);
 
-        const glob =
+        let glob =
           packageNames.length > 1
             ? `@storybook/{${packageNames.join(',')}}`
             : `@storybook/${packageNames[0]}`;
 
+        const isAllPackages = process.argv.includes('--all');
+        if (isAllPackages) {
+          glob = '@storybook/*';
+
+          log.warn(
+            'You are building a lot of packages on watch mode. This is an expensive action and might slow your computer down.\nIf this is an issue, run yarn build to filter packages and speed things up!'
+          );
+        }
+
         if (watchMode) {
           const runWatchMode = () => {
-            const baseWatchCommand = `lerna exec --scope "${glob}" -- cross-env-shell node ${resolve(
+            const baseWatchCommand = `lerna exec --scope '${glob}' --parallel -- cross-env-shell node ${resolve(
               __dirname
             )}`;
             const watchTsc = `${baseWatchCommand}/watch-tsc.js`;
@@ -152,24 +161,7 @@ function run() {
             spawn(command);
           };
 
-          if (packageNames.length < 5) {
-            runWatchMode();
-          } else {
-            inquirer
-              .prompt([
-                {
-                  type: 'confirm',
-                  message:
-                    'You selected a lot of packages on watch mode. This is a very expensive action and might slow your computer down. Do you want to continue?',
-                  name: 'confirmation',
-                },
-              ])
-              .then(({ confirmation }) => {
-                if (confirmation === true) {
-                  runWatchMode();
-                }
-              });
-          }
+          runWatchMode();
         } else {
           spawn(`lerna run prepare --scope "${glob}"`);
         }