diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d5eac43a880e4..72ddc64c563cde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V12.md#12.16.0">12.16.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V12.md#12.16.1">12.16.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V12.md#12.16.0">12.16.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V12.md#12.15.0">12.15.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V12.md#12.14.1">12.14.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V12.md#12.14.0">12.14.0</a><br/>
diff --git a/configure.py b/configure.py
index 6537a62d3954d8..14f5665e0299a2 100755
--- a/configure.py
+++ b/configure.py
@@ -401,12 +401,13 @@
 parser.add_option('--use-largepages',
     action='store_true',
     dest='node_use_large_pages',
-    help='This option has no effect. --use-largepages is now a runtime option.')
+    help='build with Large Pages support. This feature is supported only on Linux kernel' +
+         '>= 2.6.38 with Transparent Huge pages enabled and FreeBSD')
 
 parser.add_option('--use-largepages-script-lld',
     action='store_true',
     dest='node_use_large_pages_script_lld',
-    help='This option has no effect. --use-largepages is now a runtime option.')
+    help='link against the LLVM ld linker script. Implies -fuse-ld=lld in the linker flags')
 
 intl_optgroup.add_option('--with-intl',
     action='store',
@@ -1060,12 +1061,27 @@ def configure_node(o):
   else:
     o['variables']['node_use_dtrace'] = 'false'
 
-  if options.node_use_large_pages or options.node_use_large_pages_script_lld:
-    warn('''The `--use-largepages` and `--use-largepages-script-lld` options
-         have no effect during build time. Support for mapping to large pages is
-         now a runtime option of Node.js. Run `node --use-largepages` or add
-         `--use-largepages` to the `NODE_OPTIONS` environment variable once
-         Node.js is built to enable mapping to large pages.''')
+  if options.node_use_large_pages and not flavor in ('linux', 'freebsd', 'mac'):
+    raise Exception(
+      'Large pages are supported only on Linux, FreeBSD and MacOS Systems.')
+  if options.node_use_large_pages and flavor in ('linux', 'freebsd', 'mac'):
+    if options.shared or options.enable_static:
+      raise Exception(
+        'Large pages are supported only while creating node executable.')
+    if target_arch!="x64":
+      raise Exception(
+        'Large pages are supported only x64 platform.')
+    if flavor == 'mac':
+      info('macOS server with 32GB or more is recommended')
+    if flavor == 'linux':
+      # Example full version string: 2.6.32-696.28.1.el6.x86_64
+      FULL_KERNEL_VERSION=os.uname()[2]
+      KERNEL_VERSION=FULL_KERNEL_VERSION.split('-')[0]
+      if KERNEL_VERSION < "2.6.38" and flavor == 'linux':
+        raise Exception(
+          'Large pages need Linux kernel version >= 2.6.38')
+  o['variables']['node_use_large_pages'] = b(options.node_use_large_pages)
+  o['variables']['node_use_large_pages_script_lld'] = b(options.node_use_large_pages_script_lld)
 
   if options.no_ifaddrs:
     o['defines'] += ['SUNOS_NO_IFADDRS']
diff --git a/doc/api/cli.md b/doc/api/cli.md
index 979c1214f5c59e..7703d0b6bd99d2 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -881,22 +881,6 @@ environment variables.
 
 See `SSL_CERT_DIR` and `SSL_CERT_FILE`.
 
-### `--use-largepages=mode`
-<!-- YAML
-added: v12.16.0
--->
-
-Re-map the Node.js static code to large memory pages at startup. If supported on
-the target system, this will cause the Node.js static code to be moved onto 2
-MiB pages instead of 4 KiB pages.
-
-The following values are valid for `mode`:
-* `off`: No mapping will be attempted. This is the default.
-* `on`: If supported by the OS, mapping will be attempted. Failure to map will
-  be ignored and a message will be printed to standard error.
-* `silent`: If supported by the OS, mapping will be attempted. Failure to map
-  will be ignored and will not be reported.
-
 ### `--v8-options`
 <!-- YAML
 added: v0.1.3
@@ -1153,7 +1137,6 @@ Node.js options that are allowed are:
 * `--track-heap-objects`
 * `--unhandled-rejections`
 * `--use-bundled-ca`
-* `--use-largepages`
 * `--use-openssl-ca`
 * `--v8-pool-size`
 * `--zero-fill-buffers`
diff --git a/doc/api/events.md b/doc/api/events.md
index dfa8189dbdf4a4..93939131a513c6 100644
--- a/doc/api/events.md
+++ b/doc/api/events.md
@@ -155,18 +155,6 @@ myEmitter.emit('error', new Error('whoops!'));
 // Prints: whoops! there was an error
 ```
 
-It is possible to monitor `'error'` events without consuming the emitted error
-by installing a listener using the symbol `errorMonitor`.
-
-```js
-const myEmitter = new MyEmitter();
-myEmitter.on(EventEmitter.errorMonitor, (err) => {
-  MyMonitoringTool.log(err);
-});
-myEmitter.emit('error', new Error('whoops!'));
-// Still throws and crashes Node.js
-```
-
 ## Capture Rejections of Promises
 
 > Stability: 1 - captureRejections is experimental.
@@ -360,19 +348,6 @@ the event emitter instance, the event’s name and the number of attached
 listeners, respectively.
 Its `name` property is set to `'MaxListenersExceededWarning'`.
 
-### `EventEmitter.errorMonitor`
-<!-- YAML
-added: v12.16.0
--->
-
-This symbol shall be used to install a listener for only monitoring `'error'`
-events. Listeners installed using this symbol are called before the regular
-`'error'` listeners are called.
-
-Installing a listener using this symbol does not change the behavior once an
-`'error'` event is emitted, therefore the process will still crash if no
-regular `'error'` listener is installed.
-
 ### `emitter.addListener(eventName, listener)`
 <!-- YAML
 added: v0.1.26
diff --git a/doc/changelogs/CHANGELOG_V12.md b/doc/changelogs/CHANGELOG_V12.md
index 231a9a33a58429..6e621f8fef1026 100644
--- a/doc/changelogs/CHANGELOG_V12.md
+++ b/doc/changelogs/CHANGELOG_V12.md
@@ -10,6 +10,7 @@
 </tr>
 <tr>
 <td valign="top">
+<a href="#12.16.1">12.16.1</a><br/>
 <a href="#12.16.0">12.16.0</a><br/>
 <a href="#12.15.0">12.15.0</a><br/>
 <a href="#12.14.1">12.14.1</a><br/>
@@ -53,6 +54,69 @@
   * [io.js](CHANGELOG_IOJS.md)
   * [Archive](CHANGELOG_ARCHIVE.md)
 
+<a id="12.16.1"></a>
+## 2020-02-18, Version 12.16.1 'Erbium' (LTS), @MylesBorins
+
+### Notable changes
+
+Node.js 12.16.0 included 6 regressions that are being fixed in this release
+
+**Accidental Unflagging of Self Resolving Modules**:
+
+12.16.0 included a large update to the ESM implementation. One of the new features,
+Self Referential Modules, was accidentally released without requiring the `--experimental-modules`
+flag. This release is being made to appropriately flag the feature.
+
+**Process Cleanup Changed Introduced WASM-Related Assertion**:
+
+A change during Node.js process cleanup led to a crash in combination with
+specific usage of WASM. This has been fixed by partially reverted said change.
+A regression test and a full fix are being worked on and will likely be included
+in future 12.x and 13.x releases.
+
+**Use Largepages Runtime Option Introduced Linking Failure**:
+
+A Semver-Minor change to introduce `--use-largepages` as a runtime option
+introduced a linking failure. This had been fixed in master but regressed as the fix has not yet gone out
+in a Current release. The feature has been reverted, but will be able to reland with a fix in a future
+Semver-Minor release.
+
+**Async Hooks was Causing an Exception When Handling Errors**:
+
+Changes in async hooks internals introduced a case where an internal api call could be called with undefined
+causing a process to crash. The change to async hooks was reverted. A regression test and fix has been proposed
+and the change could re-land in a future Semver-Patch release if the regression is reliably fixed.
+
+**New Enumerable Read-Only Property on EventEmitter breaks @types/extend**
+
+A new property for enumerating events was added to the EventEmitter class. This
+broke existing code that was using the `@types/extend` module for extending classses
+as `@types/extend` was attemping to write over the existing field which the new
+change made read-only. As this is the first property on EventEmitter that is
+read-only this feature could be considered Semver-Major. The new feature has been
+reverted but could re-land in a future Semver-Minor release if a non breaking way
+of applying it is found.
+
+**Exceptions in the HTTP parser were not emitting an uncaughtException**
+
+A refactoring to Node.js interanls resulted in a bug where errors in the HTTP
+parser were not being emitted by `process.on('uncaughtException')` when the `async_hooks` `after`
+hook exists. The fix to this bug has been included in this release.
+
+### Commits
+
+* [[`51fdd759b9`](https://github.com/nodejs/node/commit/51fdd759b9)] - **async_hooks**: ensure event after been emitted on runInAsyncScope (legendecas) [#31784](https://github.com/nodejs/node/pull/31784)
+* [[`7a1b0ac06f`](https://github.com/nodejs/node/commit/7a1b0ac06f)] - ***Revert*** "**build**: re-introduce --use-largepages as no-op" (Myles Borins) [#31782](https://github.com/nodejs/node/pull/31782)
+* [[`a53eeca2a9`](https://github.com/nodejs/node/commit/a53eeca2a9)] - ***Revert*** "**build**: switch realpath to pwd" (Myles Borins) [#31782](https://github.com/nodejs/node/pull/31782)
+* [[`6d432994e6`](https://github.com/nodejs/node/commit/6d432994e6)] - ***Revert*** "**build**: warn upon --use-largepages config option" (Myles Borins) [#31782](https://github.com/nodejs/node/pull/31782)
+* [[`a5bc00af12`](https://github.com/nodejs/node/commit/a5bc00af12)] - ***Revert*** "**events**: allow monitoring error events" (Myles Borins)
+* [[`f0b2d875d9`](https://github.com/nodejs/node/commit/f0b2d875d9)] - **module**: 12.x self resolve flag as experimental modules (Guy Bedford) [#31757](https://github.com/nodejs/node/pull/31757)
+* [[`42b68a4e24`](https://github.com/nodejs/node/commit/42b68a4e24)] - **src**: inform callback scopes about exceptions in HTTP parser (Anna Henningsen) [#31801](https://github.com/nodejs/node/pull/31801)
+* [[`065a32f064`](https://github.com/nodejs/node/commit/065a32f064)] - ***Revert*** "**src**: make --use-largepages a runtime option" (Myles Borins) [#31782](https://github.com/nodejs/node/pull/31782)
+* [[`3d5beebc62`](https://github.com/nodejs/node/commit/3d5beebc62)] - ***Revert*** "**src**: make large\_pages node.cc include conditional" (Myles Borins) [#31782](https://github.com/nodejs/node/pull/31782)
+* [[`43d02e20e0`](https://github.com/nodejs/node/commit/43d02e20e0)] - **src**: keep main-thread Isolate attached to platform during Dispose (Anna Henningsen) [#31795](https://github.com/nodejs/node/pull/31795)
+* [[`7a5954ef26`](https://github.com/nodejs/node/commit/7a5954ef26)] - **src**: fix -Winconsistent-missing-override warning (Colin Ihrig) [#30549](https://github.com/nodejs/node/pull/30549)
+
 <a id="12.16.0"></a>
 ## 2020-02-11, Version 12.16.0 'Erbium' (LTS), @targos
 
diff --git a/doc/node.1 b/doc/node.1
index e847842307be95..675bfc9a4851d4 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -421,16 +421,6 @@ See
 and
 .Ev SSL_CERT_FILE .
 .
-.It Fl -use-largepages Ns = Ns Ar mode
-Re-map the Node.js static code to large memory pages at startup. If supported on
-the target system, this will cause the Node.js static code to be moved onto 2
-MiB pages instead of 4 KiB pages.
-.Pp
-.Ar mode
-must have one of the following values:
-`off` (the default value, meaning do not map), `on` (map and ignore failure,
-reporting it to stderr), or `silent` (map and silently ignore failure).
-.
 .It Fl -v8-options
 Print V8 command-line options.
 .
diff --git a/lib/async_hooks.js b/lib/async_hooks.js
index 31e4ad4e3e56d0..0b599869ef1be2 100644
--- a/lib/async_hooks.js
+++ b/lib/async_hooks.js
@@ -21,6 +21,7 @@ const {
   executionAsyncId,
   triggerAsyncId,
   // Private API
+  hasAsyncIdStack,
   getHookArrays,
   enableHooks,
   disableHooks,
@@ -172,12 +173,16 @@ class AsyncResource {
     const asyncId = this[async_id_symbol];
     emitBefore(asyncId, this[trigger_async_id_symbol]);
 
-    const ret = thisArg === undefined ?
-      fn(...args) :
-      ReflectApply(fn, thisArg, args);
+    try {
+      const ret = thisArg === undefined ?
+        fn(...args) :
+        ReflectApply(fn, thisArg, args);
 
-    emitAfter(asyncId);
-    return ret;
+      return ret;
+    } finally {
+      if (hasAsyncIdStack())
+        emitAfter(asyncId);
+    }
   }
 
   emitDestroy() {
diff --git a/lib/events.js b/lib/events.js
index 76b376e789115f..62ed2191720125 100644
--- a/lib/events.js
+++ b/lib/events.js
@@ -60,7 +60,6 @@ const {
 } = require('internal/util/inspect');
 
 const kCapture = Symbol('kCapture');
-const kErrorMonitor = Symbol('events.errorMonitor');
 
 function EventEmitter(opts) {
   EventEmitter.init.call(this, opts);
@@ -90,13 +89,6 @@ ObjectDefineProperty(EventEmitter, 'captureRejections', {
   enumerable: true
 });
 
-ObjectDefineProperty(EventEmitter, 'errorMonitor', {
-  value: kErrorMonitor,
-  writable: false,
-  configurable: true,
-  enumerable: true
-});
-
 // The default for captureRejections is false
 ObjectDefineProperty(EventEmitter.prototype, kCapture, {
   value: false,
@@ -270,11 +262,9 @@ EventEmitter.prototype.emit = function emit(type, ...args) {
   let doError = (type === 'error');
 
   const events = this._events;
-  if (events !== undefined) {
-    if (doError && events[kErrorMonitor] !== undefined)
-      this.emit(kErrorMonitor, ...args);
+  if (events !== undefined)
     doError = (doError && events.error === undefined);
-  } else if (!doError)
+  else if (!doError)
     return false;
 
   // If there is no 'error' event listener then throw.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index f3d97781e2a652..ed433e1b8744ea 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -432,6 +432,7 @@ function resolveBasePath(basePath, exts, isMain, trailingSlash, request) {
 }
 
 function trySelf(parentPath, isMain, request) {
+  if (!experimentalModules) return false;
   const { data: pkg, path: basePath } = readPackageScope(parentPath) || {};
   if (!pkg || pkg.exports === undefined) return false;
   if (typeof pkg.name !== 'string') return false;
diff --git a/node.gyp b/node.gyp
index 51c424d65bdfe8..9806b165ab78eb 100644
--- a/node.gyp
+++ b/node.gyp
@@ -843,9 +843,10 @@
             }],
           ],
         }],
-        [ 'OS in "linux freebsd mac" and '
-          'target_arch=="x64"', {
+        [ 'node_use_large_pages=="true" and OS in "linux freebsd mac"', {
           'defines': [ 'NODE_ENABLE_LARGE_CODE_PAGES=1' ],
+          # The current implementation of Large Pages is under Linux.
+          # Other implementations are possible but not currently supported.
           'sources': [
             'src/large_pages/node_large_page.cc',
             'src/large_pages/node_large_page.h'
diff --git a/node.gypi b/node.gypi
index 4ee7bad0104040..144544214316a3 100644
--- a/node.gypi
+++ b/node.gypi
@@ -309,18 +309,20 @@
     }],
     [ 'OS=="linux" and '
       'target_arch=="x64" and '
-      'llvm_version=="0.0"', {
+      'node_use_large_pages=="true" and '
+      'node_use_large_pages_script_lld=="false"', {
       'ldflags': [
         '-Wl,-T',
-        '<!(echo "$(pwd)/src/large_pages/ld.implicit.script")',
+        '<!(realpath src/large_pages/ld.implicit.script)',
       ]
     }],
     [ 'OS=="linux" and '
       'target_arch=="x64" and '
-      'llvm_version!="0.0"', {
+      'node_use_large_pages=="true" and '
+      'node_use_large_pages_script_lld=="true"', {
       'ldflags': [
         '-Wl,-T',
-        '<!(echo "$(pwd)/src/large_pages/ld.implicit.script.lld")',
+        '<!(realpath src/large_pages/ld.implicit.script.lld)',
       ]
     }],
     [ 'node_use_openssl=="true"', {
diff --git a/src/large_pages/node_large_page.cc b/src/large_pages/node_large_page.cc
index 3897b819e81bad..4e2f8fc4410316 100644
--- a/src/large_pages/node_large_page.cc
+++ b/src/large_pages/node_large_page.cc
@@ -62,7 +62,7 @@
 // Map a new area and copy the original code there
 // Use mmap using the start address with MAP_FIXED so we get exactly the
 // same virtual address
-// Use madvise with MADV_HUGEPAGE to use Anonymous 2M Pages
+// Use madvise with MADV_HUGE_PAGE to use Anonymous 2M Pages
 // If successful copy the code there and unmap the original region.
 
 extern char __nodetext;
@@ -308,7 +308,7 @@ static bool IsSuperPagesEnabled() {
 // a. map a new area and copy the original code there
 // b. mmap using the start address with MAP_FIXED so we get exactly
 //    the same virtual address (except on macOS).
-// c. madvise with MADV_HUGEPAGE
+// c. madvise with MADV_HUGE_PAGE
 // d. If successful copy the code there and unmap the original region
 int
 #if !defined(__APPLE__)
@@ -333,6 +333,9 @@ MoveTextRegionToLargePages(const text_region& r) {
     PrintSystemError(errno);
     return -1;
   }
+  OnScopeLeave munmap_on_return([nmem, size]() {
+    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
+  });
 
   memcpy(nmem, r.from, size);
 
@@ -349,14 +352,13 @@ MoveTextRegionToLargePages(const text_region& r) {
     return -1;
   }
 
-  ret = madvise(tmem, size, 14 /* MADV_HUGEPAGE */);
+  ret = madvise(tmem, size, MADV_HUGEPAGE);
   if (ret == -1) {
     PrintSystemError(errno);
     ret = munmap(tmem, size);
     if (ret == -1) {
       PrintSystemError(errno);
     }
-    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
     return -1;
   }
   memcpy(start, nmem, size);
@@ -367,7 +369,6 @@ MoveTextRegionToLargePages(const text_region& r) {
               MAP_ALIGNED_SUPER, -1 , 0);
   if (tmem == MAP_FAILED) {
     PrintSystemError(errno);
-    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
     return -1;
   }
 #elif defined(__APPLE__)
@@ -382,7 +383,6 @@ MoveTextRegionToLargePages(const text_region& r) {
               VM_FLAGS_SUPERPAGE_SIZE_2MB, 0);
   if (tmem == MAP_FAILED) {
     PrintSystemError(errno);
-    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
     return -1;
   }
   memcpy(tmem, nmem, size);
@@ -393,7 +393,6 @@ MoveTextRegionToLargePages(const text_region& r) {
     if (ret == -1) {
       PrintSystemError(errno);
     }
-    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
     return -1;
   }
   memcpy(start, tmem, size);
@@ -406,10 +405,8 @@ MoveTextRegionToLargePages(const text_region& r) {
     if (ret == -1) {
       PrintSystemError(errno);
     }
-    if (-1 == munmap(nmem, size)) PrintSystemError(errno);
     return -1;
   }
-  if (-1 == munmap(nmem, size)) PrintSystemError(errno);
   return ret;
 }
 
@@ -421,12 +418,12 @@ int MapStaticCodeToLargePages() {
     return -1;
   }
 
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__)
   if (r.from > reinterpret_cast<void*>(&MoveTextRegionToLargePages))
     return MoveTextRegionToLargePages(r);
 
   return -1;
-#elif defined(__APPLE__)
+#elif defined(__FreeBSD__) || defined(__APPLE__)
   return MoveTextRegionToLargePages(r);
 #endif
 }
diff --git a/src/node.cc b/src/node.cc
index cadbd9a62db9e0..80916e5244aa36 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -954,6 +954,14 @@ InitializationResult InitializeOncePerProcess(int argc, char** argv) {
 
   CHECK_GT(argc, 0);
 
+#ifdef NODE_ENABLE_LARGE_CODE_PAGES
+  if (node::IsLargePagesEnabled()) {
+    if (node::MapStaticCodeToLargePages() != 0) {
+      fprintf(stderr, "Reverting to default page size\n");
+    }
+  }
+#endif
+
   // Hack around with the argv pointer. Used for process.title = "blah".
   argv = uv_setup_args(argc, argv);
 
@@ -973,26 +981,6 @@ InitializationResult InitializeOncePerProcess(int argc, char** argv) {
     }
   }
 
-#if defined(NODE_ENABLE_LARGE_CODE_PAGES) && NODE_ENABLE_LARGE_CODE_PAGES
-  if (per_process::cli_options->use_largepages == "on" ||
-      per_process::cli_options->use_largepages == "silent") {
-    if (node::IsLargePagesEnabled()) {
-      if (node::MapStaticCodeToLargePages() != 0 &&
-          per_process::cli_options->use_largepages != "silent") {
-        fprintf(stderr,
-                "Mapping code to large pages failed. Reverting to default page "
-                "size.\n");
-      }
-    } else if (per_process::cli_options->use_largepages != "silent") {
-      fprintf(stderr, "Large pages are not enabled.\n");
-    }
-  }
-#else
-  if (per_process::cli_options->use_largepages == "on") {
-    fprintf(stderr, "Mapping to large pages is not supported.\n");
-  }
-#endif  // NODE_ENABLE_LARGE_CODE_PAGES
-
   if (per_process::cli_options->print_version) {
     printf("%s\n", NODE_VERSION);
     result.exit_code = 0;
diff --git a/src/node_api.cc b/src/node_api.cc
index 0f7981cd5605ae..5e467dded5bdb7 100644
--- a/src/node_api.cc
+++ b/src/node_api.cc
@@ -26,7 +26,7 @@ struct node_napi_env__ : public napi_env__ {
   }
 
   v8::Maybe<bool> mark_arraybuffer_as_untransferable(
-      v8::Local<v8::ArrayBuffer> ab) const {
+      v8::Local<v8::ArrayBuffer> ab) const override {
     return ab->SetPrivate(
         context(),
         node_env()->arraybuffer_untransferable_private_symbol(),
diff --git a/src/node_http_parser_impl.h b/src/node_http_parser_impl.h
index 09da57e8ac5ce5..23f2eaf66d1d27 100644
--- a/src/node_http_parser_impl.h
+++ b/src/node_http_parser_impl.h
@@ -340,6 +340,7 @@ class Parser : public AsyncWrap, public StreamListener {
           this, InternalCallbackScope::kSkipTaskQueues);
       head_response = cb.As<Function>()->Call(
           env()->context(), object(), arraysize(argv), argv);
+      if (head_response.IsEmpty()) callback_scope.MarkAsFailed();
     }
 
     int64_t val;
@@ -413,6 +414,7 @@ class Parser : public AsyncWrap, public StreamListener {
       InternalCallbackScope callback_scope(
           this, InternalCallbackScope::kSkipTaskQueues);
       r = cb.As<Function>()->Call(env()->context(), object(), 0, nullptr);
+      if (r.IsEmpty()) callback_scope.MarkAsFailed();
     }
 
     if (r.IsEmpty()) {
diff --git a/src/node_main_instance.cc b/src/node_main_instance.cc
index 86a857299f6e90..97cea34dbb46be 100644
--- a/src/node_main_instance.cc
+++ b/src/node_main_instance.cc
@@ -99,8 +99,12 @@ NodeMainInstance::~NodeMainInstance() {
   if (!owns_isolate_) {
     return;
   }
-  platform_->UnregisterIsolate(isolate_);
+  // TODO(addaleax): Reverse the order of these calls. The fact that we first
+  // dispose the Isolate is a temporary workaround for
+  // https://github.com/nodejs/node/issues/31752 -- V8 should not be posting
+  // platform tasks during Dispose(), but it does in some WASM edge cases.
   isolate_->Dispose();
+  platform_->UnregisterIsolate(isolate_);
 }
 
 int NodeMainInstance::Run() {
diff --git a/src/node_options.cc b/src/node_options.cc
index 89f8894379969a..ed46978236675a 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -65,11 +65,6 @@ void PerProcessOptions::CheckOptions(std::vector<std::string>* errors) {
                       "used, not both");
   }
 #endif
-  if (use_largepages != "off" &&
-      use_largepages != "on" &&
-      use_largepages != "silent") {
-    errors->push_back("invalid value for --use-largepages");
-  }
   per_isolate->CheckOptions(errors);
 }
 
@@ -793,10 +788,6 @@ PerProcessOptionsParser::PerProcessOptionsParser(
             kAllowedInEnvironment);
 #endif
 #endif
-  AddOption("--use-largepages",
-            "Map the Node.js static code to large pages",
-            &PerProcessOptions::use_largepages,
-            kAllowedInEnvironment);
 
   // v12.x backwards compat flags removed in V8 7.9.
   AddOption("--fast_calls_with_arguments_mismatches", "", NoOp{});
diff --git a/src/node_options.h b/src/node_options.h
index 95fe32ebd99bd9..60daf360d98d91 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -238,7 +238,6 @@ class PerProcessOptions : public Options {
   bool force_fips_crypto = false;
 #endif
 #endif
-  std::string use_largepages = "off";
 
 #ifdef NODE_REPORT
   std::vector<std::string> cmdline;
diff --git a/src/node_version.h b/src/node_version.h
index b50e2cadb6d6ba..88831ab19d7201 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -29,7 +29,7 @@
 #define NODE_VERSION_IS_LTS 1
 #define NODE_VERSION_LTS_CODENAME "Erbium"
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)
diff --git a/test/es-module/test-esm-flagged-self.js b/test/es-module/test-esm-flagged-self.js
new file mode 100644
index 00000000000000..43a0c4f9684bf0
--- /dev/null
+++ b/test/es-module/test-esm-flagged-self.js
@@ -0,0 +1,16 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+const path = require('path');
+const { createRequireFromPath } = require('module');
+
+const fixturesRequire =
+    createRequireFromPath(path.resolve(__dirname, '../fixtures/_'));
+
+try {
+  fixturesRequire('pkgexports/resolve-self');
+  assert(false);
+} catch (e) {
+  assert.strictEqual(e.code, 'MODULE_NOT_FOUND');
+}
diff --git a/test/parallel/test-async-hooks-run-in-async-scope-caught-exception.js b/test/parallel/test-async-hooks-run-in-async-scope-caught-exception.js
new file mode 100644
index 00000000000000..78e38c1e9312d7
--- /dev/null
+++ b/test/parallel/test-async-hooks-run-in-async-scope-caught-exception.js
@@ -0,0 +1,9 @@
+'use strict';
+
+require('../common');
+const { AsyncResource } = require('async_hooks');
+
+try {
+  new AsyncResource('foo').runInAsyncScope(() => { throw new Error('bar'); });
+} catch {}
+// Should abort (fail the case) if async id is not matching.
diff --git a/test/parallel/test-emit-after-uncaught-exception-runInAsyncScope.js b/test/parallel/test-emit-after-uncaught-exception-runInAsyncScope.js
deleted file mode 100644
index 5003972e9984aa..00000000000000
--- a/test/parallel/test-emit-after-uncaught-exception-runInAsyncScope.js
+++ /dev/null
@@ -1,40 +0,0 @@
-'use strict';
-
-const common = require('../common');
-const assert = require('assert');
-const async_hooks = require('async_hooks');
-
-const id_obj = {};
-let collect = true;
-
-const hook = async_hooks.createHook({
-  before(id) { if (collect) id_obj[id] = true; },
-  after(id) { delete id_obj[id]; },
-}).enable();
-
-process.once('uncaughtException', common.mustCall((er) => {
-  assert.strictEqual(er.message, 'bye');
-  collect = false;
-}));
-
-setImmediate(common.mustCall(() => {
-  process.nextTick(common.mustCall(() => {
-    assert.strictEqual(Object.keys(id_obj).length, 0);
-    hook.disable();
-  }));
-
-  // Create a stack of async ids that will need to be emitted in the case of
-  // an uncaught exception.
-  const ar1 = new async_hooks.AsyncResource('Mine');
-  ar1.runInAsyncScope(() => {
-    const ar2 = new async_hooks.AsyncResource('Mine');
-    ar2.runInAsyncScope(() => {
-      throw new Error('bye');
-    });
-  });
-
-  // TODO(trevnorris): This test shows that the after() hooks are always called
-  // correctly, but it doesn't solve where the emitDestroy() is missed because
-  // of the uncaught exception. Simple solution is to always call emitDestroy()
-  // before the emitAfter(), but how to codify this?
-}));
diff --git a/test/parallel/test-event-emitter-error-monitor.js b/test/parallel/test-event-emitter-error-monitor.js
deleted file mode 100644
index ba02839a8415e4..00000000000000
--- a/test/parallel/test-event-emitter-error-monitor.js
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-const common = require('../common');
-const assert = require('assert');
-const EventEmitter = require('events');
-
-const EE = new EventEmitter();
-const theErr = new Error('MyError');
-
-EE.on(
-  EventEmitter.errorMonitor,
-  common.mustCall(function onErrorMonitor(e) {
-    assert.strictEqual(e, theErr);
-  }, 3)
-);
-
-// Verify with no error listener
-common.expectsError(
-  () => EE.emit('error', theErr), theErr
-);
-
-// Verify with error listener
-EE.once('error', common.mustCall((e) => assert.strictEqual(e, theErr)));
-EE.emit('error', theErr);
-
-
-// Verify it works with once
-process.nextTick(() => EE.emit('error', theErr));
-assert.rejects(EventEmitter.once(EE, 'notTriggered'), theErr);
-
-// Only error events trigger error monitor
-EE.on('aEvent', common.mustCall());
-EE.emit('aEvent');
diff --git a/test/parallel/test-http-uncaught-from-request-callback.js b/test/parallel/test-http-uncaught-from-request-callback.js
new file mode 100644
index 00000000000000..5c75958617898f
--- /dev/null
+++ b/test/parallel/test-http-uncaught-from-request-callback.js
@@ -0,0 +1,29 @@
+'use strict';
+const common = require('../common');
+const asyncHooks = require('async_hooks');
+const http = require('http');
+
+// Regression test for https://github.com/nodejs/node/issues/31796
+
+asyncHooks.createHook({
+  after: () => {}
+}).enable();
+
+
+process.once('uncaughtException', common.mustCall(() => {
+  server.close();
+}));
+
+const server = http.createServer(common.mustCall((request, response) => {
+  response.writeHead(200, { 'Content-Type': 'text/plain' });
+  response.end();
+}));
+
+server.listen(0, common.mustCall(() => {
+  http.get({
+    host: 'localhost',
+    port: server.address().port
+  }, common.mustCall(() => {
+    throw new Error('whoah');
+  }));
+}));
diff --git a/test/parallel/test-startup-large-pages.js b/test/parallel/test-startup-large-pages.js
deleted file mode 100644
index d5589ee547f760..00000000000000
--- a/test/parallel/test-startup-large-pages.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-
-// Make sure that Node.js runs correctly with the --use-largepages option.
-
-require('../common');
-const assert = require('assert');
-const { spawnSync } = require('child_process');
-
-{
-  const child = spawnSync(process.execPath,
-                          [ '--use-largepages=on', '-p', '42' ]);
-  const stdout = child.stdout.toString().match(/\S+/g);
-  assert.strictEqual(child.status, 0);
-  assert.strictEqual(child.signal, null);
-  assert.strictEqual(stdout.length, 1);
-  assert.strictEqual(stdout[0], '42');
-}
-
-{
-  const child = spawnSync(process.execPath,
-                          [ '--use-largepages=xyzzy', '-p', '42' ]);
-  assert.strictEqual(child.status, 9);
-  assert.strictEqual(child.signal, null);
-  assert.strictEqual(child.stderr.toString().match(/\S+/g).slice(1).join(' '),
-                     'invalid value for --use-largepages');
-}
-
-// TODO(gabrielschulhof): Make assertions about the stderr, which may or may not
-// contain a message indicating that mapping to large pages has failed.