diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/integration/issue-7610/output.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/integration/issue-7610/output.js
index f88cec0562..7b302c8c33 100644
--- a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/integration/issue-7610/output.js
+++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/integration/issue-7610/output.js
@@ -11,12 +11,11 @@ var _Child2 = babelHelpers.interopRequireDefault(require("./Child"));
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-function MyComponent(_ref) {
+function MyComponent({
+  closeFn
+}) {
   var _Child;
 
-  let {
-    closeFn
-  } = _ref;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Parent.default, {
     render: () => _Child || (_Child = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Child2.default, {
       closeFn: closeFn
diff --git a/packages/babel-preset-env/package.json b/packages/babel-preset-env/package.json
index 629b6a23fc..f415bb4ea1 100644
--- a/packages/babel-preset-env/package.json
+++ b/packages/babel-preset-env/package.json
@@ -83,7 +83,7 @@
     "@babel/plugin-transform-typeof-symbol": "workspace:^7.14.5",
     "@babel/plugin-transform-unicode-escapes": "workspace:^7.14.5",
     "@babel/plugin-transform-unicode-regex": "workspace:^7.14.5",
-    "@babel/preset-modules": "^0.1.4",
+    "@babel/preset-modules": "^0.1.5",
     "@babel/types": "workspace:^7.15.6",
     "babel-plugin-polyfill-corejs2": "^0.2.2",
     "babel-plugin-polyfill-corejs3": "^0.2.5",
diff --git a/packages/babel-preset-env/src/normalize-options.ts b/packages/babel-preset-env/src/normalize-options.ts
index 955f2bfadd..6625bed189 100644
--- a/packages/babel-preset-env/src/normalize-options.ts
+++ b/packages/babel-preset-env/src/normalize-options.ts
@@ -231,7 +231,7 @@ export default function normalizeOptions(opts: Options) {
     bugfixes: v.validateBooleanOption(
       TopLevelOptions.bugfixes,
       opts.bugfixes,
-      false,
+      process.env.BABEL_8_BREAKING ? true : false,
     ),
     configPath: v.validateStringOption(
       TopLevelOptions.configPath,
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/output.mjs
index d4236e4c00..0fe51d3696 100644
--- a/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/output.mjs
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/output.mjs
@@ -1,3 +1,3 @@
 import "core-js/modules/es6.array.iterator.js";
 import "core-js/modules/web.dom.iterable.js";
-var a = new Map();
+const a = new Map();
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/stdout.txt b/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/stdout.txt
index cefcc60810..d7365956cb 100644
--- a/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/stdout.txt
@@ -22,21 +22,23 @@ Using plugins:
   proposal-numeric-separator { android, chrome < 75, edge < 79, firefox < 70, ios < 13, opera < 62, safari < 13, samsung < 11 }
   proposal-logical-assignment-operators { android, chrome < 85, edge < 85, firefox < 79, ios < 14, node < 15, opera < 71, safari < 14, samsung < 14 }
   proposal-nullish-coalescing-operator { android, chrome < 80, edge < 80, firefox < 72, ios < 13.4, node < 14, opera < 67, safari < 13.1, samsung < 13 }
-  proposal-optional-chaining { android, chrome < 91, edge, firefox < 74, ios < 13.4, node, opera, safari < 13.1, samsung }
+  proposal-optional-chaining { android, chrome < 80, edge < 80, firefox < 74, ios < 13.4, node < 14, opera < 67, safari < 13.1, samsung < 13 }
   proposal-json-strings { android, chrome < 66, edge < 79, firefox < 62, ios < 12, opera < 53, safari < 12, samsung < 9 }
   proposal-optional-catch-binding { android, chrome < 66, edge < 79, ios < 11.3, opera < 53, safari < 11.1, samsung < 9 }
-  transform-parameters { edge < 18, ios, safari }
   proposal-async-generator-functions { android, chrome < 63, edge < 79, ios < 12, opera < 50, safari < 12 }
   proposal-object-rest-spread { edge < 79, ios < 11.3, safari < 11.1 }
   transform-dotall-regex { android, chrome < 62, edge < 79, firefox < 78, ios < 11.3, opera < 49, safari < 11.1 }
   proposal-unicode-property-regex { android, chrome < 64, edge < 79, firefox < 78, ios < 11.3, opera < 51, safari < 11.1, samsung < 9 }
   transform-named-capturing-groups-regex { android, chrome < 64, edge < 79, firefox < 78, ios < 11.3, opera < 51, safari < 11.1, samsung < 9 }
-  transform-async-to-generator { ios < 11, safari < 11 }
-  transform-template-literals { ios < 13, safari < 13 }
-  transform-function-name { edge < 79 }
   transform-unicode-regex { ios < 12, safari < 12 }
-  transform-block-scoping { ios < 11, safari < 11 }
   proposal-export-namespace-from { android < 72, chrome < 72, edge < 79, firefox < 80, ios, opera < 60, safari, samsung < 11.0 }
+  bugfix/transform-async-arrows-in-class { ios < 11, safari < 11 }
+  bugfix/transform-edge-default-parameters { edge < 18 }
+  bugfix/transform-edge-function-name { edge < 79 }
+  bugfix/transform-safari-block-shadowing { ios < 11, safari < 11 }
+  bugfix/transform-safari-for-shadowing { ios < 11, safari < 11 }
+  bugfix/transform-safari-id-destructuring-collision-in-function-expression { ios, safari }
+  bugfix/transform-tagged-template-caching { ios < 13, safari < 13 }
   syntax-dynamic-import
 corejs2: `DEBUG` option
 
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/output.mjs
index 01bfd8cde3..364413b753 100644
--- a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/output.mjs
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/output.mjs
@@ -1,5 +1,3 @@
 import "core-js/modules/web.dom.iterable.js";
 
-function a(_ref) {
-  let [b, c] = _ref;
-}
+function a([b, c]) {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/output.mjs
index 38658887bc..34a45741bf 100644
--- a/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/output.mjs
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/output.mjs
@@ -1,3 +1,3 @@
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/web.dom-collections.iterator.js";
-var a = new Map();
+const a = new Map();
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/stdout.txt b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/stdout.txt
index f9f2715652..f2296e3243 100644
--- a/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/stdout.txt
@@ -22,21 +22,23 @@ Using plugins:
   proposal-numeric-separator { android, chrome < 75, edge < 79, firefox < 70, ios < 13, opera < 62, safari < 13, samsung < 11 }
   proposal-logical-assignment-operators { android, chrome < 85, edge < 85, firefox < 79, ios < 14, node < 15, opera < 71, safari < 14, samsung < 14 }
   proposal-nullish-coalescing-operator { android, chrome < 80, edge < 80, firefox < 72, ios < 13.4, node < 14, opera < 67, safari < 13.1, samsung < 13 }
-  proposal-optional-chaining { android, chrome < 91, edge, firefox < 74, ios < 13.4, node, opera, safari < 13.1, samsung }
+  proposal-optional-chaining { android, chrome < 80, edge < 80, firefox < 74, ios < 13.4, node < 14, opera < 67, safari < 13.1, samsung < 13 }
   proposal-json-strings { android, chrome < 66, edge < 79, firefox < 62, ios < 12, opera < 53, safari < 12, samsung < 9 }
   proposal-optional-catch-binding { android, chrome < 66, edge < 79, ios < 11.3, opera < 53, safari < 11.1, samsung < 9 }
-  transform-parameters { edge < 18, ios, safari }
   proposal-async-generator-functions { android, chrome < 63, edge < 79, ios < 12, opera < 50, safari < 12 }
   proposal-object-rest-spread { edge < 79, ios < 11.3, safari < 11.1 }
   transform-dotall-regex { android, chrome < 62, edge < 79, firefox < 78, ios < 11.3, opera < 49, safari < 11.1 }
   proposal-unicode-property-regex { android, chrome < 64, edge < 79, firefox < 78, ios < 11.3, opera < 51, safari < 11.1, samsung < 9 }
   transform-named-capturing-groups-regex { android, chrome < 64, edge < 79, firefox < 78, ios < 11.3, opera < 51, safari < 11.1, samsung < 9 }
-  transform-async-to-generator { ios < 11, safari < 11 }
-  transform-template-literals { ios < 13, safari < 13 }
-  transform-function-name { edge < 79 }
   transform-unicode-regex { ios < 12, safari < 12 }
-  transform-block-scoping { ios < 11, safari < 11 }
   proposal-export-namespace-from { android < 72, chrome < 72, edge < 79, firefox < 80, ios, opera < 60, safari, samsung < 11.0 }
+  bugfix/transform-async-arrows-in-class { ios < 11, safari < 11 }
+  bugfix/transform-edge-default-parameters { edge < 18 }
+  bugfix/transform-edge-function-name { edge < 79 }
+  bugfix/transform-safari-block-shadowing { ios < 11, safari < 11 }
+  bugfix/transform-safari-for-shadowing { ios < 11, safari < 11 }
+  bugfix/transform-safari-id-destructuring-collision-in-function-expression { ios, safari }
+  bugfix/transform-tagged-template-caching { ios < 13, safari < 13 }
   syntax-dynamic-import
 corejs3: `DEBUG` option
 
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/output.mjs
index bb6e54e46a..0b8c72fe4c 100644
--- a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/output.mjs
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/output.mjs
@@ -1,3 +1 @@
-function a(_ref) {
-  let [b, c] = _ref;
-}
+function a([b, c]) {}
diff --git a/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults-not-ie/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults-not-ie/stdout.txt
index 7b8fd41699..3e1d313f67 100644
--- a/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults-not-ie/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults-not-ie/stdout.txt
@@ -21,13 +21,14 @@ Using plugins:
   syntax-numeric-separator
   proposal-logical-assignment-operators { firefox < 79, ios < 14, samsung < 14 }
   syntax-nullish-coalescing-operator
-  proposal-optional-chaining { android, chrome < 91, edge, opera, samsung }
+  syntax-optional-chaining
   syntax-json-strings
   syntax-optional-catch-binding
-  transform-parameters { ios, safari }
   syntax-async-generators
   syntax-object-rest-spread
   proposal-export-namespace-from { firefox < 80, ios, safari }
+  bugfix/transform-safari-id-destructuring-collision-in-function-expression { ios, safari }
+  bugfix/transform-v8-spread-parameters-in-optional-chaining { android, chrome < 91, edge, opera, samsung }
   transform-modules-commonjs
   proposal-dynamic-import
 
diff --git a/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults/stdout.txt
index e2c6f00a28..4ce62fd100 100644
--- a/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/browserslists-defaults/stdout.txt
@@ -22,10 +22,10 @@ Using plugins:
   proposal-numeric-separator { ie }
   proposal-logical-assignment-operators { firefox < 79, ie, ios < 14, samsung < 14 }
   proposal-nullish-coalescing-operator { ie }
-  proposal-optional-chaining { android, chrome < 91, edge, ie, opera, samsung }
+  proposal-optional-chaining { ie }
   proposal-json-strings { ie }
   proposal-optional-catch-binding { ie }
-  transform-parameters { ie, ios, safari }
+  transform-parameters { ie }
   proposal-async-generator-functions { ie }
   proposal-object-rest-spread { ie }
   transform-dotall-regex { ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/browserslists-last-2-versions-not-ie/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/browserslists-last-2-versions-not-ie/stdout.txt
index a7b495ce46..b993818541 100644
--- a/packages/babel-preset-env/test/fixtures/debug/browserslists-last-2-versions-not-ie/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/browserslists-last-2-versions-not-ie/stdout.txt
@@ -21,13 +21,14 @@ Using plugins:
   syntax-numeric-separator
   proposal-logical-assignment-operators { samsung < 14 }
   syntax-nullish-coalescing-operator
-  proposal-optional-chaining { android, chrome < 91, edge, opera, samsung }
+  syntax-optional-chaining
   syntax-json-strings
   syntax-optional-catch-binding
-  transform-parameters { ios, safari }
   syntax-async-generators
   syntax-object-rest-spread
   proposal-export-namespace-from { ios, safari }
+  bugfix/transform-safari-id-destructuring-collision-in-function-expression { ios, safari }
+  bugfix/transform-v8-spread-parameters-in-optional-chaining { android, chrome < 91, edge, opera, samsung }
   transform-modules-commonjs
   proposal-dynamic-import
 
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-electron/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-electron/stdout.txt
index a0325966c2..191bd466e7 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-electron/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-electron/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { electron < 6.0 }
   proposal-logical-assignment-operators { electron < 10.0 }
   proposal-nullish-coalescing-operator { electron < 8.0 }
-  proposal-optional-chaining { electron < 13.0 }
+  proposal-optional-chaining { electron < 8.0 }
   proposal-json-strings { electron < 3.0 }
   proposal-optional-catch-binding { electron < 3.0 }
   transform-parameters { electron < 0.37 }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-force-all-transforms/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-force-all-transforms/stdout.txt
index 593d2afccb..305e6c3ecf 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-force-all-transforms/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-force-all-transforms/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   proposal-json-strings { chrome < 66 }
   proposal-optional-catch-binding { chrome < 66 }
   transform-parameters { }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-no-import/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-no-import/stdout.txt
index 89ddbdedf9..540d8b518e 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-no-import/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-no-import/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { node < 12.5 }
   proposal-logical-assignment-operators { node < 15 }
   proposal-nullish-coalescing-operator { node < 14 }
-  proposal-optional-chaining { node }
+  proposal-optional-chaining { node < 14 }
   proposal-json-strings { node < 10 }
   proposal-optional-catch-binding { node < 10 }
   proposal-async-generator-functions { node < 10 }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-proposals-chrome-71/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-proposals-chrome-71/stdout.txt
index 62ed74fbde..84f70dcb04 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-proposals-chrome-71/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-proposals-chrome-71/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-shippedProposals-chrome-71/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-shippedProposals-chrome-71/stdout.txt
index d4092d86b7..2315a35771 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-shippedProposals-chrome-71/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-shippedProposals-chrome-71/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-specific-targets/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-specific-targets/stdout.txt
index 6b13feeff7..abe28fe5ab 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-specific-targets/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-specific-targets/stdout.txt
@@ -19,20 +19,20 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, edge < 79, firefox < 70, ie, ios < 13, safari < 13 }
   proposal-logical-assignment-operators { chrome < 85, edge < 85, firefox < 79, ie, ios < 14, safari < 14 }
   proposal-nullish-coalescing-operator { chrome < 80, edge < 80, firefox < 72, ie, ios < 13.4, safari < 13.1 }
-  proposal-optional-chaining { chrome < 91, edge, firefox < 74, ie, ios < 13.4, safari < 13.1 }
+  proposal-optional-chaining { chrome < 80, edge < 80, firefox < 74, ie, ios < 13.4, safari < 13.1 }
   proposal-json-strings { chrome < 66, edge < 79, firefox < 62, ie, ios < 12, safari < 12 }
   proposal-optional-catch-binding { chrome < 66, edge < 79, firefox < 58, ie, ios < 11.3, safari < 11.1 }
-  transform-parameters { edge < 18, firefox < 53, ie, ios, safari }
+  transform-parameters { edge < 15, firefox < 53, ie, ios < 10, safari < 10 }
   proposal-async-generator-functions { chrome < 63, edge < 79, firefox < 57, ie, ios < 12, safari < 12 }
   proposal-object-rest-spread { chrome < 60, edge < 79, firefox < 55, ie, ios < 11.3, safari < 11.1 }
   transform-dotall-regex { chrome < 62, edge < 79, firefox < 78, ie, ios < 11.3, safari < 11.1 }
   proposal-unicode-property-regex { chrome < 64, edge < 79, firefox < 78, ie, ios < 11.3, safari < 11.1 }
   transform-named-capturing-groups-regex { chrome < 64, edge < 79, firefox < 78, ie, ios < 11.3, safari < 11.1 }
-  transform-async-to-generator { chrome < 55, edge < 15, firefox < 52, ie, ios < 11, safari < 11 }
+  transform-async-to-generator { chrome < 55, edge < 15, firefox < 52, ie, ios < 10.3, safari < 10.1 }
   transform-exponentiation-operator { edge < 14, firefox < 52, ie, ios < 10.3, safari < 10.1 }
-  transform-template-literals { ie, ios < 13, safari < 13 }
+  transform-template-literals { ie, safari < 9 }
   transform-literals { firefox < 53, ie, safari < 9 }
-  transform-function-name { edge < 79, firefox < 53, ie, ios < 10, safari < 10 }
+  transform-function-name { edge < 14, firefox < 53, ie, ios < 10, safari < 10 }
   transform-arrow-functions { ie, ios < 10, safari < 10 }
   transform-block-scoped-functions { ie < 11, ios < 10, safari < 10 }
   transform-classes { ie, ios < 10, safari < 10 }
@@ -46,7 +46,7 @@ Using plugins:
   transform-unicode-regex { ie, ios < 12, safari < 12 }
   transform-spread { ie, ios < 10, safari < 10 }
   transform-destructuring { edge < 15, firefox < 53, ie, ios < 10, safari < 10 }
-  transform-block-scoping { edge < 14, firefox < 51, ie, ios < 11, safari < 11 }
+  transform-block-scoping { edge < 14, firefox < 51, ie, ios < 10, safari < 10 }
   transform-typeof-symbol { ie, safari < 9 }
   transform-new-target { edge < 14, ie, ios < 10, safari < 10 }
   transform-regenerator { firefox < 53, ie, ios < 10, safari < 10 }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-versions-decimals/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-versions-decimals/stdout.txt
index 5cc73e8c5c..c48076c599 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-versions-decimals/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-versions-decimals/stdout.txt
@@ -17,7 +17,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, electron < 6.0, ie, node < 12.5 }
   proposal-logical-assignment-operators { chrome < 85, electron < 10.0, ie, node < 15 }
   proposal-nullish-coalescing-operator { chrome < 80, electron < 8.0, ie, node < 14 }
-  proposal-optional-chaining { chrome < 91, electron < 13.0, ie, node }
+  proposal-optional-chaining { chrome < 80, electron < 8.0, ie, node < 14 }
   proposal-json-strings { chrome < 66, electron < 3.0, ie, node < 10 }
   proposal-optional-catch-binding { chrome < 66, electron < 3.0, ie, node < 10 }
   transform-parameters { electron < 0.37, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-versions-strings/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-versions-strings/stdout.txt
index 141d556792..ffdca66ff1 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-versions-strings/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2-versions-strings/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, ie, node < 12.5 }
   proposal-logical-assignment-operators { chrome < 85, ie, node < 15 }
   proposal-nullish-coalescing-operator { chrome < 80, ie, node < 14 }
-  proposal-optional-chaining { chrome < 91, ie, node }
+  proposal-optional-chaining { chrome < 80, ie, node < 14 }
   proposal-json-strings { chrome < 66, ie, node < 10 }
   proposal-optional-catch-binding { chrome < 66, ie, node < 10 }
   transform-parameters { ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2/stdout.txt
index 675e5638ef..1b1fb01a1c 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs2/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, ie, node < 12.5 }
   proposal-logical-assignment-operators { chrome < 85, ie, node < 15 }
   proposal-nullish-coalescing-operator { chrome < 80, ie, node < 14 }
-  proposal-optional-chaining { chrome < 91, ie, node }
+  proposal-optional-chaining { chrome < 80, ie, node < 14 }
   proposal-json-strings { chrome < 66, ie, node < 10 }
   proposal-optional-catch-binding { chrome < 66, ie, node < 10 }
   transform-parameters { ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-all-chrome-71/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-all-chrome-71/stdout.txt
index 15a4065adf..14b8e11182 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-all-chrome-71/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-all-chrome-71/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-electron/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-electron/stdout.txt
index 571deeed0c..900bb51ff5 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-electron/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-electron/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { electron < 6.0 }
   proposal-logical-assignment-operators { electron < 10.0 }
   proposal-nullish-coalescing-operator { electron < 8.0 }
-  proposal-optional-chaining { electron < 13.0 }
+  proposal-optional-chaining { electron < 8.0 }
   proposal-json-strings { electron < 3.0 }
   proposal-optional-catch-binding { electron < 3.0 }
   transform-parameters { electron < 0.37 }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-es-chrome-71/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-es-chrome-71/stdout.txt
index 65a7c2b8a5..ebfbed9029 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-es-chrome-71/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-es-chrome-71/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-es-proposals-chrome-71/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-es-proposals-chrome-71/stdout.txt
index 19f1222af1..a51eb0f4cb 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-es-proposals-chrome-71/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-es-proposals-chrome-71/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-force-all-transforms/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-force-all-transforms/stdout.txt
index ff9ebbfa71..eebb45b1cc 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-force-all-transforms/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-force-all-transforms/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   proposal-json-strings { chrome < 66 }
   proposal-optional-catch-binding { chrome < 66 }
   transform-parameters { }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-no-import/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-no-import/stdout.txt
index 50719a7d50..8f1ea94ccb 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-no-import/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-no-import/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { node < 12.5 }
   proposal-logical-assignment-operators { node < 15 }
   proposal-nullish-coalescing-operator { node < 14 }
-  proposal-optional-chaining { node }
+  proposal-optional-chaining { node < 14 }
   proposal-json-strings { node < 10 }
   proposal-optional-catch-binding { node < 10 }
   proposal-async-generator-functions { node < 10 }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-proposals-chrome-71/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-proposals-chrome-71/stdout.txt
index c6b840160e..8a1e2319fe 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-proposals-chrome-71/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-proposals-chrome-71/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-runtime-only-chrome-71/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-runtime-only-chrome-71/stdout.txt
index 3993756ff1..19b2e8c8de 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-runtime-only-chrome-71/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-runtime-only-chrome-71/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-runtime-only/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-runtime-only/stdout.txt
index 0159d609d6..4e5beec456 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-runtime-only/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-runtime-only/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-specific-entries-chrome-71/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-specific-entries-chrome-71/stdout.txt
index b50e558a34..c74f13e2a1 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-specific-entries-chrome-71/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-specific-entries-chrome-71/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-specific-targets/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-specific-targets/stdout.txt
index 9ee34e5712..46910767b2 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-specific-targets/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-specific-targets/stdout.txt
@@ -19,20 +19,20 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, edge < 79, firefox < 70, ie, ios < 13, safari < 13 }
   proposal-logical-assignment-operators { chrome < 85, edge < 85, firefox < 79, ie, ios < 14, safari < 14 }
   proposal-nullish-coalescing-operator { chrome < 80, edge < 80, firefox < 72, ie, ios < 13.4, safari < 13.1 }
-  proposal-optional-chaining { chrome < 91, edge, firefox < 74, ie, ios < 13.4, safari < 13.1 }
+  proposal-optional-chaining { chrome < 80, edge < 80, firefox < 74, ie, ios < 13.4, safari < 13.1 }
   proposal-json-strings { chrome < 66, edge < 79, firefox < 62, ie, ios < 12, safari < 12 }
   proposal-optional-catch-binding { chrome < 66, edge < 79, firefox < 58, ie, ios < 11.3, safari < 11.1 }
-  transform-parameters { edge < 18, firefox < 53, ie, ios, safari }
+  transform-parameters { edge < 15, firefox < 53, ie, ios < 10, safari < 10 }
   proposal-async-generator-functions { chrome < 63, edge < 79, firefox < 57, ie, ios < 12, safari < 12 }
   proposal-object-rest-spread { chrome < 60, edge < 79, firefox < 55, ie, ios < 11.3, safari < 11.1 }
   transform-dotall-regex { chrome < 62, edge < 79, firefox < 78, ie, ios < 11.3, safari < 11.1 }
   proposal-unicode-property-regex { chrome < 64, edge < 79, firefox < 78, ie, ios < 11.3, safari < 11.1 }
   transform-named-capturing-groups-regex { chrome < 64, edge < 79, firefox < 78, ie, ios < 11.3, safari < 11.1 }
-  transform-async-to-generator { chrome < 55, edge < 15, firefox < 52, ie, ios < 11, safari < 11 }
+  transform-async-to-generator { chrome < 55, edge < 15, firefox < 52, ie, ios < 10.3, safari < 10.1 }
   transform-exponentiation-operator { edge < 14, firefox < 52, ie, ios < 10.3, safari < 10.1 }
-  transform-template-literals { ie, ios < 13, safari < 13 }
+  transform-template-literals { ie, safari < 9 }
   transform-literals { firefox < 53, ie, safari < 9 }
-  transform-function-name { edge < 79, firefox < 53, ie, ios < 10, safari < 10 }
+  transform-function-name { edge < 14, firefox < 53, ie, ios < 10, safari < 10 }
   transform-arrow-functions { ie, ios < 10, safari < 10 }
   transform-block-scoped-functions { ie < 11, ios < 10, safari < 10 }
   transform-classes { ie, ios < 10, safari < 10 }
@@ -46,7 +46,7 @@ Using plugins:
   transform-unicode-regex { ie, ios < 12, safari < 12 }
   transform-spread { ie, ios < 10, safari < 10 }
   transform-destructuring { edge < 15, firefox < 53, ie, ios < 10, safari < 10 }
-  transform-block-scoping { edge < 14, firefox < 51, ie, ios < 11, safari < 11 }
+  transform-block-scoping { edge < 14, firefox < 51, ie, ios < 10, safari < 10 }
   transform-typeof-symbol { ie, safari < 9 }
   transform-new-target { edge < 14, ie, ios < 10, safari < 10 }
   transform-regenerator { firefox < 53, ie, ios < 10, safari < 10 }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stable-chrome-71/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stable-chrome-71/stdout.txt
index d9a700b164..e95367ffb7 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stable-chrome-71/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stable-chrome-71/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stable-samsung-8.2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stable-samsung-8.2/stdout.txt
index 31ec647f6a..baf2906265 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stable-samsung-8.2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stable-samsung-8.2/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { samsung < 11 }
   proposal-logical-assignment-operators { samsung < 14 }
   proposal-nullish-coalescing-operator { samsung < 13 }
-  proposal-optional-chaining { samsung }
+  proposal-optional-chaining { samsung < 13 }
   proposal-json-strings { samsung < 9 }
   proposal-optional-catch-binding { samsung < 9 }
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stage-chrome-71/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stage-chrome-71/stdout.txt
index 02329d2b88..fe413cf6ed 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stage-chrome-71/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-stage-chrome-71/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-decimals/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-decimals/stdout.txt
index 1bc1fc0abd..f852cc248a 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-decimals/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-decimals/stdout.txt
@@ -17,7 +17,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, electron < 6.0, ie, node < 12.5 }
   proposal-logical-assignment-operators { chrome < 85, electron < 10.0, ie, node < 15 }
   proposal-nullish-coalescing-operator { chrome < 80, electron < 8.0, ie, node < 14 }
-  proposal-optional-chaining { chrome < 91, electron < 13.0, ie, node }
+  proposal-optional-chaining { chrome < 80, electron < 8.0, ie, node < 14 }
   proposal-json-strings { chrome < 66, electron < 3.0, ie, node < 10 }
   proposal-optional-catch-binding { chrome < 66, electron < 3.0, ie, node < 10 }
   transform-parameters { electron < 0.37, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings-minor-3.0/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings-minor-3.0/stdout.txt
index 7ed0a38068..e4b5d43e5e 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings-minor-3.0/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings-minor-3.0/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, ie, node < 12.5 }
   proposal-logical-assignment-operators { chrome < 85, ie, node < 15 }
   proposal-nullish-coalescing-operator { chrome < 80, ie, node < 14 }
-  proposal-optional-chaining { chrome < 91, ie, node }
+  proposal-optional-chaining { chrome < 80, ie, node < 14 }
   proposal-json-strings { chrome < 66, ie, node < 10 }
   proposal-optional-catch-binding { chrome < 66, ie, node < 10 }
   transform-parameters { ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings-minor-3.1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings-minor-3.1/stdout.txt
index 4324263c76..bc34a6fe87 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings-minor-3.1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings-minor-3.1/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, ie, node < 12.5 }
   proposal-logical-assignment-operators { chrome < 85, ie, node < 15 }
   proposal-nullish-coalescing-operator { chrome < 80, ie, node < 14 }
-  proposal-optional-chaining { chrome < 91, ie, node }
+  proposal-optional-chaining { chrome < 80, ie, node < 14 }
   proposal-json-strings { chrome < 66, ie, node < 10 }
   proposal-optional-catch-binding { chrome < 66, ie, node < 10 }
   transform-parameters { ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings/stdout.txt
index f89b081084..b16e5487eb 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-versions-strings/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, ie, node < 12.5 }
   proposal-logical-assignment-operators { chrome < 85, ie, node < 15 }
   proposal-nullish-coalescing-operator { chrome < 80, ie, node < 14 }
-  proposal-optional-chaining { chrome < 91, ie, node }
+  proposal-optional-chaining { chrome < 80, ie, node < 14 }
   proposal-json-strings { chrome < 66, ie, node < 10 }
   proposal-optional-catch-binding { chrome < 66, ie, node < 10 }
   transform-parameters { ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-web-chrome-71/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-web-chrome-71/stdout.txt
index 7f90f42a6d..3f41e8943b 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-web-chrome-71/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3-web-chrome-71/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3/stdout.txt
index 63895981d7..ec0c2ea698 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-corejs3/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-corejs3/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, ie, node < 12.5 }
   proposal-logical-assignment-operators { chrome < 85, ie, node < 15 }
   proposal-nullish-coalescing-operator { chrome < 80, ie, node < 14 }
-  proposal-optional-chaining { chrome < 91, ie, node }
+  proposal-optional-chaining { chrome < 80, ie, node < 14 }
   proposal-json-strings { chrome < 66, ie, node < 10 }
   proposal-optional-catch-binding { chrome < 66, ie, node < 10 }
   transform-parameters { ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-no-corejs-no-import/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-no-corejs-no-import/stdout.txt
index 4d76e9029d..da12bb3e53 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-no-corejs-no-import/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-no-corejs-no-import/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { node < 12.5 }
   proposal-logical-assignment-operators { node < 15 }
   proposal-nullish-coalescing-operator { node < 14 }
-  proposal-optional-chaining { node }
+  proposal-optional-chaining { node < 14 }
   proposal-json-strings { node < 10 }
   proposal-optional-catch-binding { node < 10 }
   proposal-async-generator-functions { node < 10 }
diff --git a/packages/babel-preset-env/test/fixtures/debug/entry-no-corejs/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/entry-no-corejs/stdout.txt
index a539b672ca..291c5be929 100644
--- a/packages/babel-preset-env/test/fixtures/debug/entry-no-corejs/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/entry-no-corejs/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, ie, node < 12.5 }
   proposal-logical-assignment-operators { chrome < 85, ie, node < 15 }
   proposal-nullish-coalescing-operator { chrome < 80, ie, node < 14 }
-  proposal-optional-chaining { chrome < 91, ie, node }
+  proposal-optional-chaining { chrome < 80, ie, node < 14 }
   proposal-json-strings { chrome < 66, ie, node < 10 }
   proposal-optional-catch-binding { chrome < 66, ie, node < 10 }
   transform-parameters { ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/plugins-only/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/plugins-only/stdout.txt
index 9f9ed48fb8..c6fdacb84e 100644
--- a/packages/babel-preset-env/test/fixtures/debug/plugins-only/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/plugins-only/stdout.txt
@@ -15,7 +15,7 @@ Using plugins:
   proposal-numeric-separator { firefox < 70, node < 12.5 }
   proposal-logical-assignment-operators { firefox < 79, node < 15 }
   proposal-nullish-coalescing-operator { firefox < 72, node < 14 }
-  proposal-optional-chaining { firefox < 74, node }
+  proposal-optional-chaining { firefox < 74, node < 14 }
   proposal-json-strings { firefox < 62, node < 10 }
   proposal-optional-catch-binding { firefox < 58, node < 10 }
   proposal-async-generator-functions { firefox < 57, node < 10 }
@@ -29,6 +29,7 @@ Using plugins:
   transform-unicode-escapes { firefox < 53 }
   transform-destructuring { firefox < 53 }
   proposal-export-namespace-from { firefox < 80, node < 13.2 }
+  bugfix/transform-async-arrows-in-class { node < 7.6 }
   transform-modules-commonjs
   proposal-dynamic-import
 
diff --git a/packages/babel-preset-env/test/fixtures/debug/shippedProposals-chrome-80/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/shippedProposals-chrome-80/stdout.txt
index f6e88bd291..b4923a66c0 100644
--- a/packages/babel-preset-env/test/fixtures/debug/shippedProposals-chrome-80/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/shippedProposals-chrome-80/stdout.txt
@@ -15,11 +15,12 @@ Using plugins:
   syntax-numeric-separator
   proposal-logical-assignment-operators { chrome < 85 }
   syntax-nullish-coalescing-operator
-  proposal-optional-chaining { chrome < 91 }
+  syntax-optional-chaining
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
   syntax-object-rest-spread
+  bugfix/transform-v8-spread-parameters-in-optional-chaining { chrome < 91 }
   transform-modules-commonjs
   proposal-dynamic-import
   proposal-export-namespace-from { }
diff --git a/packages/babel-preset-env/test/fixtures/debug/shippedProposals-chrome-84/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/shippedProposals-chrome-84/stdout.txt
index 803a17ff62..305c6d7ea4 100644
--- a/packages/babel-preset-env/test/fixtures/debug/shippedProposals-chrome-84/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/shippedProposals-chrome-84/stdout.txt
@@ -14,11 +14,12 @@ Using plugins:
   syntax-numeric-separator
   proposal-logical-assignment-operators { chrome < 85 }
   syntax-nullish-coalescing-operator
-  proposal-optional-chaining { chrome < 91 }
+  syntax-optional-chaining
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
   syntax-object-rest-spread
+  bugfix/transform-v8-spread-parameters-in-optional-chaining { chrome < 91 }
   transform-modules-commonjs
   proposal-dynamic-import
   proposal-export-namespace-from { }
diff --git a/packages/babel-preset-env/test/fixtures/debug/top-level-targets-shadowed/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/top-level-targets-shadowed/stdout.txt
index e447acf448..f739e949a4 100644
--- a/packages/babel-preset-env/test/fixtures/debug/top-level-targets-shadowed/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/top-level-targets-shadowed/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   proposal-json-strings { chrome < 66 }
   proposal-optional-catch-binding { chrome < 66 }
   proposal-async-generator-functions { chrome < 63 }
diff --git a/packages/babel-preset-env/test/fixtures/debug/top-level-targets/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/top-level-targets/stdout.txt
index dc3c6ac88a..4869ac4084 100644
--- a/packages/babel-preset-env/test/fixtures/debug/top-level-targets/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/top-level-targets/stdout.txt
@@ -14,11 +14,12 @@ Using plugins:
   syntax-numeric-separator
   proposal-logical-assignment-operators { chrome < 85 }
   syntax-nullish-coalescing-operator
-  proposal-optional-chaining { chrome < 91 }
+  syntax-optional-chaining
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
   syntax-object-rest-spread
+  bugfix/transform-v8-spread-parameters-in-optional-chaining { chrome < 91 }
   transform-modules-commonjs
   proposal-dynamic-import
   proposal-export-namespace-from { }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-1/stdout.txt
index 615c0e9881..706ac6e92a 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-1/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-2/stdout.txt
index 9947f5f8be..dab3d6d797 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-2/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-chrome-71-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-chrome-71-1/stdout.txt
index 9f20df35b9..15ec1189ca 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-chrome-71-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-chrome-71-1/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-chrome-71-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-chrome-71-2/stdout.txt
index 26c2758e63..fd079e854b 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-chrome-71-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-chrome-71-2/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-none-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-none-1/stdout.txt
index d8e90617dc..3456eeb16f 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-none-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-none-1/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-none-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-none-2/stdout.txt
index 3eacfaaf98..d4f151fe33 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-none-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-none-2/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-1/stdout.txt
index 55bdef85d6..df5758213b 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-1/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-2/stdout.txt
index 4a207d8d26..b401bb0d69 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-2/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-chrome-71-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-chrome-71-1/stdout.txt
index 0b44a319b6..1b64723796 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-chrome-71-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-chrome-71-1/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-chrome-71-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-chrome-71-2/stdout.txt
index db72fcfd6a..41fe1feee1 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-chrome-71-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-proposals-chrome-71-2/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-shippedProposals-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-shippedProposals-1/stdout.txt
index e96aa762d3..6389fa3606 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-shippedProposals-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-shippedProposals-1/stdout.txt
@@ -17,7 +17,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-shippedProposals-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-shippedProposals-2/stdout.txt
index e596d5b0b3..f9f87eb513 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-shippedProposals-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-shippedProposals-2/stdout.txt
@@ -17,7 +17,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-with-import/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-with-import/stdout.txt
index 45e375ca8b..3ff2b95525 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-with-import/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs2-with-import/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   proposal-json-strings { chrome < 66 }
   proposal-optional-catch-binding { chrome < 66 }
   proposal-async-generator-functions { chrome < 63 }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-1/stdout.txt
index 017c00a1db..c9212325b8 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-1/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-2/stdout.txt
index 1a0b48f8fa..019ca9a850 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-2/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-chrome-71-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-chrome-71-1/stdout.txt
index 9be069f758..c19d7ba285 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-chrome-71-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-chrome-71-1/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-chrome-71-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-chrome-71-2/stdout.txt
index de89f2afe7..715c030dc6 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-chrome-71-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-chrome-71-2/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-none-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-none-1/stdout.txt
index a7cece6c30..66d43df2cf 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-none-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-none-1/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-none-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-none-2/stdout.txt
index e295e1ca89..d9612dd010 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-none-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-none-2/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-1/stdout.txt
index a4046fd220..4daf75d2a8 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-1/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-2/stdout.txt
index 9fe613cc3a..d89f38584e 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-2/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-chrome-71-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-chrome-71-1/stdout.txt
index 2891ae0826..7333a6ce5f 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-chrome-71-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-chrome-71-1/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-chrome-71-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-chrome-71-2/stdout.txt
index bc124c28ad..3b16fcbb32 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-chrome-71-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-proposals-chrome-71-2/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   syntax-json-strings
   syntax-optional-catch-binding
   syntax-async-generators
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-shippedProposals-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-shippedProposals-1/stdout.txt
index 2c8b2616c3..ccf7172cfd 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-shippedProposals-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-shippedProposals-1/stdout.txt
@@ -17,7 +17,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-shippedProposals-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-shippedProposals-2/stdout.txt
index 317bef6821..118f4a5138 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-shippedProposals-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-shippedProposals-2/stdout.txt
@@ -17,7 +17,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.0-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.0-1/stdout.txt
index c504385825..4b824940a7 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.0-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.0-1/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.0-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.0-2/stdout.txt
index bb4c58f06d..e6aee9119d 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.0-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.0-2/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.1-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.1-1/stdout.txt
index af4330c868..10333f77f7 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.1-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.1-1/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.1-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.1-2/stdout.txt
index 7da5a5e041..1f8961611d 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.1-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-versions-strings-minor-3.1-2/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-with-import/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-with-import/stdout.txt
index 701f68ba59..4f4af6ec11 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-with-import/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-corejs3-with-import/stdout.txt
@@ -14,7 +14,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75 }
   proposal-logical-assignment-operators { chrome < 85 }
   proposal-nullish-coalescing-operator { chrome < 80 }
-  proposal-optional-chaining { chrome < 91 }
+  proposal-optional-chaining { chrome < 80 }
   proposal-json-strings { chrome < 66 }
   proposal-optional-catch-binding { chrome < 66 }
   proposal-async-generator-functions { chrome < 63 }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-1/stdout.txt
index 6a43283dc0..d0b3248a33 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-1/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-2/stdout.txt
index b42617d902..2962f1fee8 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-2/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-none-1/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-none-1/stdout.txt
index fde0ef7665..107c2907f6 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-none-1/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-none-1/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-none-2/stdout.txt b/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-none-2/stdout.txt
index 5d6ff0382e..adc8c61e6a 100644
--- a/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-none-2/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/debug/usage-no-corejs-none-2/stdout.txt
@@ -16,7 +16,7 @@ Using plugins:
   proposal-numeric-separator { chrome < 75, firefox < 70, ie }
   proposal-logical-assignment-operators { chrome < 85, firefox < 79, ie }
   proposal-nullish-coalescing-operator { chrome < 80, firefox < 72, ie }
-  proposal-optional-chaining { chrome < 91, firefox < 74, ie }
+  proposal-optional-chaining { chrome < 80, firefox < 74, ie }
   proposal-json-strings { chrome < 66, firefox < 62, ie }
   proposal-optional-catch-binding { chrome < 66, firefox < 58, ie }
   transform-parameters { firefox < 53, ie }
diff --git a/packages/babel-preset-env/test/fixtures/plugins-integration/issue-9935/options.json b/packages/babel-preset-env/test/fixtures/plugins-integration/issue-9935/options.json
index 70f242c2ca..96c70ec49d 100644
--- a/packages/babel-preset-env/test/fixtures/plugins-integration/issue-9935/options.json
+++ b/packages/babel-preset-env/test/fixtures/plugins-integration/issue-9935/options.json
@@ -4,7 +4,7 @@
       "env",
       {
         "targets": [
-          "Chrome >= 60",
+          "Chrome >= 54",
           "Safari >= 11",
           "iOS >= 10.3",
           "Firefox >= 55",
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/output.js b/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/output.js
index dfec033c1b..5238a6f0fc 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/output.js
+++ b/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/output.js
@@ -1,9 +1,8 @@
-((a, _ref) => {
-  let {
-    b = 0,
-    c = 3
-  } = _ref;
-  return a === 1 && b === 2 && c === 3;
+((a, {
+  b: _b = 0,
+  c: _c = 3
+}) => {
+  return a === 1 && _b === 2 && _c === 3;
 })(1, {
   b: 2
 });
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/output.mjs
index c1b1a81f69..eef3d16a1a 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/output.mjs
+++ b/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/output.mjs
@@ -1,8 +1 @@
-function f() {
-  return _f.apply(this, arguments);
-}
-
-function _f() {
-  _f = babelHelpers.asyncToGenerator(function* () {});
-  return _f.apply(this, arguments);
-}
+async function f() {}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-10/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/ios-10/output.mjs
index 98caa184e6..02d939c57f 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/ios-10/output.mjs
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-10/output.mjs
@@ -1 +1 @@
-var a = () => 1;
+const a = () => 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/output.mjs
index 98caa184e6..02d939c57f 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/output.mjs
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/output.mjs
@@ -1 +1 @@
-var a = () => 1;
+const a = () => 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/output.js b/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/output.js
index 410ac6d405..3cc3b194fd 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/output.js
+++ b/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/output.js
@@ -1,4 +1,4 @@
 {
-  var _a = 3;
+  let _a = 3;
 }
-var a = 3;
+let a = 3;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/stdout.txt b/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/stdout.txt
index 0307904b78..96df0ef155 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/stdout.txt
+++ b/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/stdout.txt
@@ -17,18 +17,19 @@ Using plugins:
   proposal-optional-chaining { safari < 13.1 }
   proposal-json-strings { safari < 12 }
   proposal-optional-catch-binding { safari < 11.1 }
-  transform-parameters { safari }
   proposal-async-generator-functions { safari < 12 }
   proposal-object-rest-spread { safari < 11.1 }
   transform-dotall-regex { safari < 11.1 }
   proposal-unicode-property-regex { safari < 11.1 }
   transform-named-capturing-groups-regex { safari < 11.1 }
-  transform-async-to-generator { safari < 11 }
+  transform-async-to-generator { safari < 10.1 }
   transform-exponentiation-operator { safari < 10.1 }
-  transform-template-literals { safari < 13 }
   transform-unicode-regex { safari < 12 }
-  transform-block-scoping { safari < 11 }
   proposal-export-namespace-from { safari }
+  bugfix/transform-safari-block-shadowing { safari < 11 }
+  bugfix/transform-safari-for-shadowing { safari < 11 }
+  bugfix/transform-safari-id-destructuring-collision-in-function-expression { safari }
+  bugfix/transform-tagged-template-caching { safari < 13 }
   transform-modules-commonjs
   proposal-dynamic-import
 
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/output.js b/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/output.js
index f6feac002a..e129ed56a9 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/output.js
+++ b/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/output.js
@@ -1,3 +1,6 @@
-var _templateObject;
+var _ = function _(t) {
+  return t;
+},
+    _t;
 
-tag(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteral(["Safari 12 borked"])));
+tag(_t || (_t = _`Safari 12 borked`));
diff --git a/yarn.lock b/yarn.lock
index 557fb0fd06..31fd24b401 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3293,7 +3293,7 @@ __metadata:
     "@babel/plugin-transform-typeof-symbol": "workspace:^7.14.5"
     "@babel/plugin-transform-unicode-escapes": "workspace:^7.14.5"
     "@babel/plugin-transform-unicode-regex": "workspace:^7.14.5"
-    "@babel/preset-modules": ^0.1.4
+    "@babel/preset-modules": ^0.1.5
     "@babel/types": "workspace:^7.15.6"
     babel-plugin-polyfill-corejs2: ^0.2.2
     babel-plugin-polyfill-corejs3: ^0.2.5
@@ -3332,9 +3332,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@babel/preset-modules@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "@babel/preset-modules@npm:0.1.4"
+"@babel/preset-modules@npm:^0.1.4, @babel/preset-modules@npm:^0.1.5":
+  version: 0.1.5
+  resolution: "@babel/preset-modules@npm:0.1.5"
   dependencies:
     "@babel/helper-plugin-utils": ^7.0.0
     "@babel/plugin-proposal-unicode-property-regex": ^7.4.4
@@ -3343,7 +3343,7 @@ __metadata:
     esutils: ^2.0.2
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7c6500be06be9a341e377eb63292a4a22d0da2b4fb8c68714aff703ddb341cbd58e37d4119d64fc3e602f73801103af471fca2c60b4c1e48e08eea3e6b1afc93
+  checksum: 8430e0e9e9d520b53e22e8c4c6a5a080a12b63af6eabe559c2310b187bd62ae113f3da82ba33e9d1d0f3230930ca702843aae9dd226dec51f7d7114dc1f51c10
   languageName: node
   linkType: hard