diff --git a/.eslintignore b/.eslintignore
index 4b6e6b5e0fa94a..36833076ed8708 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,7 @@
 lib/internal/v8_prof_polyfill.js
 lib/punycode.js
 test/addons/??_*
+test/es-module/test-esm-dynamic-import.js
 test/fixtures
 tools/eslint
 tools/icu
diff --git a/.gitignore b/.gitignore
index 190333f4b8f31a..40838bcc7fa8d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,8 +106,8 @@ deps/npm/node_modules/.bin/
 
 # test artifacts
 tools/faketime
-tools/remark-cli
-tools/remark-preset-lint-node
+tools/remark-cli/node_modules
+tools/remark-preset-lint-node/node_modules
 icu_config.gypi
 *.tap
 
diff --git a/Makefile b/Makefile
index 2c62bf29cd2334..09e6c2061f686e 100644
--- a/Makefile
+++ b/Makefile
@@ -137,7 +137,7 @@ check: test
 coverage-clean:
 	if [ -d lib_ ]; then $(RM) -r lib; mv lib_ lib; fi
 	$(RM) -r node_modules
-	$(RM) -r gcovr testing
+	$(RM) -r gcovr build
 	$(RM) -r out/$(BUILDTYPE)/.coverage
 	$(RM) -r .cov_tmp
 	$(RM) out/$(BUILDTYPE)/obj.target/node/{src,gen}/*.gcda
@@ -162,11 +162,11 @@ coverage-build: all
 		$(NODE) ./deps/npm install nyc --no-save --no-package-lock; fi
 	if [ ! -d gcovr ]; then git clone --depth=1 \
 		--single-branch git://github.com/gcovr/gcovr.git; fi
-	if [ ! -d testing ]; then git clone --depth=1 \
-		--single-branch https://github.com/nodejs/testing.git; fi
+	if [ ! -d build ]; then git clone --depth=1 \
+		--single-branch https://github.com/nodejs/build.git; fi
 	if [ ! -f gcovr/scripts/gcovr.orig ]; then \
 		(cd gcovr && patch -N -p1 < \
-		"$(CURDIR)/testing/coverage/gcovr-patches.diff"); fi
+		"$(CURDIR)/build/jenkins/scripts/coverage/gcovr-patches.diff"); fi
 	if [ -d lib_ ]; then $(RM) -r lib; mv lib_ lib; fi
 	mv lib lib_
 	$(NODE) ./node_modules/.bin/nyc instrument --extension .js --extension .mjs lib_/ lib/
@@ -1072,7 +1072,8 @@ lint-js-ci:
 jslint-ci: lint-js-ci
 	@echo "Please use lint-js-ci instead of jslint-ci"
 
-LINT_CPP_ADDON_DOC_FILES = $(wildcard test/addons/??_*/*.cc test/addons/??_*/*.h)
+LINT_CPP_ADDON_DOC_FILES_GLOB = test/addons/??_*/*.cc test/addons/??_*/*.h
+LINT_CPP_ADDON_DOC_FILES = $(wildcard $(LINT_CPP_ADDON_DOC_FILES_GLOB))
 LINT_CPP_EXCLUDE ?=
 LINT_CPP_EXCLUDE += src/node_root_certs.h
 LINT_CPP_EXCLUDE += $(LINT_CPP_ADDON_DOC_FILES)
@@ -1113,7 +1114,7 @@ tools/.cpplintstamp: $(LINT_CPP_FILES)
 
 lint-addon-docs: test/addons/.docbuildstamp
 	@echo "Running C++ linter on addon docs..."
-	@$(PYTHON) tools/cpplint.py --filter=$(ADDON_DOC_LINT_FLAGS) $(LINT_CPP_ADDON_DOC_FILES)
+	@$(PYTHON) tools/cpplint.py --filter=$(ADDON_DOC_LINT_FLAGS) $(LINT_CPP_ADDON_DOC_FILES_GLOB)
 
 cpplint: lint-cpp
 	@echo "Please use lint-cpp instead of cpplint"
@@ -1123,7 +1124,6 @@ lint: ## Run JS, C++, MD and doc linters.
 	@EXIT_STATUS=0 ; \
 	$(MAKE) lint-js || EXIT_STATUS=$$? ; \
 	$(MAKE) lint-cpp || EXIT_STATUS=$$? ; \
-	$(MAKE) lint-md || EXIT_STATUS=$$? ; \
 	$(MAKE) lint-addon-docs || EXIT_STATUS=$$? ; \
 	$(MAKE) lint-md || EXIT_STATUS=$$? ; \
 	exit $$EXIT_STATUS
diff --git a/benchmark/net/net-wrap-js-stream-passthrough.js b/benchmark/net/net-wrap-js-stream-passthrough.js
new file mode 100644
index 00000000000000..bf84285e81b53a
--- /dev/null
+++ b/benchmark/net/net-wrap-js-stream-passthrough.js
@@ -0,0 +1,107 @@
+// test the speed of .pipe() with JSStream wrapping for PassThrough streams
+'use strict';
+
+const common = require('../common.js');
+const { PassThrough } = require('stream');
+
+const bench = common.createBenchmark(main, {
+  len: [102400, 1024 * 1024 * 16],
+  type: ['utf', 'asc', 'buf'],
+  dur: [5],
+}, {
+  flags: ['--expose-internals']
+});
+
+var dur;
+var len;
+var type;
+var chunk;
+var encoding;
+var JSStreamWrap;  // Can only require internals inside main().
+
+function main(conf) {
+  dur = +conf.dur;
+  len = +conf.len;
+  type = conf.type;
+  JSStreamWrap = require('internal/wrap_js_stream');
+
+  switch (type) {
+    case 'buf':
+      chunk = Buffer.alloc(len, 'x');
+      break;
+    case 'utf':
+      encoding = 'utf8';
+      chunk = 'ü'.repeat(len / 2);
+      break;
+    case 'asc':
+      encoding = 'ascii';
+      chunk = 'x'.repeat(len);
+      break;
+    default:
+      throw new Error(`invalid type: ${type}`);
+  }
+
+  doBenchmark();
+}
+
+function Writer() {
+  this.received = 0;
+  this.writable = true;
+}
+
+Writer.prototype.write = function(chunk, encoding, cb) {
+  this.received += chunk.length;
+
+  if (typeof encoding === 'function')
+    encoding();
+  else if (typeof cb === 'function')
+    cb();
+
+  return true;
+};
+
+// doesn't matter, never emits anything.
+Writer.prototype.on = function() {};
+Writer.prototype.once = function() {};
+Writer.prototype.emit = function() {};
+Writer.prototype.prependListener = function() {};
+
+
+function flow() {
+  const dest = this.dest;
+  const res = dest.write(chunk, encoding);
+  if (!res)
+    dest.once('drain', this.flow);
+  else
+    process.nextTick(this.flow);
+}
+
+function Reader() {
+  this.flow = flow.bind(this);
+  this.readable = true;
+}
+
+Reader.prototype.pipe = function(dest) {
+  this.dest = dest;
+  this.flow();
+  return dest;
+};
+
+
+function doBenchmark() {
+  const reader = new Reader();
+  const writer = new Writer();
+
+  // the actual benchmark.
+  const fakeSocket = new JSStreamWrap(new PassThrough());
+  bench.start();
+  reader.pipe(fakeSocket);
+  fakeSocket.pipe(writer);
+
+  setTimeout(function() {
+    const bytes = writer.received;
+    const gbits = (bytes * 8) / (1024 * 1024 * 1024);
+    bench.end(gbits);
+    process.exit(0);
+  }, dur * 1000);
+}
diff --git a/common.gypi b/common.gypi
index b89a8afff03a63..fd42f27d351282 100644
--- a/common.gypi
+++ b/common.gypi
@@ -40,29 +40,29 @@
 
     'conditions': [
       ['GENERATOR=="ninja"', {
-        'OBJ_DIR': '<(PRODUCT_DIR)/obj',
-        'V8_BASE': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
+        'obj_dir': '<(PRODUCT_DIR)/obj',
+        'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
        }, {
-         'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target',
-         'V8_BASE%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
+         'obj_dir%': '<(PRODUCT_DIR)/obj.target',
+         'v8_base%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
       }],
       ['OS == "win"', {
         'os_posix': 0,
         'v8_postmortem_support%': 'false',
-        'OBJ_DIR': '<(PRODUCT_DIR)/obj',
-        'V8_BASE': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
+        'obj_dir': '<(PRODUCT_DIR)/obj',
+        'v8_base': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
       }, {
         'os_posix': 1,
         'v8_postmortem_support%': 'true',
       }],
       ['OS== "mac"', {
-        'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target',
-        'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
+        'obj_dir%': '<(PRODUCT_DIR)/obj.target',
+        'v8_base': '<(PRODUCT_DIR)/libv8_base.a',
       }],
       ['openssl_fips != ""', {
-        'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
+        'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
       }, {
-        'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
+        'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
       }],
       ['OS=="mac"', {
         'clang%': 1,
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
index 84c6717e6b486d..67c3d554da3ba4 100644
--- a/deps/v8/include/v8-version.h
+++ b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 6
 #define V8_MINOR_VERSION 2
 #define V8_BUILD_NUMBER 414
-#define V8_PATCH_LEVEL 54
+#define V8_PATCH_LEVEL 55
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h
index c70154fd710e0c..2691b4c9445f7b 100644
--- a/deps/v8/include/v8.h
+++ b/deps/v8/include/v8.h
@@ -104,6 +104,7 @@ class String;
 class StringObject;
 class Symbol;
 class SymbolObject;
+class PrimitiveArray;
 class Private;
 class Uint32;
 class Utils;
@@ -978,6 +979,48 @@ class V8_EXPORT Data {
   Data();
 };
 
+/**
+ * This is an unfinished experimental feature, and is only exposed
+ * here for internal testing purposes. DO NOT USE.
+ *
+ * A container type that holds relevant metadata for module loading.
+ *
+ * This is passed back to the embedder as part of
+ * HostImportDynamicallyCallback for module loading.
+ */
+class V8_EXPORT ScriptOrModule {
+ public:
+  /**
+   * The name that was passed by the embedder as ResourceName to the
+   * ScriptOrigin. This can be either a v8::String or v8::Undefined.
+   */
+  Local<Value> GetResourceName();
+
+  /**
+   * The options that were passed by the embedder as HostDefinedOptions to
+   * the ScriptOrigin.
+   */
+  Local<PrimitiveArray> GetHostDefinedOptions();
+};
+
+/**
+ * This is an unfinished experimental feature, and is only exposed
+ * here for internal testing purposes. DO NOT USE.
+ *
+ * An array to hold Primitive values. This is used by the embedder to
+ * pass host defined options to the ScriptOptions during compilation.
+ *
+ * This is passed back to the embedder as part of
+ * HostImportDynamicallyCallback for module loading.
+ *
+ */
+class V8_EXPORT PrimitiveArray {
+ public:
+  static Local<PrimitiveArray> New(Isolate* isolate, int length);
+  int Length() const;
+  void Set(int index, Local<Primitive> item);
+  Local<Primitive> Get(int index);
+};
 
 /**
  * The optional attributes of ScriptOrigin.
@@ -1027,13 +1070,17 @@ class ScriptOrigin {
       Local<Value> source_map_url = Local<Value>(),
       Local<Boolean> resource_is_opaque = Local<Boolean>(),
       Local<Boolean> is_wasm = Local<Boolean>(),
-      Local<Boolean> is_module = Local<Boolean>());
+      Local<Boolean> is_module = Local<Boolean>() /*,
+      // Backed out for ABI compatibility with V8 6.2
+      Local<PrimitiveArray> host_defined_options = Local<PrimitiveArray>() */);
 
   V8_INLINE Local<Value> ResourceName() const;
   V8_INLINE Local<Integer> ResourceLineOffset() const;
   V8_INLINE Local<Integer> ResourceColumnOffset() const;
   V8_INLINE Local<Integer> ScriptID() const;
   V8_INLINE Local<Value> SourceMapUrl() const;
+  // Backed out for ABI compatibility with V8 6.2
+  // V8_INLINE Local<PrimitiveArray> HostDefinedOptions() const;
   V8_INLINE ScriptOriginOptions Options() const { return options_; }
 
  private:
@@ -1043,6 +1090,8 @@ class ScriptOrigin {
   ScriptOriginOptions options_;
   Local<Integer> script_id_;
   Local<Value> source_map_url_;
+  // Backed out for ABI compatibility with V8 6.2
+  // Local<PrimitiveArray> host_defined_options_;
 };
 
 /**
@@ -1289,6 +1338,7 @@ class V8_EXPORT ScriptCompiler {
     Local<Integer> resource_column_offset;
     ScriptOriginOptions resource_options;
     Local<Value> source_map_url;
+    // Local<PrimitiveArray> host_defined_options;
 
     // Cached data from previous compilation (if a kConsume*Cache flag is
     // set), or hold newly generated cache data (kProduce*Cache flags) are
@@ -6156,8 +6206,8 @@ typedef void (*DeprecatedCallCompletedCallback)();
  * embedder to load a module. This is used as part of the dynamic
  * import syntax.
  *
- * The referrer is the name of the file which calls the dynamic
- * import. The referrer can be used to resolve the module location.
+ * The referrer contains metadata about the script/module that calls
+ * import.
  *
  * The specifier is the name of the module that should be imported.
  *
@@ -6172,7 +6222,8 @@ typedef void (*DeprecatedCallCompletedCallback)();
  * that exception by returning an empty MaybeLocal.
  */
 typedef MaybeLocal<Promise> (*HostImportModuleDynamicallyCallback)(
-    Local<Context> context, Local<String> referrer, Local<String> specifier);
+    Local<Context> context, Local<ScriptOrModule> referrer,
+    Local<String> specifier);
 
 /**
  * PromiseHook with type kInit is called when a new promise is
@@ -9511,7 +9562,9 @@ ScriptOrigin::ScriptOrigin(Local<Value> resource_name,
                            Local<Integer> script_id,
                            Local<Value> source_map_url,
                            Local<Boolean> resource_is_opaque,
-                           Local<Boolean> is_wasm, Local<Boolean> is_module)
+                           Local<Boolean> is_wasm, Local<Boolean> is_module /*,
+                           // Backed out for ABI compatibility with V8 6.2
+                           Local<PrimitiveArray> host_defined_options */)
     : resource_name_(resource_name),
       resource_line_offset_(resource_line_offset),
       resource_column_offset_(resource_column_offset),
@@ -9521,10 +9574,16 @@ ScriptOrigin::ScriptOrigin(Local<Value> resource_name,
                !is_wasm.IsEmpty() && is_wasm->IsTrue(),
                !is_module.IsEmpty() && is_module->IsTrue()),
       script_id_(script_id),
-      source_map_url_(source_map_url) {}
+      source_map_url_(source_map_url) /*,
+      // Backed out for ABI compatibility with V8 6.2
+      host_defined_options_(host_defined_options) */ {}
 
 Local<Value> ScriptOrigin::ResourceName() const { return resource_name_; }
 
+// Backed out for ABI compatibility with V8 6.2
+// Local<PrimitiveArray> ScriptOrigin::HostDefinedOptions() const {
+//   return host_defined_options_;
+// }
 
 Local<Integer> ScriptOrigin::ResourceLineOffset() const {
   return resource_line_offset_;
@@ -9541,7 +9600,6 @@ Local<Integer> ScriptOrigin::ScriptID() const { return script_id_; }
 
 Local<Value> ScriptOrigin::SourceMapUrl() const { return source_map_url_; }
 
-
 ScriptCompiler::Source::Source(Local<String> string, const ScriptOrigin& origin,
                                CachedData* data)
     : source_string(string),
@@ -9550,9 +9608,10 @@ ScriptCompiler::Source::Source(Local<String> string, const ScriptOrigin& origin,
       resource_column_offset(origin.ResourceColumnOffset()),
       resource_options(origin.Options()),
       source_map_url(origin.SourceMapUrl()),
+      // Backed out for ABI compatibility with V8 6.2
+      // host_defined_options(origin.HostDefinedOptions()),
       cached_data(data) {}
 
-
 ScriptCompiler::Source::Source(Local<String> string,
                                CachedData* data)
     : source_string(string), cached_data(data) {}
diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc
index 76b095eb422712..e686722b4a39cc 100644
--- a/deps/v8/src/api.cc
+++ b/deps/v8/src/api.cc
@@ -278,6 +278,9 @@ static ScriptOrigin GetScriptOriginForScript(i::Isolate* isolate,
                                              i::Handle<i::Script> script) {
   i::Handle<i::Object> scriptName(script->GetNameOrSourceURL(), isolate);
   i::Handle<i::Object> source_map_url(script->source_mapping_url(), isolate);
+  // Backed out for ABI compatibility with V8 6.2
+  // i::Handle<i::FixedArray> host_defined_options(script->host_defined_options(),
+  //                                               isolate);
   v8::Isolate* v8_isolate =
       reinterpret_cast<v8::Isolate*>(script->GetIsolate());
   ScriptOriginOptions options(script->origin_options());
@@ -290,7 +293,9 @@ static ScriptOrigin GetScriptOriginForScript(i::Isolate* isolate,
       Utils::ToLocal(source_map_url),
       v8::Boolean::New(v8_isolate, options.IsOpaque()),
       v8::Boolean::New(v8_isolate, script->type() == i::Script::TYPE_WASM),
-      v8::Boolean::New(v8_isolate, options.IsModule()));
+      v8::Boolean::New(v8_isolate, options.IsModule()) /*,
+      // Backed out for ABI compatibility with V8 6.2
+      Utils::ToLocal(host_defined_options) */);
   return origin;
 }
 
@@ -2082,6 +2087,23 @@ Local<Value> Script::Run() {
   RETURN_TO_LOCAL_UNCHECKED(Run(context), Value);
 }
 
+Local<Value> ScriptOrModule::GetResourceName() {
+  i::Handle<i::Script> obj = Utils::OpenHandle(this);
+  i::Isolate* isolate = obj->GetIsolate();
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
+  i::Handle<i::Object> val(obj->name(), isolate);
+  return ToApiHandle<Value>(val);
+}
+
+Local<PrimitiveArray> ScriptOrModule::GetHostDefinedOptions() {
+  i::Handle<i::Script> obj = Utils::OpenHandle(this);
+  i::Isolate* isolate = obj->GetIsolate();
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
+  // Backed out for ABI compatibility with V8 6.2
+  // i::Handle<i::FixedArray> val(obj->host_defined_options(), isolate);
+  // return ToApiHandle<PrimitiveArray>(val);
+  return Local<PrimitiveArray>();
+}
 
 Local<UnboundScript> Script::GetUnboundScript() {
   i::Handle<i::Object> obj = Utils::OpenHandle(this);
@@ -2089,6 +2111,46 @@ Local<UnboundScript> Script::GetUnboundScript() {
       i::Handle<i::SharedFunctionInfo>(i::JSFunction::cast(*obj)->shared()));
 }
 
+// static
+Local<PrimitiveArray> PrimitiveArray::New(Isolate* v8_isolate, int length) {
+  i::Isolate* isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
+  Utils::ApiCheck(length >= 0, "v8::PrimitiveArray::New",
+                  "length must be equal or greater than zero");
+  i::Handle<i::FixedArray> array = isolate->factory()->NewFixedArray(length);
+  return ToApiHandle<PrimitiveArray>(array);
+}
+
+int PrimitiveArray::Length() const {
+  i::Handle<i::FixedArray> array = Utils::OpenHandle(this);
+  i::Isolate* isolate = array->GetIsolate();
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
+  return array->length();
+}
+
+void PrimitiveArray::Set(int index, Local<Primitive> item) {
+  i::Handle<i::FixedArray> array = Utils::OpenHandle(this);
+  i::Isolate* isolate = array->GetIsolate();
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
+  Utils::ApiCheck(index >= 0 && index < array->length(),
+                  "v8::PrimitiveArray::Set",
+                  "index must be greater than or equal to 0 and less than the "
+                  "array length");
+  i::Handle<i::Object> i_item = Utils::OpenHandle(*item);
+  array->set(index, *i_item);
+}
+
+Local<Primitive> PrimitiveArray::Get(int index) {
+  i::Handle<i::FixedArray> array = Utils::OpenHandle(this);
+  i::Isolate* isolate = array->GetIsolate();
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate);
+  Utils::ApiCheck(index >= 0 && index < array->length(),
+                  "v8::PrimitiveArray::Get",
+                  "index must be greater than or equal to 0 and less than the "
+                  "array length");
+  i::Handle<i::Object> i_item(array->get(index), isolate);
+  return ToApiHandle<Primitive>(i_item);
+}
 
 Module::Status Module::GetStatus() const {
   i::Handle<i::Module> self = Utils::OpenHandle(this);
@@ -2225,11 +2287,18 @@ MaybeLocal<UnboundScript> ScriptCompiler::CompileUnboundInternal(
     TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.compile"), "V8.CompileScript");
     i::Handle<i::Object> name_obj;
     i::Handle<i::Object> source_map_url;
+    // Backed out for ABI compatibility with V8 6.2
+    // i::Handle<i::FixedArray> host_defined_options =
+    //     isolate->factory()->empty_fixed_array();
     int line_offset = 0;
     int column_offset = 0;
     if (!source->resource_name.IsEmpty()) {
       name_obj = Utils::OpenHandle(*(source->resource_name));
     }
+    // Backed out for ABI compatibility with V8 6.2
+    // if (!source->host_defined_options.IsEmpty()) {
+    //   host_defined_options = Utils::OpenHandle(*(source->host_defined_options));
+    // }
     if (!source->resource_line_offset.IsEmpty()) {
       line_offset = static_cast<int>(source->resource_line_offset->Value());
     }
@@ -2243,7 +2312,7 @@ MaybeLocal<UnboundScript> ScriptCompiler::CompileUnboundInternal(
     result = i::Compiler::GetSharedFunctionInfoForScript(
         str, name_obj, line_offset, column_offset, source->resource_options,
         source_map_url, isolate->native_context(), NULL, &script_data, options,
-        i::NOT_NATIVES_CODE);
+        i::NOT_NATIVES_CODE /*, host_defined_options */);
     has_pending_exception = result.is_null();
     if (has_pending_exception && script_data != NULL) {
       // This case won't happen during normal operation; we have compiled
@@ -2508,6 +2577,10 @@ MaybeLocal<Script> ScriptCompiler::Compile(Local<Context> context,
   if (!origin.ResourceName().IsEmpty()) {
     script->set_name(*Utils::OpenHandle(*(origin.ResourceName())));
   }
+  // if (!origin.HostDefinedOptions().IsEmpty()) {
+  //   script->set_host_defined_options(
+  //       *Utils::OpenHandle(*(origin.HostDefinedOptions())));
+  // }
   if (!origin.ResourceLineOffset().IsEmpty()) {
     script->set_line_offset(
         static_cast<int>(origin.ResourceLineOffset()->Value()));
@@ -9871,7 +9944,9 @@ MaybeLocal<UnboundScript> debug::CompileInspectorScript(Isolate* v8_isolate,
         i::Handle<i::Object>(), isolate->native_context(), NULL, &script_data,
         ScriptCompiler::kNoCompileOptions,
         i::FLAG_expose_inspector_scripts ? i::NOT_NATIVES_CODE
-                                         : i::INSPECTOR_CODE);
+                                         : i::INSPECTOR_CODE /*,
+        // Backed out for ABI compatibility with V8 6.2
+        i::Handle<i::FixedArray>() */);
     has_pending_exception = result.is_null();
     RETURN_ON_FAILED_EXECUTION(UnboundScript);
   }
diff --git a/deps/v8/src/api.h b/deps/v8/src/api.h
index e856a4408ce756..33ce26eec4e0b7 100644
--- a/deps/v8/src/api.h
+++ b/deps/v8/src/api.h
@@ -111,7 +111,10 @@ class RegisteredExtension {
   V(NativeWeakMap, JSWeakMap)                  \
   V(debug::GeneratorObject, JSGeneratorObject) \
   V(debug::Script, Script)                     \
-  V(Promise, JSPromise)
+  V(Promise, JSPromise)                        \
+  V(Primitive, Object)                         \
+  V(PrimitiveArray, FixedArray)                \
+  V(ScriptOrModule, Script)
 
 class Utils {
  public:
@@ -209,6 +212,12 @@ class Utils {
       v8::internal::Handle<v8::internal::JSWeakMap> obj);
   static inline Local<Function> CallableToLocal(
       v8::internal::Handle<v8::internal::JSReceiver> obj);
+  static inline Local<Primitive> ToLocalPrimitive(
+      v8::internal::Handle<v8::internal::Object> obj);
+  static inline Local<PrimitiveArray> ToLocal(
+      v8::internal::Handle<v8::internal::FixedArray> obj);
+  static inline Local<ScriptOrModule> ScriptOrModuleToLocal(
+      v8::internal::Handle<v8::internal::Script> obj);
 
 #define DECLARE_OPEN_HANDLE(From, To) \
   static inline v8::internal::Handle<v8::internal::To> \
@@ -325,6 +334,9 @@ MAKE_TO_LOCAL(Uint32ToLocal, Object, Uint32)
 MAKE_TO_LOCAL(ExternalToLocal, JSObject, External)
 MAKE_TO_LOCAL(NativeWeakMapToLocal, JSWeakMap, NativeWeakMap)
 MAKE_TO_LOCAL(CallableToLocal, JSReceiver, Function)
+MAKE_TO_LOCAL(ToLocalPrimitive, Object, Primitive)
+MAKE_TO_LOCAL(ToLocal, FixedArray, PrimitiveArray)
+MAKE_TO_LOCAL(ScriptOrModuleToLocal, Script, ScriptOrModule)
 
 #undef MAKE_TO_LOCAL_TYPED_ARRAY
 #undef MAKE_TO_LOCAL
diff --git a/deps/v8/src/bootstrapper.cc b/deps/v8/src/bootstrapper.cc
index 41045f85839432..dc211962685b77 100644
--- a/deps/v8/src/bootstrapper.cc
+++ b/deps/v8/src/bootstrapper.cc
@@ -3540,6 +3540,8 @@ bool Bootstrapper::CompileNative(Isolate* isolate, Vector<const char> name,
       Compiler::GetSharedFunctionInfoForScript(
           source, script_name, 0, 0, ScriptOriginOptions(), Handle<Object>(),
           context, NULL, NULL, ScriptCompiler::kNoCompileOptions, natives_flag);
+          // Backed out for ABI compatibility with V8 6.2
+          // Handle<FixedArray>());
   if (function_info.is_null()) return false;
 
   DCHECK(context->IsNativeContext());
@@ -3602,6 +3604,8 @@ bool Genesis::CompileExtension(Isolate* isolate, v8::Extension* extension) {
     function_info = Compiler::GetSharedFunctionInfoForScript(
         source, script_name, 0, 0, ScriptOriginOptions(), Handle<Object>(),
         context, extension, NULL, ScriptCompiler::kNoCompileOptions,
+        // Backed out for ABI compatibility with V8 6.2
+        // EXTENSION_CODE, Handle<FixedArray>());
         EXTENSION_CODE);
     if (function_info.is_null()) return false;
     cache->Add(name, function_info);
diff --git a/deps/v8/src/compiler.cc b/deps/v8/src/compiler.cc
index 0f0bfd36cb8e84..c6d96a73fb8075 100644
--- a/deps/v8/src/compiler.cc
+++ b/deps/v8/src/compiler.cc
@@ -1192,6 +1192,9 @@ Handle<SharedFunctionInfo> Compiler::GetSharedFunctionInfoForScript(
     int column_offset, ScriptOriginOptions resource_options,
     Handle<Object> source_map_url, Handle<Context> context,
     v8::Extension* extension, ScriptData** cached_data,
+    // Backed out for ABI compatibility with V8 6.2
+    // ScriptCompiler::CompileOptions compile_options, NativesFlag natives,
+    // Handle<FixedArray> host_defined_options) {
     ScriptCompiler::CompileOptions compile_options, NativesFlag natives) {
   Isolate* isolate = source->GetIsolate();
   if (compile_options == ScriptCompiler::kNoCompileOptions) {
@@ -1288,6 +1291,10 @@ Handle<SharedFunctionInfo> Compiler::GetSharedFunctionInfoForScript(
     if (!source_map_url.is_null()) {
       script->set_source_mapping_url(*source_map_url);
     }
+    // Backed out for ABI compatibility with V8 6.2
+    // if (!host_defined_options.is_null()) {
+    //   script->set_host_defined_options(*host_defined_options);
+    // }
 
     // Compile the function and add it to the cache.
     ParseInfo parse_info(script);
diff --git a/deps/v8/src/compiler.h b/deps/v8/src/compiler.h
index 32776580171717..a4fbc7e096deab 100644
--- a/deps/v8/src/compiler.h
+++ b/deps/v8/src/compiler.h
@@ -114,6 +114,8 @@ class V8_EXPORT_PRIVATE Compiler : public AllStatic {
       v8::Extension* extension, ScriptData** cached_data,
       ScriptCompiler::CompileOptions compile_options,
       NativesFlag is_natives_code);
+      // Backed out for ABI compatibility with V8 6.2
+      // NativesFlag is_natives_code, Handle<FixedArray> host_defined_options);
 
   // Create a shared function info object for a Script that has already been
   // parsed while the script was being loaded from a streamed source.
diff --git a/deps/v8/src/d8.cc b/deps/v8/src/d8.cc
index d833fdd658265e..564472a06ca320 100644
--- a/deps/v8/src/d8.cc
+++ b/deps/v8/src/d8.cc
@@ -793,15 +793,17 @@ struct DynamicImportData {
 }  // namespace
 
 MaybeLocal<Promise> Shell::HostImportModuleDynamically(
-    Local<Context> context, Local<String> referrer, Local<String> specifier) {
+    Local<Context> context, Local<ScriptOrModule> referrer,
+    Local<String> specifier) {
   Isolate* isolate = context->GetIsolate();
 
   MaybeLocal<Promise::Resolver> maybe_resolver =
       Promise::Resolver::New(context);
   Local<Promise::Resolver> resolver;
   if (maybe_resolver.ToLocal(&resolver)) {
-    DynamicImportData* data =
-        new DynamicImportData(isolate, referrer, specifier, resolver);
+    DynamicImportData* data = new DynamicImportData(
+        isolate, Local<String>::Cast(referrer->GetResourceName()), specifier,
+        resolver);
     isolate->EnqueueMicrotask(Shell::DoHostImportModuleDynamically, data);
     return resolver->GetPromise();
   }
diff --git a/deps/v8/src/d8.h b/deps/v8/src/d8.h
index d8a85ac82b1cfb..c0922bc59506ae 100644
--- a/deps/v8/src/d8.h
+++ b/deps/v8/src/d8.h
@@ -447,7 +447,8 @@ class Shell : public i::AllStatic {
   static void MakeDirectory(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void RemoveDirectory(const v8::FunctionCallbackInfo<v8::Value>& args);
   static MaybeLocal<Promise> HostImportModuleDynamically(
-      Local<Context> context, Local<String> referrer, Local<String> specifier);
+      Local<Context> context, Local<ScriptOrModule> referrer,
+      Local<String> specifier);
 
   // Data is of type DynamicImportData*. We use void* here to be able
   // to conform with MicrotaskCallback interface and enqueue this
diff --git a/deps/v8/src/factory.cc b/deps/v8/src/factory.cc
index d292f509601ed5..786a7876b7f4e5 100644
--- a/deps/v8/src/factory.cc
+++ b/deps/v8/src/factory.cc
@@ -1146,7 +1146,8 @@ Handle<Script> Factory::NewScript(Handle<String> source) {
   script->set_eval_from_position(0);
   script->set_shared_function_infos(*empty_fixed_array(), SKIP_WRITE_BARRIER);
   script->set_flags(0);
-
+  // Backed out for ABI compatibility with V8 6.2
+  // script->set_host_defined_options(*empty_fixed_array());
   heap->set_script_list(*WeakFixedArray::Add(script_list(), script));
   return script;
 }
diff --git a/deps/v8/src/isolate.cc b/deps/v8/src/isolate.cc
index 96f5d655b85e8f..8a4f2ee12b36ca 100644
--- a/deps/v8/src/isolate.cc
+++ b/deps/v8/src/isolate.cc
@@ -3330,7 +3330,7 @@ MaybeHandle<JSPromise> NewRejectedPromise(Isolate* isolate,
 }  // namespace
 
 MaybeHandle<JSPromise> Isolate::RunHostImportModuleDynamicallyCallback(
-    Handle<String> source_url, Handle<Object> specifier) {
+    Handle<Script> referrer, Handle<Object> specifier) {
   v8::Local<v8::Context> api_context = v8::Utils::ToLocal(native_context());
 
   if (host_import_module_dynamically_callback_ == nullptr) {
@@ -3353,7 +3353,7 @@ MaybeHandle<JSPromise> Isolate::RunHostImportModuleDynamicallyCallback(
   ASSIGN_RETURN_ON_SCHEDULED_EXCEPTION_VALUE(
       this, promise,
       host_import_module_dynamically_callback_(
-          api_context, v8::Utils::ToLocal(source_url),
+          api_context, v8::Utils::ScriptOrModuleToLocal(referrer),
           v8::Utils::ToLocal(specifier_str)),
       MaybeHandle<JSPromise>());
   return v8::Utils::OpenHandle(*promise);
diff --git a/deps/v8/src/isolate.h b/deps/v8/src/isolate.h
index 96bf44bbdafc99..aeb6685f61d460 100644
--- a/deps/v8/src/isolate.h
+++ b/deps/v8/src/isolate.h
@@ -1245,7 +1245,7 @@ class Isolate {
   void SetHostImportModuleDynamicallyCallback(
       HostImportModuleDynamicallyCallback callback);
   MaybeHandle<JSPromise> RunHostImportModuleDynamicallyCallback(
-      Handle<String> referrer, Handle<Object> specifier);
+      Handle<Script> referrer, Handle<Object> specifier);
 
   void SetRAILMode(RAILMode rail_mode);
 
diff --git a/deps/v8/src/objects/script-inl.h b/deps/v8/src/objects/script-inl.h
index 7a639080c76b5a..b22ca2b948cd8e 100644
--- a/deps/v8/src/objects/script-inl.h
+++ b/deps/v8/src/objects/script-inl.h
@@ -34,6 +34,8 @@ ACCESSORS(Script, shared_function_infos, FixedArray, kSharedFunctionInfosOffset)
 SMI_ACCESSORS(Script, flags, kFlagsOffset)
 ACCESSORS(Script, source_url, Object, kSourceUrlOffset)
 ACCESSORS(Script, source_mapping_url, Object, kSourceMappingUrlOffset)
+// Backed out for ABI compatibility with V8 6.2
+// ACCESSORS(Script, host_defined_options, FixedArray, kHostDefinedOptionsOffset)
 ACCESSORS_CHECKED(Script, wasm_compiled_module, Object, kEvalFromSharedOffset,
                   this->type() == TYPE_WASM)
 
diff --git a/deps/v8/src/objects/script.h b/deps/v8/src/objects/script.h
index fc9385d609f850..2f6e76a1be342a 100644
--- a/deps/v8/src/objects/script.h
+++ b/deps/v8/src/objects/script.h
@@ -88,6 +88,10 @@ class Script : public Struct {
   // This must only be called if the type of this script is TYPE_WASM.
   DECL_ACCESSORS(wasm_compiled_module, Object)
 
+  // Backed out for ABI compatibility with V8 6.2
+  // // [host_defined_options]: Options defined by the embedder.
+  // DECL_ACCESSORS(host_defined_options, FixedArray)
+
   // [compilation_type]: how the the script was compiled. Encoded in the
   // 'flags' field.
   inline CompilationType compilation_type();
@@ -195,6 +199,10 @@ class Script : public Struct {
   static const int kFlagsOffset = kSharedFunctionInfosOffset + kPointerSize;
   static const int kSourceUrlOffset = kFlagsOffset + kPointerSize;
   static const int kSourceMappingUrlOffset = kSourceUrlOffset + kPointerSize;
+  // Backed out for ABI compatibility with V8 6.2
+  // static const int kHostDefinedOptionsOffset =
+  //     kSourceMappingUrlOffset + kPointerSize;
+  // static const int kSize = kHostDefinedOptionsOffset + kPointerSize;
   static const int kSize = kSourceMappingUrlOffset + kPointerSize;
 
  private:
diff --git a/deps/v8/src/runtime/runtime-module.cc b/deps/v8/src/runtime/runtime-module.cc
index 7391efc72df71f..6d83443ea8a559 100644
--- a/deps/v8/src/runtime/runtime-module.cc
+++ b/deps/v8/src/runtime/runtime-module.cc
@@ -26,12 +26,9 @@ RUNTIME_FUNCTION(Runtime_DynamicImportCall) {
         isolate);
   }
 
-  // TODO(gsathya): Check if script name is a string before casting
-  // and return undefined if not.
-  Handle<String> source_url(String::cast(script->name()));
   RETURN_RESULT_OR_FAILURE(
       isolate,
-      isolate->RunHostImportModuleDynamicallyCallback(source_url, specifier));
+      isolate->RunHostImportModuleDynamicallyCallback(script, specifier));
 }
 
 RUNTIME_FUNCTION(Runtime_GetModuleNamespace) {
diff --git a/deps/v8/test/cctest/compiler/test-linkage.cc b/deps/v8/test/cctest/compiler/test-linkage.cc
index cdca5223cb44bf..d9161742dab173 100644
--- a/deps/v8/test/cctest/compiler/test-linkage.cc
+++ b/deps/v8/test/cctest/compiler/test-linkage.cc
@@ -36,6 +36,9 @@ static Handle<JSFunction> Compile(const char* source) {
   Handle<SharedFunctionInfo> shared = Compiler::GetSharedFunctionInfoForScript(
       source_code, Handle<String>(), 0, 0, v8::ScriptOriginOptions(),
       Handle<Object>(), Handle<Context>(isolate->native_context()), NULL, NULL,
+      // Backed out for ABI compatibility with V8 6.2
+      // v8::ScriptCompiler::kNoCompileOptions, NOT_NATIVES_CODE,
+      // Handle<FixedArray>());
       v8::ScriptCompiler::kNoCompileOptions, NOT_NATIVES_CODE);
   return isolate->factory()->NewFunctionFromSharedFunctionInfo(
       shared, isolate->native_context());
diff --git a/deps/v8/test/cctest/test-api.cc b/deps/v8/test/cctest/test-api.cc
index 6cdb6291605ea4..b0e070a68a3046 100644
--- a/deps/v8/test/cctest/test-api.cc
+++ b/deps/v8/test/cctest/test-api.cc
@@ -19075,11 +19075,21 @@ TEST(Regress528) {
 THREADED_TEST(ScriptOrigin) {
   LocalContext env;
   v8::HandleScope scope(env->GetIsolate());
+  // Backed out for ABI compatibility with V8 6.2
+  // v8::Isolate* isolate = env->GetIsolate();
+  // v8::HandleScope scope(isolate);
+  // Local<v8::PrimitiveArray> array(v8::PrimitiveArray::New(isolate, 1));
+  // Local<v8::Symbol> symbol(v8::Symbol::New(isolate));
+  // array->Set(0, symbol);
+
   v8::ScriptOrigin origin = v8::ScriptOrigin(
       v8_str("test"), v8::Integer::New(env->GetIsolate(), 1),
       v8::Integer::New(env->GetIsolate(), 1), v8::True(env->GetIsolate()),
       v8::Local<v8::Integer>(), v8_str("http://sourceMapUrl"),
-      v8::True(env->GetIsolate()));
+      v8::True(env->GetIsolate()), v8::False(env->GetIsolate()),
+      // Backed out for ABI compatibility with V8 6.2
+      // v8::False(env->GetIsolate()), array);
+      v8::False(env->GetIsolate()));
   v8::Local<v8::String> script = v8_str("function f() {}\n\nfunction g() {}");
   v8::Script::Compile(env.local(), script, &origin)
       .ToLocalChecked()
@@ -19100,6 +19110,8 @@ THREADED_TEST(ScriptOrigin) {
   CHECK(script_origin_f.Options().IsSharedCrossOrigin());
   CHECK(script_origin_f.Options().IsOpaque());
   printf("is name = %d\n", script_origin_f.SourceMapUrl()->IsUndefined());
+  // Backed out for ABI compatibility with V8 6.2
+  // CHECK(script_origin_f.HostDefinedOptions()->Get(0)->IsSymbol());
 
   CHECK_EQ(0, strcmp("http://sourceMapUrl",
                      *v8::String::Utf8Value(env->GetIsolate(),
@@ -19117,6 +19129,8 @@ THREADED_TEST(ScriptOrigin) {
   CHECK_EQ(0, strcmp("http://sourceMapUrl",
                      *v8::String::Utf8Value(env->GetIsolate(),
                                             script_origin_g.SourceMapUrl())));
+  // Backed out for ABI compatibility with V8 6.2
+  // CHECK(script_origin_g.HostDefinedOptions()->Get(0)->IsSymbol());
 }
 
 
@@ -27011,10 +27025,14 @@ TEST(CorrectEnteredContext) {
 }
 
 v8::MaybeLocal<v8::Promise> HostImportModuleDynamicallyCallbackResolve(
-    Local<Context> context, Local<String> referrer, Local<String> specifier) {
+    Local<Context> context, Local<v8::ScriptOrModule> referrer,
+    Local<String> specifier) {
   CHECK(!referrer.IsEmpty());
-  String::Utf8Value referrer_utf8(context->GetIsolate(), referrer);
+  String::Utf8Value referrer_utf8(
+      context->GetIsolate(), Local<String>::Cast(referrer->GetResourceName()));
   CHECK_EQ(0, strcmp("www.google.com", *referrer_utf8));
+  // Backed out for ABI compatibility with V8 6.2
+  // CHECK(referrer->GetHostDefinedOptions()->Get(0)->IsSymbol());
 
   CHECK(!specifier.IsEmpty());
   String::Utf8Value specifier_utf8(context->GetIsolate(), specifier);
@@ -27039,9 +27057,18 @@ TEST(DynamicImport) {
   i::Handle<i::String> url(v8::Utils::OpenHandle(*v8_str("www.google.com")));
   i::Handle<i::Object> specifier(v8::Utils::OpenHandle(*v8_str("index.js")));
   i::Handle<i::String> result(v8::Utils::OpenHandle(*v8_str("hello world")));
+  i::Handle<i::String> source(v8::Utils::OpenHandle(*v8_str("foo")));
   i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
+  // Backed out for ABI compatibility with V8 6.2
+  // i::Handle<i::FixedArray> options = i_isolate->factory()->NewFixedArray(1);
+  // i::Handle<i::Symbol> symbol = i_isolate->factory()->NewSymbol();
+  // options->set(0, *symbol);
+  i::Handle<i::Script> referrer = i_isolate->factory()->NewScript(source);
+  referrer->set_name(*url);
+  // Backed out for ABI compatibility with V8 6.2
+  // referrer->set_host_defined_options(*options);
   i::MaybeHandle<i::JSPromise> maybe_promise =
-      i_isolate->RunHostImportModuleDynamicallyCallback(url, specifier);
+      i_isolate->RunHostImportModuleDynamicallyCallback(referrer, specifier);
   i::Handle<i::JSPromise> promise = maybe_promise.ToHandleChecked();
   isolate->RunMicrotasks();
   CHECK(result->Equals(i::String::cast(promise->result())));
@@ -27062,3 +27089,50 @@ TEST(GlobalTemplateWithDoubleProperty) {
   CHECK(result->IsNumber());
   CheckDoubleEquals(3.14, result->NumberValue(context).ToChecked());
 }
+
+TEST(PrimitiveArray) {
+  v8::Isolate* isolate = CcTest::isolate();
+  v8::HandleScope scope(isolate);
+  LocalContext env;
+
+  int length = 5;
+  Local<v8::PrimitiveArray> array(v8::PrimitiveArray::New(isolate, 5));
+  CHECK_EQ(length, array->Length());
+
+  for (int i = 0; i < length; i++) {
+    Local<v8::Primitive> item = array->Get(i);
+    CHECK(item->IsUndefined());
+  }
+
+  Local<v8::Symbol> symbol(v8::Symbol::New(isolate));
+  array->Set(0, symbol);
+  CHECK(array->Get(0)->IsSymbol());
+
+  Local<v8::String> string =
+      v8::String::NewFromUtf8(isolate, "test", v8::NewStringType::kInternalized)
+          .ToLocalChecked();
+  array->Set(1, string);
+  CHECK(array->Get(0)->IsSymbol());
+  CHECK(array->Get(1)->IsString());
+
+  Local<v8::Number> num = v8::Number::New(env->GetIsolate(), 3.1415926);
+  array->Set(2, num);
+  CHECK(array->Get(0)->IsSymbol());
+  CHECK(array->Get(1)->IsString());
+  CHECK(array->Get(2)->IsNumber());
+
+  v8::Local<v8::Boolean> f = v8::False(isolate);
+  array->Set(3, f);
+  CHECK(array->Get(0)->IsSymbol());
+  CHECK(array->Get(1)->IsString());
+  CHECK(array->Get(2)->IsNumber());
+  CHECK(array->Get(3)->IsBoolean());
+
+  v8::Local<v8::Primitive> n = v8::Null(isolate);
+  array->Set(4, n);
+  CHECK(array->Get(0)->IsSymbol());
+  CHECK(array->Get(1)->IsString());
+  CHECK(array->Get(2)->IsNumber());
+  CHECK(array->Get(3)->IsBoolean());
+  CHECK(array->Get(4)->IsNull());
+}
diff --git a/deps/v8/test/cctest/test-compiler.cc b/deps/v8/test/cctest/test-compiler.cc
index c6940834bc3771..e2909c725e88fa 100644
--- a/deps/v8/test/cctest/test-compiler.cc
+++ b/deps/v8/test/cctest/test-compiler.cc
@@ -66,6 +66,9 @@ static Handle<JSFunction> Compile(const char* source) {
   Handle<SharedFunctionInfo> shared = Compiler::GetSharedFunctionInfoForScript(
       source_code, Handle<String>(), 0, 0, v8::ScriptOriginOptions(),
       Handle<Object>(), Handle<Context>(isolate->native_context()), NULL, NULL,
+      // Backed out for ABI compatibility with V8 6.2
+      // v8::ScriptCompiler::kNoCompileOptions, NOT_NATIVES_CODE,
+      // Handle<FixedArray>());
       v8::ScriptCompiler::kNoCompileOptions, NOT_NATIVES_CODE);
   return isolate->factory()->NewFunctionFromSharedFunctionInfo(
       shared, isolate->native_context());
diff --git a/deps/v8/test/cctest/test-serialize.cc b/deps/v8/test/cctest/test-serialize.cc
index d3bb7a099cd701..1f1d3e6010f1d6 100644
--- a/deps/v8/test/cctest/test-serialize.cc
+++ b/deps/v8/test/cctest/test-serialize.cc
@@ -879,6 +879,8 @@ static Handle<SharedFunctionInfo> CompileScript(
   return Compiler::GetSharedFunctionInfoForScript(
       source, name, 0, 0, v8::ScriptOriginOptions(), Handle<Object>(),
       Handle<Context>(isolate->native_context()), NULL, cached_data, options,
+      // Backed out for ABI compatibility with V8 6.2
+      // NOT_NATIVES_CODE, Handle<FixedArray>());
       NOT_NATIVES_CODE);
 }
 
@@ -1728,6 +1730,9 @@ TEST(Regress503552) {
   Handle<SharedFunctionInfo> shared = Compiler::GetSharedFunctionInfoForScript(
       source, Handle<String>(), 0, 0, v8::ScriptOriginOptions(),
       Handle<Object>(), Handle<Context>(isolate->native_context()), NULL,
+      // Backed out for ABI compatibility with V8 6.2
+      // &script_data, v8::ScriptCompiler::kProduceCodeCache, NOT_NATIVES_CODE,
+      // Handle<FixedArray>());
       &script_data, v8::ScriptCompiler::kProduceCodeCache, NOT_NATIVES_CODE);
   delete script_data;
 
diff --git a/deps/v8/tools/v8heapconst.py b/deps/v8/tools/v8heapconst.py
index 3fb29d84dad3df..54997ab3ffdac9 100644
--- a/deps/v8/tools/v8heapconst.py
+++ b/deps/v8/tools/v8heapconst.py
@@ -297,24 +297,24 @@
   ("OLD_SPACE", 0x026a9): "EmptyFixedUint32Array",
   ("OLD_SPACE", 0x026c9): "EmptyFixedInt32Array",
   ("OLD_SPACE", 0x026e9): "EmptyFixedFloat32Array",
-  ("OLD_SPACE", 0x02709): "EmptyFixedFloat64Array",
-  ("OLD_SPACE", 0x02729): "EmptyFixedUint8ClampedArray",
-  ("OLD_SPACE", 0x02749): "EmptyScript",
-  ("OLD_SPACE", 0x027c9): "UndefinedCell",
-  ("OLD_SPACE", 0x027d9): "EmptySloppyArgumentsElements",
-  ("OLD_SPACE", 0x027f9): "EmptySlowElementDictionary",
-  ("OLD_SPACE", 0x02841): "EmptyPropertyCell",
-  ("OLD_SPACE", 0x02869): "EmptyWeakCell",
-  ("OLD_SPACE", 0x02879): "ArrayProtector",
-  ("OLD_SPACE", 0x028a1): "IsConcatSpreadableProtector",
-  ("OLD_SPACE", 0x028b1): "SpeciesProtector",
-  ("OLD_SPACE", 0x028d9): "StringLengthProtector",
-  ("OLD_SPACE", 0x028e9): "FastArrayIterationProtector",
-  ("OLD_SPACE", 0x028f9): "ArrayIteratorProtector",
-  ("OLD_SPACE", 0x02921): "ArrayBufferNeuteringProtector",
-  ("OLD_SPACE", 0x02949): "InfinityValue",
-  ("OLD_SPACE", 0x02959): "MinusZeroValue",
-  ("OLD_SPACE", 0x02969): "MinusInfinityValue",
+  ("OLD_SPACE", 0x02719): "EmptyFixedFloat64Array",
+  ("OLD_SPACE", 0x02739): "EmptyFixedUint8ClampedArray",
+  ("OLD_SPACE", 0x02759): "EmptyScript",
+  ("OLD_SPACE", 0x027e1): "UndefinedCell",
+  ("OLD_SPACE", 0x027f1): "EmptySloppyArgumentsElements",
+  ("OLD_SPACE", 0x02811): "EmptySlowElementDictionary",
+  ("OLD_SPACE", 0x02859): "EmptyPropertyCell",
+  ("OLD_SPACE", 0x02881): "EmptyWeakCell",
+  ("OLD_SPACE", 0x02891): "ArrayProtector",
+  ("OLD_SPACE", 0x028b9): "IsConcatSpreadableProtector",
+  ("OLD_SPACE", 0x028c9): "SpeciesProtector",
+  ("OLD_SPACE", 0x028f1): "StringLengthProtector",
+  ("OLD_SPACE", 0x02901): "FastArrayIterationProtector",
+  ("OLD_SPACE", 0x02911): "ArrayIteratorProtector",
+  ("OLD_SPACE", 0x02939): "ArrayBufferNeuteringProtector",
+  ("OLD_SPACE", 0x02961): "InfinityValue",
+  ("OLD_SPACE", 0x02971): "MinusZeroValue",
+  ("OLD_SPACE", 0x02981): "MinusInfinityValue",
 }
 
 # List of known V8 Frame Markers.
diff --git a/doc/api/cli.md b/doc/api/cli.md
index 3192d846e77933..63af8ba5ac85f1 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -238,6 +238,14 @@ added: v7.7.0
 A comma separated list of categories that should be traced when trace event
 tracing is enabled using `--trace-events-enabled`.
 
+### `--trace-event-file-pattern`
+<!-- YAML
+added: REPLACEME
+-->
+
+Template string specifying the filepath for the trace event data, it
+supports `${rotation}` and `${pid}`.
+
 ### `--zero-fill-buffers`
 <!-- YAML
 added: v6.0.0
@@ -474,6 +482,7 @@ Node options that are allowed are:
 - `--trace-deprecation`
 - `--trace-events-categories`
 - `--trace-events-enabled`
+- `--trace-event-file-pattern`
 - `--trace-sync-io`
 - `--trace-warnings`
 - `--track-heap-objects`
diff --git a/doc/api/esm.md b/doc/api/esm.md
index 926555fc771484..12805224dac52e 100644
--- a/doc/api/esm.md
+++ b/doc/api/esm.md
@@ -33,8 +33,8 @@ node --experimental-modules my-app.mjs
 ### Supported
 
 Only the CLI argument for the main entry point to the program can be an entry
-point into an ESM graph. In the future `import()` can be used to create entry
-points into ESM graphs at run time.
+point into an ESM graph. Dynamic import can also be used to create entry points
+into ESM graphs at runtime.
 
 ### Unsupported
 
diff --git a/doc/api/http.md b/doc/api/http.md
index 7331d8bc5d969d..284f35c68b442b 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -1663,10 +1663,21 @@ A collection of all the standard HTTP response status codes, and the
 short description of each. For example, `http.STATUS_CODES[404] === 'Not
 Found'`.
 
-## http.createServer([requestListener])
+## http.createServer([options][, requestListener])
 <!-- YAML
 added: v0.1.13
--->
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/15752
+    description: The `options` argument is supported now.
+-->
+- `options` {Object}
+  * `IncomingMessage` {http.IncomingMessage} Specifies the IncomingMessage class
+    to be used. Useful for extending the original `IncomingMessage`. Defaults
+    to: `IncomingMessage`
+  * `ServerResponse` {http.ServerResponse} Specifies the ServerResponse class to
+    be used. Useful for extending the original `ServerResponse`. Defaults to:
+    `ServerResponse`
 - `requestListener` {Function}
 
 * Returns: {http.Server}
diff --git a/doc/api/http2.md b/doc/api/http2.md
index 58f923ab3b33b2..cfa018bce231ce 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -1698,6 +1698,10 @@ changes:
     pr-url: https://github.com/nodejs/node/pull/16676
     description: Added the `maxHeaderListPairs` option with a default limit of
                  128 header pairs.
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/15752
+    description: Added the `Http1IncomingMessage` and `Http1ServerResponse`
+                 option.
 -->
 
 * `options` {Object}
@@ -1747,6 +1751,20 @@ changes:
     used to determine the padding. See [Using options.selectPadding][].
   * `settings` {HTTP/2 Settings Object} The initial settings to send to the
     remote peer upon connection.
+  * `Http1IncomingMessage` {http.IncomingMessage} Specifies the IncomingMessage
+    class to used for HTTP/1 fallback. Useful for extending the original
+    `http.IncomingMessage`. **Default:** `http.IncomingMessage`
+  * `Http1ServerResponse` {http.ServerResponse} Specifies the ServerResponse
+    class to used for HTTP/1 fallback. Useful for extending the original
+    `http.ServerResponse`. **Default:** `http.ServerResponse`
+  * `Http2ServerRequest` {http2.Http2ServerRequest} Specifies the
+    Http2ServerRequest class to use.
+    Useful for extending the original `Http2ServerRequest`.
+    **Default:** `Http2ServerRequest`
+  * `Http2ServerResponse` {http2.Http2ServerResponse} Specifies the
+    Http2ServerResponse class to use.
+    Useful for extending the original `Http2ServerResponse`.
+    **Default:** `Http2ServerResponse`
 * `onRequestHandler` {Function} See [Compatibility API][]
 * Returns: {Http2Server}
 
diff --git a/doc/api/https.md b/doc/api/https.md
index daf10ac4a2bb94..490c3f477f9d41 100644
--- a/doc/api/https.md
+++ b/doc/api/https.md
@@ -65,7 +65,8 @@ See [`http.Server#keepAliveTimeout`][].
 <!-- YAML
 added: v0.3.4
 -->
-- `options` {Object} Accepts `options` from [`tls.createServer()`][] and [`tls.createSecureContext()`][].
+- `options` {Object} Accepts `options` from [`tls.createServer()`][],
+ [`tls.createSecureContext()`][] and [`http.createServer()`][].
 - `requestListener` {Function} A listener to be added to the `request` event.
 
 Example:
@@ -255,6 +256,7 @@ const req = https.request(options, (res) => {
 [`http.Server#setTimeout()`]: http.html#http_server_settimeout_msecs_callback
 [`http.Server#timeout`]: http.html#http_server_timeout
 [`http.Server`]: http.html#http_class_http_server
+[`http.createServer()`]: http.html#httpcreateserveroptions-requestlistener
 [`http.close()`]: http.html#http_server_close_callback
 [`http.get()`]: http.html#http_http_get_options_callback
 [`http.request()`]: http.html#http_http_request_options_callback
diff --git a/doc/api/n-api.md b/doc/api/n-api.md
index e3e3242ef321bb..9d8874b8b062be 100644
--- a/doc/api/n-api.md
+++ b/doc/api/n-api.md
@@ -2,7 +2,7 @@
 
 <!--introduced_in=v7.10.0-->
 
-> Stability: 1 - Experimental
+> Stability: 2 - Stable
 
 N-API (pronounced N as in the letter, followed by API)
 is an API for building native Addons. It is independent from
diff --git a/doc/api/tracing.md b/doc/api/tracing.md
index e03477b1adf20c..13caa2a509bf74 100644
--- a/doc/api/tracing.md
+++ b/doc/api/tracing.md
@@ -19,3 +19,16 @@ node --trace-events-enabled --trace-event-categories v8,node,node.async_hooks se
 Running Node.js with tracing enabled will produce log files that can be opened
 in the [`chrome://tracing`](https://www.chromium.org/developers/how-tos/trace-event-profiling-tool)
 tab of Chrome.
+
+The logging file is by default called `node_trace.${rotation}.log`, where
+`${rotation}` is an incrementing log-rotation id. The filepath pattern can
+be specified with `--trace-event-file-pattern` that accepts a template
+string that supports `${rotation}` and `${pid}`. For example:
+
+```txt
+node --trace-events-enabled --trace-event-file-pattern '${pid}-${rotation}.log' server.js
+```
+
+Starting with Node 10.0.0, the tracing system uses the same time source as the
+one used by `process.hrtime()` however the trace-event timestamps are expressed
+in microseconds, unlike `process.hrtime()` which returns nanoseconds.
diff --git a/doc/api/url.md b/doc/api/url.md
index 40cc002f048e81..55649313b3a2e4 100644
--- a/doc/api/url.md
+++ b/doc/api/url.md
@@ -1112,12 +1112,15 @@ forward slash (`/`) character is encoded as `%3C`.
 The [WHATWG URL Standard][] uses a more selective and fine grained approach to
 selecting encoded characters than that used by the Legacy API.
 
-The WHATWG algorithm defines three "percent-encode sets" that describe ranges
+The WHATWG algorithm defines four "percent-encode sets" that describe ranges
 of characters that must be percent-encoded:
 
 * The *C0 control percent-encode set* includes code points in range U+0000 to
   U+001F (inclusive) and all code points greater than U+007E.
 
+* The *fragment percent-encode set* includes the *C0 control percent-encode set*
+  and code points U+0020, U+0022, U+003C, U+003E, and U+0060.
+
 * The *path percent-encode set* includes the *C0 control percent-encode set*
   and code points U+0020, U+0022, U+0023, U+003C, U+003E, U+003F, U+0060,
   U+007B, and U+007D.
@@ -1128,9 +1131,9 @@ of characters that must be percent-encoded:
 
 The *userinfo percent-encode set* is used exclusively for username and
 passwords encoded within the URL. The *path percent-encode set* is used for the
-path of most URLs. The *C0 control percent-encode set* is used for all
-other cases, including URL fragments in particular, but also host and path
-under certain specific conditions.
+path of most URLs. The *fragment percent-encode set* is used for URL fragments.
+The *C0 control percent-encode set* is used for host and path under certain
+specific conditions, in addition to all other cases.
 
 When non-ASCII characters appear within a hostname, the hostname is encoded
 using the [Punycode][] algorithm. Note, however, that a hostname *may* contain
diff --git a/doc/api/util.md b/doc/api/util.md
index 7932b815e4a5e9..490895c000a507 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -217,6 +217,25 @@ without any formatting.
 util.format('%% %s'); // '%% %s'
 ```
 
+## util.getSystemErrorName(err)
+<!-- YAML
+added: REPLACEME
+-->
+
+* `err` {number}
+* Returns: {string}
+
+Returns the string name for a numeric error code that comes from a Node.js API.
+The mapping between error codes and error names is platform-dependent.
+See [Common System Errors][] for the names of common errors.
+
+```js
+fs.access('file/that/does/not/exist', (err) => {
+  const name = util.getSystemErrorName(err.errno);
+  console.error(name);  // ENOENT
+});
+```
+
 ## util.inherits(constructor, superConstructor)
 <!-- YAML
 added: v0.3.0
@@ -1196,6 +1215,7 @@ Deprecated predecessor of `console.log`.
 [`console.log()`]: console.html#console_console_log_data_args
 [`util.inspect()`]: #util_util_inspect_object_options
 [`util.promisify()`]: #util_util_promisify_original
+[Common System Errors]: errors.html#errors_common_system_errors
 [Custom inspection functions on Objects]: #util_custom_inspection_functions_on_objects
 [Custom promisified functions]: #util_custom_promisified_functions
 [Customizing `util.inspect` colors]: #util_customizing_util_inspect_colors
diff --git a/doc/guides/node-postmortem-support.md b/doc/guides/node-postmortem-support.md
new file mode 100644
index 00000000000000..e29d9ca3a1fdf0
--- /dev/null
+++ b/doc/guides/node-postmortem-support.md
@@ -0,0 +1,72 @@
+# Postmortem Support
+
+Postmortem metadata are constants present in the final build which can be used
+by debuggers and other tools to navigate through internal structures of software
+when analyzing its memory (either on a running process or a core dump). Node
+provides this metadata in its builds for V8 and Node internal structures.
+
+
+### V8 Postmortem metadata
+
+V8 prefixes all postmortem constants with `v8dbg_`, and they allow inspection of
+objects on the heap as well as object properties and references. V8 generates
+those symbols with a script (`deps/v8/tools/gen-postmortem-metadata.py`), and
+Node always includes these constants in the final build.
+
+### Node Debug Symbols
+
+Node prefixes all postmortem constants with `nodedbg_`, and they complement V8
+constants by providing ways to inspect Node-specific structures, like
+`node::Environment`, `node::BaseObject` and its descendants, classes from
+`src/utils.h` and others. Those constants are declared in
+`src/node_postmortem_metadata.cc`, and most of them are calculated at compile
+time.
+
+#### Calculating offset of class members
+
+Node constants referring to the offset of class members in memory are calculated
+at compile time. Because of that, those class members must be at a fixed offset
+from the start of the class. That's not a problem in most cases, but it also
+means that those members should always come after any templated member on the
+class definition.
+
+For example, if we want to add a constant with the offset for
+`ReqWrap::req_wrap_queue_`, it should be defined after `ReqWrap::req_`, because
+`sizeof(req_)` depends on the type of T, which means the class definition should
+be like this:
+
+```c++
+template <typename T>
+class ReqWrap : public AsyncWrap {
+ private:
+  // req_wrap_queue_ comes before any templated member, which places it in a
+  // fixed offset from the start of the class
+  ListNode<ReqWrap> req_wrap_queue_;
+
+  T req_;
+};
+```
+
+instead of:
+
+```c++
+template <typename T>
+class ReqWrap : public AsyncWrap {
+ private:
+  T req_;
+
+  // req_wrap_queue_ comes after a templated member, which means it won't be in
+  // a fixed offset from the start of the class
+  ListNode<ReqWrap> req_wrap_queue_;
+};
+```
+
+There are also tests on `test/cctest/test_node_postmortem_metadata.cc` to make
+sure all Node postmortem metadata are calculated correctly.
+
+## Tools and References
+
+* [llnode](https://github.com/nodejs/llnode): LLDB plugin
+* [`mdb_v8`](https://github.com/joyent/mdb_v8): mdb plugin
+* [nodejs/post-mortem](https://github.com/nodejs/post-mortem): Node.js
+post-mortem working group
diff --git a/doc/node.1 b/doc/node.1
index 50b8668007fdae..aa2d4f4f8afcf1 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -166,6 +166,11 @@ Enables the collection of trace event tracing information.
 A comma separated list of categories that should be traced when trace event
 tracing is enabled using \fB--trace-events-enabled\fR.
 
+.TP
+.BR \-\-trace-event\-file\-pattern " " \fIpattern\fR
+Template string specifying the filepath for the trace event data, it
+supports \fB${rotation}\fR and \fB${pid}\fR.
+
 .TP
 .BR \-\-zero\-fill\-buffers
 Automatically zero-fills all newly allocated Buffer and SlowBuffer instances.
diff --git a/lib/_http_common.js b/lib/_http_common.js
index 381ffeb807a84e..6fc283e607633e 100644
--- a/lib/_http_common.js
+++ b/lib/_http_common.js
@@ -34,6 +34,7 @@ const {
 
 const debug = require('util').debuglog('http');
 
+const kIncomingMessage = Symbol('IncomingMessage');
 const kOnHeaders = HTTPParser.kOnHeaders | 0;
 const kOnHeadersComplete = HTTPParser.kOnHeadersComplete | 0;
 const kOnBody = HTTPParser.kOnBody | 0;
@@ -73,7 +74,11 @@ function parserOnHeadersComplete(versionMajor, versionMinor, headers, method,
     parser._url = '';
   }
 
-  parser.incoming = new IncomingMessage(parser.socket);
+  // Parser is also used by http client
+  var ParserIncomingMessage = parser.socket && parser.socket.server ?
+    parser.socket.server[kIncomingMessage] : IncomingMessage;
+
+  parser.incoming = new ParserIncomingMessage(parser.socket);
   parser.incoming.httpVersionMajor = versionMajor;
   parser.incoming.httpVersionMinor = versionMinor;
   parser.incoming.httpVersion = `${versionMajor}.${versionMinor}`;
@@ -181,6 +186,7 @@ var parsers = new FreeList('parsers', 1000, function() {
   return parser;
 });
 
+function closeParserInstance(parser) { parser.close(); }
 
 // Free the parser and also break any links that it
 // might have to any other things.
@@ -203,7 +209,9 @@ function freeParser(parser, req, socket) {
     parser.outgoing = null;
     parser[kOnExecute] = null;
     if (parsers.free(parser) === false) {
-      parser.close();
+      // Make sure the parser's stack has unwound before deleting the
+      // corresponding C++ object through .close().
+      setImmediate(closeParserInstance, parser);
     } else {
       // Since the Parser destructor isn't going to run the destroy() callbacks
       // it needs to be triggered manually.
@@ -353,5 +361,6 @@ module.exports = {
   freeParser,
   httpSocketSetup,
   methods,
-  parsers
+  parsers,
+  kIncomingMessage
 };
diff --git a/lib/_http_server.js b/lib/_http_server.js
index be591c437ca083..78da88ba1eed47 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -33,6 +33,7 @@ const {
   continueExpression,
   chunkExpression,
   httpSocketSetup,
+  kIncomingMessage,
   _checkInvalidHeaderChar: checkInvalidHeaderChar
 } = require('_http_common');
 const { OutgoingMessage } = require('_http_outgoing');
@@ -41,6 +42,9 @@ const {
   defaultTriggerAsyncIdScope,
   getOrSetAsyncId
 } = require('internal/async_hooks');
+const { IncomingMessage } = require('_http_incoming');
+
+const kServerResponse = Symbol('ServerResponse');
 
 const STATUS_CODES = {
   100: 'Continue',
@@ -260,9 +264,19 @@ function writeHead(statusCode, reason, obj) {
 // Docs-only deprecated: DEP0063
 ServerResponse.prototype.writeHeader = ServerResponse.prototype.writeHead;
 
+function Server(options, requestListener) {
+  if (!(this instanceof Server)) return new Server(options, requestListener);
+
+  if (typeof options === 'function') {
+    requestListener = options;
+    options = {};
+  } else if (options == null || typeof options === 'object') {
+    options = util._extend({}, options);
+  }
+
+  this[kIncomingMessage] = options.IncomingMessage || IncomingMessage;
+  this[kServerResponse] = options.ServerResponse || ServerResponse;
 
-function Server(requestListener) {
-  if (!(this instanceof Server)) return new Server(requestListener);
   net.Server.call(this, { allowHalfOpen: true });
 
   if (requestListener) {
@@ -578,7 +592,7 @@ function parserOnIncoming(server, socket, state, req, keepAlive) {
     }
   }
 
-  var res = new ServerResponse(req);
+  var res = new server[kServerResponse](req);
   res._onPendingData = updateOutgoingData.bind(undefined, socket, state);
 
   res.shouldKeepAlive = keepAlive;
@@ -681,5 +695,6 @@ module.exports = {
   STATUS_CODES,
   Server,
   ServerResponse,
-  _connectionListener: connectionListener
+  _connectionListener: connectionListener,
+  kServerResponse
 };
diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
index ca7d0bd2755bc0..acae6f083eab50 100644
--- a/lib/_stream_writable.js
+++ b/lib/_stream_writable.js
@@ -307,7 +307,6 @@ Writable.prototype.uncork = function() {
 
     if (!state.writing &&
         !state.corked &&
-        !state.finished &&
         !state.bufferProcessing &&
         state.bufferedRequest)
       clearBuffer(this, state);
@@ -569,7 +568,7 @@ Writable.prototype.end = function(chunk, encoding, cb) {
   }
 
   // ignore unnecessary end() calls.
-  if (!state.ending && !state.finished)
+  if (!state.ending)
     endWritable(this, state, cb);
 };
 
@@ -639,11 +638,9 @@ function onCorkedFinish(corkReq, state, err) {
     cb(err);
     entry = entry.next;
   }
-  if (state.corkedRequestsFree) {
-    state.corkedRequestsFree.next = corkReq;
-  } else {
-    state.corkedRequestsFree = corkReq;
-  }
+
+  // reuse the free corkReq.
+  state.corkedRequestsFree.next = corkReq;
 }
 
 Object.defineProperty(Writable.prototype, 'destroyed', {
diff --git a/lib/_tls_legacy.js b/lib/_tls_legacy.js
index c59153b758d772..fc2fb6db5d12ae 100644
--- a/lib/_tls_legacy.js
+++ b/lib/_tls_legacy.js
@@ -951,6 +951,6 @@ module.exports = {
   createSecurePair:
     internalUtil.deprecate(createSecurePair,
                            'tls.createSecurePair() is deprecated. Please use ' +
-                           'tls.Socket instead.', 'DEP0064'),
+                           'tls.TLSSocket instead.', 'DEP0064'),
   pipe
 };
diff --git a/lib/child_process.js b/lib/child_process.js
index 2e6360d42b9246..aa24c9f44ea0ab 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -22,13 +22,14 @@
 'use strict';
 
 const util = require('util');
-const { deprecate, convertToValidSignal } = require('internal/util');
+const {
+  deprecate, convertToValidSignal, getSystemErrorName
+} = require('internal/util');
 const { isUint8Array } = require('internal/util/types');
 const { createPromise,
         promiseResolve, promiseReject } = process.binding('util');
 const debug = util.debuglog('child_process');
 
-const uv = process.binding('uv');
 const spawn_sync = process.binding('spawn_sync');
 const { Buffer } = require('buffer');
 const { Pipe, constants: PipeConstants } = process.binding('pipe_wrap');
@@ -274,7 +275,7 @@ exports.execFile = function(file /*, args, options, callback*/) {
     if (!ex) {
       ex = new Error('Command failed: ' + cmd + '\n' + stderr);
       ex.killed = child.killed || killed;
-      ex.code = code < 0 ? uv.errname(code) : code;
+      ex.code = code < 0 ? getSystemErrorName(code) : code;
       ex.signal = signal;
     }
 
diff --git a/lib/dgram.js b/lib/dgram.js
index af1fd986fa5cdd..55d498d67c372f 100644
--- a/lib/dgram.js
+++ b/lib/dgram.js
@@ -45,8 +45,8 @@ const SEND_BUFFER = false;
 // Lazily loaded
 var cluster = null;
 
-const errnoException = util._errnoException;
-const exceptionWithHostPort = util._exceptionWithHostPort;
+const errnoException = errors.errnoException;
+const exceptionWithHostPort = errors.exceptionWithHostPort;
 
 
 function lookup4(lookup, address, callback) {
diff --git a/lib/dns.js b/lib/dns.js
index 4c7fbe147497f4..9d853cd6d8d758 100644
--- a/lib/dns.js
+++ b/lib/dns.js
@@ -21,12 +21,10 @@
 
 'use strict';
 
-const util = require('util');
-
 const cares = process.binding('cares_wrap');
-const uv = process.binding('uv');
 const { isLegalPort } = require('internal/net');
 const { customPromisifyArgs } = require('internal/util');
+const errors = require('internal/errors');
 
 const {
   GetAddrInfoReqWrap,
@@ -36,30 +34,6 @@ const {
   isIP
 } = cares;
 
-function errnoException(err, syscall, hostname) {
-  // FIXME(bnoordhuis) Remove this backwards compatibility nonsense and pass
-  // the true error to the user. ENOTFOUND is not even a proper POSIX error!
-  if (err === uv.UV_EAI_MEMORY ||
-      err === uv.UV_EAI_NODATA ||
-      err === uv.UV_EAI_NONAME) {
-    err = 'ENOTFOUND';
-  }
-  var ex = null;
-  if (typeof err === 'string') {  // c-ares error code.
-    const errHost = hostname ? ` ${hostname}` : '';
-    ex = new Error(`${syscall} ${err}${errHost}`);
-    ex.code = err;
-    ex.errno = err;
-    ex.syscall = syscall;
-  } else {
-    ex = util._errnoException(err, syscall);
-  }
-  if (hostname) {
-    ex.hostname = hostname;
-  }
-  return ex;
-}
-
 const IANA_DNS_PORT = 53;
 const digits = [
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0-15
@@ -86,10 +60,11 @@ function isIPv4(str) {
   return (str.length > 3 && str.charCodeAt(3) === 46/*'.'*/);
 }
 
+const dnsException = errors.dnsException;
 
 function onlookup(err, addresses) {
   if (err) {
-    return this.callback(errnoException(err, 'getaddrinfo', this.hostname));
+    return this.callback(dnsException(err, 'getaddrinfo', this.hostname));
   }
   if (this.family) {
     this.callback(null, addresses[0], this.family);
@@ -101,7 +76,7 @@ function onlookup(err, addresses) {
 
 function onlookupall(err, addresses) {
   if (err) {
-    return this.callback(errnoException(err, 'getaddrinfo', this.hostname));
+    return this.callback(dnsException(err, 'getaddrinfo', this.hostname));
   }
 
   var family = this.family;
@@ -181,7 +156,7 @@ function lookup(hostname, options, callback) {
 
   var err = cares.getaddrinfo(req, hostname, family, hints, verbatim);
   if (err) {
-    process.nextTick(callback, errnoException(err, 'getaddrinfo', hostname));
+    process.nextTick(callback, dnsException(err, 'getaddrinfo', hostname));
     return {};
   }
   return req;
@@ -193,7 +168,7 @@ Object.defineProperty(lookup, customPromisifyArgs,
 
 function onlookupservice(err, host, service) {
   if (err)
-    return this.callback(errnoException(err, 'getnameinfo', this.host));
+    return this.callback(dnsException(err, 'getnameinfo', this.host));
 
   this.callback(null, host, service);
 }
@@ -222,7 +197,7 @@ function lookupService(host, port, callback) {
   req.oncomplete = onlookupservice;
 
   var err = cares.getnameinfo(req, host, port);
-  if (err) throw errnoException(err, 'getnameinfo', host);
+  if (err) throw dnsException(err, 'getnameinfo', host);
   return req;
 }
 
@@ -235,7 +210,7 @@ function onresolve(err, result, ttls) {
     result = result.map((address, index) => ({ address, ttl: ttls[index] }));
 
   if (err)
-    this.callback(errnoException(err, this.bindingName, this.hostname));
+    this.callback(dnsException(err, this.bindingName, this.hostname));
   else
     this.callback(null, result);
 }
@@ -272,7 +247,7 @@ function resolver(bindingName) {
     req.oncomplete = onresolve;
     req.ttl = !!(options && options.ttl);
     var err = this._handle[bindingName](req, name);
-    if (err) throw errnoException(err, bindingName);
+    if (err) throw dnsException(err, bindingName);
     return req;
   }
   Object.defineProperty(query, 'name', { value: bindingName });
diff --git a/lib/fs.js b/lib/fs.js
index b5565201e2abdd..b8ae3aa31ea911 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -59,7 +59,7 @@ const { kMaxLength } = require('buffer');
 const isWindows = process.platform === 'win32';
 
 const DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
-const errnoException = util._errnoException;
+const errnoException = errors.errnoException;
 
 function getOptions(options, defaultOptions) {
   if (options === null || options === undefined ||
diff --git a/lib/https.js b/lib/https.js
index 6fcd9f65ce7858..a2aea08ac9cbe1 100644
--- a/lib/https.js
+++ b/lib/https.js
@@ -30,6 +30,9 @@ const util = require('util');
 const { inherits } = util;
 const debug = util.debuglog('https');
 const { urlToOptions, searchParamsSymbol } = require('internal/url');
+const { IncomingMessage, ServerResponse } = require('http');
+const { kIncomingMessage } = require('_http_common');
+const { kServerResponse } = require('_http_server');
 
 function Server(opts, requestListener) {
   if (!(this instanceof Server)) return new Server(opts, requestListener);
@@ -51,9 +54,10 @@ function Server(opts, requestListener) {
     opts.ALPNProtocols = ['http/1.1'];
   }
 
-  tls.Server.call(this, opts, http._connectionListener);
+  this[kIncomingMessage] = opts.IncomingMessage || IncomingMessage;
+  this[kServerResponse] = opts.ServerResponse || ServerResponse;
 
-  this.httpAllowHalfOpen = false;
+  tls.Server.call(this, opts, http._connectionListener);
 
   if (requestListener) {
     this.addListener('request', requestListener);
diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js
index e14a0000640e7d..ea49239a6178bb 100644
--- a/lib/internal/async_hooks.js
+++ b/lib/internal/async_hooks.js
@@ -82,9 +82,6 @@ const emitDestroyNative = emitHookFactory(destroy_symbol, 'emitDestroyNative');
 const emitPromiseResolveNative =
     emitHookFactory(promise_resolve_symbol, 'emitPromiseResolveNative');
 
-// TODO(refack): move to node-config.cc
-const abort_regex = /^--abort[_-]on[_-]uncaught[_-]exception$/;
-
 // Setup the callbacks that node::AsyncWrap will call when there are hooks to
 // process. They use the same functions as the JS embedder API. These callbacks
 // are setup immediately to prevent async_wrap.setupHooks() from being hijacked
@@ -104,7 +101,7 @@ function fatalError(e) {
     Error.captureStackTrace(o, fatalError);
     process._rawDebug(o.stack);
   }
-  if (process.execArgv.some((e) => abort_regex.test(e))) {
+  if (process.binding('config').shouldAbortOnUncaughtException) {
     process.abort();
   }
   process.exit(1);
diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js
index 726a83c0734473..a0409f72c29de0 100644
--- a/lib/internal/child_process.js
+++ b/lib/internal/child_process.js
@@ -18,7 +18,7 @@ const SocketList = require('internal/socket_list');
 const { convertToValidSignal } = require('internal/util');
 const { isUint8Array } = require('internal/util/types');
 
-const errnoException = util._errnoException;
+const errnoException = errors.errnoException;
 const { SocketListSend, SocketListReceive } = SocketList;
 
 const MAX_HANDLE_RETRANSMISSIONS = 3;
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index 551817b343bf63..e62ce3fb22759a 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -11,10 +11,29 @@
 const kCode = Symbol('code');
 const messages = new Map();
 
+const {
+  UV_EAI_MEMORY,
+  UV_EAI_NODATA,
+  UV_EAI_NONAME
+} = process.binding('uv');
 const { defineProperty } = Object;
 
 // Lazily loaded
-var util = null;
+var util_ = null;
+function lazyUtil() {
+  if (!util_) {
+    util_ = require('util');
+  }
+  return util_;
+}
+
+var internalUtil = null;
+function lazyInternalUtil() {
+  if (!internalUtil) {
+    internalUtil = require('internal/util');
+  }
+  return internalUtil;
+}
 
 function makeNodeError(Base) {
   return class NodeError extends Base {
@@ -65,11 +84,11 @@ class AssertionError extends Error {
     if (message) {
       super(message);
     } else {
+      const util = lazyUtil();
       if (actual && actual.stack && actual instanceof Error)
         actual = `${actual.name}: ${actual.message}`;
       if (expected && expected.stack && expected instanceof Error)
         expected = `${expected.name}: ${expected.message}`;
-      if (util === null) util = require('util');
       super(`${util.inspect(actual).slice(0, 128)} ` +
         `${operator} ${util.inspect(expected).slice(0, 128)}`);
     }
@@ -104,7 +123,7 @@ function message(key, args) {
   if (typeof msg === 'function') {
     fmt = msg;
   } else {
-    if (util === null) util = require('util');
+    const util = lazyUtil();
     fmt = util.format;
     if (args === undefined || args.length === 0)
       return msg;
@@ -119,7 +138,110 @@ function E(sym, val) {
   messages.set(sym, typeof val === 'function' ? val : String(val));
 }
 
+/**
+ * This used to be util._errnoException().
+ *
+ * @param {number} err - A libuv error number
+ * @param {string} syscall
+ * @param {string} [original]
+ * @returns {Error}
+ */
+function errnoException(err, syscall, original) {
+  // TODO(joyeecheung): We have to use the type-checked
+  // getSystemErrorName(err) to guard against invalid arguments from users.
+  // This can be replaced with [ code ] = errmap.get(err) when this method
+  // is no longer exposed to user land.
+  const code = lazyUtil().getSystemErrorName(err);
+  const message = original ?
+    `${syscall} ${code} ${original}` : `${syscall} ${code}`;
+
+  const ex = new Error(message);
+  // TODO(joyeecheung): errno is supposed to err, like in uvException
+  ex.code = ex.errno = code;
+  ex.syscall = syscall;
+
+  Error.captureStackTrace(ex, errnoException);
+  return ex;
+}
+
+/**
+ * This used to be util._exceptionWithHostPort().
+ *
+ * @param {number} err - A libuv error number
+ * @param {string} syscall
+ * @param {string} address
+ * @param {number} [port]
+ * @param {string} [additional]
+ * @returns {Error}
+ */
+function exceptionWithHostPort(err, syscall, address, port, additional) {
+  // TODO(joyeecheung): We have to use the type-checked
+  // getSystemErrorName(err) to guard against invalid arguments from users.
+  // This can be replaced with [ code ] = errmap.get(err) when this method
+  // is no longer exposed to user land.
+  const code = lazyUtil().getSystemErrorName(err);
+  let details = '';
+  if (port && port > 0) {
+    details = ` ${address}:${port}`;
+  } else if (address) {
+    details = ` ${address}`;
+  }
+  if (additional) {
+    details += ` - Local (${additional})`;
+  }
+
+  const ex = new Error(`${syscall} ${code}${details}`);
+  // TODO(joyeecheung): errno is supposed to err, like in uvException
+  ex.code = ex.errno = code;
+  ex.syscall = syscall;
+  ex.address = address;
+  if (port) {
+    ex.port = port;
+  }
+
+  Error.captureStackTrace(ex, exceptionWithHostPort);
+  return ex;
+}
+
+/**
+ * @param {number|string} code - A libuv error number or a c-ares error code
+ * @param {string} syscall
+ * @param {string} [hostname]
+ * @returns {Error}
+ */
+function dnsException(code, syscall, hostname) {
+  let message;
+  // FIXME(bnoordhuis) Remove this backwards compatibility nonsense and pass
+  // the true error to the user. ENOTFOUND is not even a proper POSIX error!
+  if (code === UV_EAI_MEMORY ||
+      code === UV_EAI_NODATA ||
+      code === UV_EAI_NONAME) {
+    code = 'ENOTFOUND'; // Fabricated error name.
+  }
+  if (typeof code === 'string') { // c-ares error code.
+    message = `${syscall} ${code}${hostname ? ` ${hostname}` : ''}`;
+  } else {  // libuv error number
+    code = lazyInternalUtil().getSystemErrorName(code);
+    message = `${syscall} ${code}`;
+  }
+  // eslint-disable-next-line no-restricted-syntax
+  const ex = new Error(message);
+  // TODO(joyeecheung): errno is supposed to be a number / err, like in
+  // uvException.
+  ex.errno = code;
+  ex.code = code;
+  ex.syscall = syscall;
+  if (hostname) {
+    ex.hostname = hostname;
+  }
+  Error.captureStackTrace(ex, dnsException);
+  return ex;
+}
+
 module.exports = exports = {
+  dnsException,
+  errnoException,
+  exceptionWithHostPort,
   message,
   Error: makeNodeError(Error),
   TypeError: makeNodeError(TypeError),
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js
index b5dd81c80f4038..5e6c51377e94ba 100644
--- a/lib/internal/http2/compat.js
+++ b/lib/internal/http2/compat.js
@@ -661,11 +661,11 @@ class Http2ServerResponse extends Stream {
   }
 }
 
-function onServerStream(stream, headers, flags, rawHeaders) {
+function onServerStream(ServerRequest, ServerResponse,
+                        stream, headers, flags, rawHeaders) {
   const server = this;
-  const request = new Http2ServerRequest(stream, headers, undefined,
-                                         rawHeaders);
-  const response = new Http2ServerResponse(stream);
+  const request = new ServerRequest(stream, headers, undefined, rawHeaders);
+  const response = new ServerResponse(stream);
 
   // Check for the CONNECT method
   const method = headers[HTTP2_HEADER_METHOD];
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index cbaf908246bd6d..1149caa84277e2 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -5,6 +5,7 @@
 require('internal/util').assertCrypto();
 
 const { async_id_symbol } = process.binding('async_wrap');
+const http = require('http');
 const binding = process.binding('http2');
 const assert = require('assert');
 const { Buffer } = require('buffer');
@@ -67,6 +68,8 @@ const NETServer = net.Server;
 const TLSServer = tls.Server;
 
 const kInspect = require('internal/util').customInspectSymbol;
+const { kIncomingMessage } = require('_http_common');
+const { kServerResponse } = require('_http_server');
 
 const kAlpnProtocol = Symbol('alpnProtocol');
 const kAuthority = Symbol('authority');
@@ -406,7 +409,7 @@ function onAltSvc(stream, origin, alt) {
 
 // Receiving a GOAWAY frame from the connected peer is a signal that no
 // new streams should be created. If the code === NGHTTP2_NO_ERROR, we
-// are going to send our our close, but allow existing frames to close
+// are going to send our close, but allow existing frames to close
 // normally. If code !== NGHTTP2_NO_ERROR, we are going to send our own
 // close using the same code then destroy the session with an error.
 // The goaway event will be emitted on next tick.
@@ -461,7 +464,7 @@ function requestOnConnect(headers, options) {
   if (session.destroyed)
     return;
 
-  // If the session was closed while waiting for for the connect, destroy
+  // If the session was closed while waiting for the connect, destroy
   // the stream and do not continue with the request.
   if (session.closed) {
     const err = new errors.Error('ERR_HTTP2_GOAWAY_SESSION');
@@ -1644,7 +1647,7 @@ class Http2Stream extends Duplex {
     req.async = false;
     const err = createWriteReq(req, handle, data, encoding);
     if (err)
-      return this.destroy(util._errnoException(err, 'write', req.error), cb);
+      return this.destroy(errors.errnoException(err, 'write', req.error), cb);
     trackWriteState(this, req.bytes);
   }
 
@@ -1687,7 +1690,7 @@ class Http2Stream extends Duplex {
     }
     const err = handle.writev(req, chunks);
     if (err)
-      return this.destroy(util._errnoException(err, 'write', req.error), cb);
+      return this.destroy(errors.errnoException(err, 'write', req.error), cb);
     trackWriteState(this, req.bytes);
   }
 
@@ -2485,8 +2488,11 @@ function connectionListener(socket) {
 
   if (socket.alpnProtocol === false || socket.alpnProtocol === 'http/1.1') {
     // Fallback to HTTP/1.1
-    if (options.allowHTTP1 === true)
+    if (options.allowHTTP1 === true) {
+      socket.server[kIncomingMessage] = options.Http1IncomingMessage;
+      socket.server[kServerResponse] = options.Http1ServerResponse;
       return httpConnectionListener.call(this, socket);
+    }
     // Let event handler deal with the socket
     debug(`Unknown protocol from ${socket.remoteAddress}:${socket.remotePort}`);
     if (!this.emit('unknownProtocol', socket)) {
@@ -2526,6 +2532,17 @@ function initializeOptions(options) {
   options.allowHalfOpen = true;
   assertIsObject(options.settings, 'options.settings');
   options.settings = Object.assign({}, options.settings);
+
+  // Used only with allowHTTP1
+  options.Http1IncomingMessage = options.Http1IncomingMessage ||
+    http.IncomingMessage;
+  options.Http1ServerResponse = options.Http1ServerResponse ||
+    http.ServerResponse;
+
+  options.Http2ServerRequest = options.Http2ServerRequest ||
+                                       Http2ServerRequest;
+  options.Http2ServerResponse = options.Http2ServerResponse ||
+                                        Http2ServerResponse;
   return options;
 }
 
@@ -2591,7 +2608,11 @@ class Http2Server extends NETServer {
 function setupCompat(ev) {
   if (ev === 'request') {
     this.removeListener('newListener', setupCompat);
-    this.on('stream', onServerStream);
+    this.on('stream', onServerStream.bind(
+      this,
+      this[kOptions].Http2ServerRequest,
+      this[kOptions].Http2ServerResponse)
+    );
   }
 }
 
diff --git a/lib/internal/loader/Loader.js b/lib/internal/loader/Loader.js
index 49c8699771e819..b8fe9ccfc614b8 100644
--- a/lib/internal/loader/Loader.js
+++ b/lib/internal/loader/Loader.js
@@ -1,8 +1,12 @@
 'use strict';
 
-const { getURLFromFilePath } = require('internal/url');
+const path = require('path');
+const { getURLFromFilePath, URL } = require('internal/url');
 
-const { createDynamicModule } = require('internal/loader/ModuleWrap');
+const {
+  createDynamicModule,
+  setImportModuleDynamicallyCallback
+} = require('internal/loader/ModuleWrap');
 
 const ModuleMap = require('internal/loader/ModuleMap');
 const ModuleJob = require('internal/loader/ModuleJob');
@@ -24,6 +28,13 @@ function getURLStringForCwd() {
   }
 }
 
+function normalizeReferrerURL(referrer) {
+  if (typeof referrer === 'string' && path.isAbsolute(referrer)) {
+    return getURLFromFilePath(referrer).href;
+  }
+  return new URL(referrer).href;
+}
+
 /* A Loader instance is used as the main entry point for loading ES modules.
  * Currently, this is a singleton -- there is only one used for loading
  * the main module and everything in its dependency graph. */
@@ -129,6 +140,12 @@ class Loader {
     const module = await job.run();
     return module.namespace();
   }
+
+  static registerImportDynamicallyCallback(loader) {
+    setImportModuleDynamicallyCallback(async (referrer, specifier) => {
+      return loader.import(specifier, normalizeReferrerURL(referrer));
+    });
+  }
 }
 Loader.validFormats = ['esm', 'cjs', 'builtin', 'addon', 'json', 'dynamic'];
 Object.setPrototypeOf(Loader.prototype, null);
diff --git a/lib/internal/loader/ModuleWrap.js b/lib/internal/loader/ModuleWrap.js
index 0ee05ca81ffbb9..63ce6fd70b5bbe 100644
--- a/lib/internal/loader/ModuleWrap.js
+++ b/lib/internal/loader/ModuleWrap.js
@@ -1,7 +1,10 @@
 'use strict';
 
-const { ModuleWrap } =
-    require('internal/process').internalBinding('module_wrap');
+const {
+  ModuleWrap,
+  setImportModuleDynamicallyCallback
+} = require('internal/process').internalBinding('module_wrap');
+
 const debug = require('util').debuglog('esm');
 const ArrayJoin = Function.call.bind(Array.prototype.join);
 const ArrayMap = Function.call.bind(Array.prototype.map);
@@ -60,5 +63,6 @@ const createDynamicModule = (exports, url = '', evaluate) => {
 
 module.exports = {
   createDynamicModule,
+  setImportModuleDynamicallyCallback,
   ModuleWrap
 };
diff --git a/lib/internal/process.js b/lib/internal/process.js
index 2c7c87c401fe11..1613ae6bfddd66 100644
--- a/lib/internal/process.js
+++ b/lib/internal/process.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const errors = require('internal/errors');
 const util = require('util');
 const constants = process.binding('constants').os.signals;
 
@@ -180,7 +181,7 @@ function setupKillAndExit() {
     }
 
     if (err)
-      throw util._errnoException(err, 'kill');
+      throw errors.errnoException(err, 'kill');
 
     return true;
   };
@@ -211,7 +212,7 @@ function setupSignalHandlers() {
       const err = wrap.start(signum);
       if (err) {
         wrap.close();
-        throw util._errnoException(err, 'uv_signal_start');
+        throw errors.errnoException(err, 'uv_signal_start');
       }
 
       signalWraps[type] = wrap;
diff --git a/lib/internal/url.js b/lib/internal/url.js
index 7543dc2c39afc4..c2805ec19171b3 100644
--- a/lib/internal/url.js
+++ b/lib/internal/url.js
@@ -1198,7 +1198,7 @@ function createSearchParamsIterator(target, kind) {
 // https://heycam.github.io/webidl/#dfn-iterator-prototype-object
 const URLSearchParamsIteratorPrototype = Object.create(IteratorPrototype);
 
-defineIDLClass(URLSearchParamsIteratorPrototype, 'URLSearchParamsIterator', {
+defineIDLClass(URLSearchParamsIteratorPrototype, 'URLSearchParams Iterator', {
   next() {
     if (!this ||
         Object.getPrototypeOf(this) !== URLSearchParamsIteratorPrototype) {
diff --git a/lib/internal/util.js b/lib/internal/util.js
index 8fc040d06714dc..2d408bbbb68016 100644
--- a/lib/internal/util.js
+++ b/lib/internal/util.js
@@ -3,8 +3,8 @@
 const errors = require('internal/errors');
 const binding = process.binding('util');
 const { signals } = process.binding('constants').os;
-
 const { createPromise, promiseResolve, promiseReject } = binding;
+const { errmap } = process.binding('uv');
 
 const kArrowMessagePrivateSymbolIndex = binding.arrow_message_private_symbol;
 const kDecoratedPrivateSymbolIndex = binding.decorated_private_symbol;
@@ -201,6 +201,11 @@ function getConstructorOf(obj) {
   return null;
 }
 
+function getSystemErrorName(err) {
+  const entry = errmap.get(err);
+  return entry ? entry[0] : `Unknown system error ${err}`;
+}
+
 const kCustomPromisifiedSymbol = Symbol('util.promisify.custom');
 const kCustomPromisifyArgsSymbol = Symbol('customPromisifyArgs');
 
@@ -286,6 +291,7 @@ module.exports = {
   emitExperimentalWarning,
   filterDuplicateStrings,
   getConstructorOf,
+  getSystemErrorName,
   isError,
   join,
   normalizeEncoding,
diff --git a/lib/module.js b/lib/module.js
index ed9d1a78d476a1..642e5cb1f1532d 100644
--- a/lib/module.js
+++ b/lib/module.js
@@ -462,6 +462,7 @@ Module._load = function(request, parent, isMain) {
           ESMLoader.hook(hooks);
         }
       }
+      Loader.registerImportDynamicallyCallback(ESMLoader);
       await ESMLoader.import(getURLFromFilePath(request).pathname);
     })()
     .catch((e) => {
diff --git a/lib/net.js b/lib/net.js
index 53c91a640f5c1d..dae596eec0780c 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -48,8 +48,8 @@ const dns = require('dns');
 // reasons it's lazy loaded.
 var cluster = null;
 
-const errnoException = util._errnoException;
-const exceptionWithHostPort = util._exceptionWithHostPort;
+const errnoException = errors.errnoException;
+const exceptionWithHostPort = errors.exceptionWithHostPort;
 
 function noop() {}
 
diff --git a/lib/tty.js b/lib/tty.js
index 9595c79db39a33..29440d6d96e3d5 100644
--- a/lib/tty.js
+++ b/lib/tty.js
@@ -21,11 +21,9 @@
 
 'use strict';
 
-const util = require('util');
+const { inherits, _extend } = require('util');
 const net = require('net');
 const { TTY, isTTY } = process.binding('tty_wrap');
-const { inherits } = util;
-const errnoException = util._errnoException;
 const errors = require('internal/errors');
 const readline = require('readline');
 
@@ -40,7 +38,7 @@ function ReadStream(fd, options) {
   if (fd >> 0 !== fd || fd < 0)
     throw new errors.RangeError('ERR_INVALID_FD', fd);
 
-  options = util._extend({
+  options = _extend({
     highWaterMark: 0,
     readable: true,
     writable: false,
@@ -99,7 +97,7 @@ WriteStream.prototype._refreshSize = function() {
   var winSize = new Array(2);
   var err = this._handle.getWindowSize(winSize);
   if (err) {
-    this.emit('error', errnoException(err, 'getWindowSize'));
+    this.emit('error', errors.errnoException(err, 'getWindowSize'));
     return;
   }
   var newCols = winSize[0];
diff --git a/lib/util.js b/lib/util.js
index 4c6db1a479e7b3..14c236cbb2c064 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -25,8 +25,6 @@ const errors = require('internal/errors');
 const { TextDecoder, TextEncoder } = require('internal/encoding');
 const { isBuffer } = require('buffer').Buffer;
 
-const { errname } = process.binding('uv');
-
 const {
   getPromiseDetails,
   getProxyDetails,
@@ -52,6 +50,7 @@ const {
   customInspectSymbol,
   deprecate,
   getConstructorOf,
+  getSystemErrorName: internalErrorName,
   isError,
   promisify,
   join
@@ -984,41 +983,6 @@ function error(...args) {
   }
 }
 
-function _errnoException(err, syscall, original) {
-  var name = errname(err);
-  var message = `${syscall} ${name}`;
-  if (original)
-    message += ` ${original}`;
-  var e = new Error(message);
-  e.code = name;
-  e.errno = name;
-  e.syscall = syscall;
-  return e;
-}
-
-function _exceptionWithHostPort(err,
-                                syscall,
-                                address,
-                                port,
-                                additional) {
-  var details;
-  if (port && port > 0) {
-    details = `${address}:${port}`;
-  } else {
-    details = address;
-  }
-
-  if (additional) {
-    details += ` - Local (${additional})`;
-  }
-  var ex = exports._errnoException(err, syscall, details);
-  ex.address = address;
-  if (port) {
-    ex.port = port;
-  }
-  return ex;
-}
-
 function callbackifyOnRejected(reason, cb) {
   // `!reason` guard inspired by bluebird (Ref: https://goo.gl/t5IS6M).
   // Because `null` is a special error value in callbacks which means "no error
@@ -1066,15 +1030,24 @@ function callbackify(original) {
   return callbackified;
 }
 
+function getSystemErrorName(err) {
+  if (typeof err !== 'number' || err >= 0 || !Number.isSafeInteger(err)) {
+    throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'err',
+                               'negative number');
+  }
+  return internalErrorName(err);
+}
+
 // Keep the `exports =` so that various functions can still be monkeypatched
 module.exports = exports = {
-  _errnoException,
-  _exceptionWithHostPort,
+  _errnoException: errors.errnoException,
+  _exceptionWithHostPort: errors.exceptionWithHostPort,
   _extend,
   callbackify,
   debuglog,
   deprecate,
   format,
+  getSystemErrorName,
   inherits,
   inspect,
   isArray: Array.isArray,
diff --git a/node.gyp b/node.gyp
index ee4157567f5a31..1125a1e123a543 100644
--- a/node.gyp
+++ b/node.gyp
@@ -215,7 +215,7 @@
           'conditions': [
             ['OS in "linux freebsd openbsd solaris android"', {
               'ldflags': [
-                '-Wl,--whole-archive,<(OBJ_DIR)/<(STATIC_LIB_PREFIX)'
+                '-Wl,--whole-archive,<(obj_dir)/<(STATIC_LIB_PREFIX)'
                     '<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
                 '-Wl,--no-whole-archive',
               ],
@@ -288,6 +288,7 @@
         'src/node_os.cc',
         'src/node_platform.cc',
         'src/node_perf.cc',
+        'src/node_postmortem_metadata.cc',
         'src/node_serdes.cc',
         'src/node_trace_events.cc',
         'src/node_url.cc',
@@ -749,10 +750,10 @@
             {
               'action_name': 'node_dtrace_provider_o',
               'inputs': [
-                '<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace.o',
+                '<(obj_dir)/<(node_lib_target_name)/src/node_dtrace.o',
               ],
               'outputs': [
-                '<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace_provider.o'
+                '<(obj_dir)/<(node_lib_target_name)/src/node_dtrace_provider.o'
               ],
               'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
                 '<@(_inputs)', '-o', '<@(_outputs)' ]
@@ -784,7 +785,7 @@
             {
               'action_name': 'node_dtrace_ustack_constants',
               'inputs': [
-                '<(V8_BASE)'
+                '<(v8_base)'
               ],
               'outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
@@ -802,7 +803,7 @@
                 '<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
               ],
               'outputs': [
-                '<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace_ustack.o'
+                '<(obj_dir)/<(node_lib_target_name)/src/node_dtrace_ustack.o'
               ],
               'conditions': [
                 [ 'target_arch=="ia32" or target_arch=="arm"', {
@@ -882,7 +883,7 @@
       'type': 'executable',
 
       'dependencies': [
-        '<(node_core_target_name)',
+        '<(node_lib_target_name)',
         'rename_node_bin_win',
         'deps/gtest/gtest.gyp:gtest',
         'node_js2c#host',
@@ -891,39 +892,6 @@
         'node_dtrace_provider',
       ],
 
-      'variables': {
-        'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src',
-        'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen',
-        'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src/tracing',
-        'OBJ_SUFFIX': 'o',
-        'OBJ_SEPARATOR': '/',
-        'conditions': [
-          ['OS=="win"', {
-            'OBJ_SUFFIX': 'obj',
-          }],
-          ['GENERATOR=="ninja"', {
-            'OBJ_PATH': '<(OBJ_DIR)/src',
-            'OBJ_GEN_PATH': '<(OBJ_DIR)/gen',
-            'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing',
-            'OBJ_SEPARATOR': '/<(node_lib_target_name).',
-          }, {
-            'conditions': [
-              ['OS=="win"', {
-                'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
-                'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
-                'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
-              }],
-              ['OS=="aix"', {
-                'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src',
-                'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen',
-                'OBJ_TRACING_PATH':
-                  '<(OBJ_DIR)/<(node_lib_target_name)/src/tracing',
-              }],
-            ]}
-          ]
-        ],
-       },
-
       'includes': [
         'node.gypi'
       ],
@@ -940,127 +908,39 @@
       'defines': [ 'NODE_WANT_INTERNALS=1' ],
 
       'sources': [
-        'test/cctest/node_module_reg.cc',
         'test/cctest/node_test_fixture.cc',
         'test/cctest/test_aliased_buffer.cc',
         'test/cctest/test_base64.cc',
+        'test/cctest/test_node_postmortem_metadata.cc',
         'test/cctest/test_environment.cc',
         'test/cctest/test_util.cc',
         'test/cctest/test_url.cc'
       ],
 
-      'libraries': [
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)async_wrap.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_perf.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_platform.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)',
-        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)',
-        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)',
-        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)',
-        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)',
-        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
-        '<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
-      ],
-
       'conditions': [
         [ 'node_use_openssl=="true"', {
-          'conditions': [
-            ['node_target_type!="static_library"', {
-              'libraries': [
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto.<(OBJ_SUFFIX)',
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_bio.<(OBJ_SUFFIX)',
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_clienthello.<(OBJ_SUFFIX)',
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)tls_wrap.<(OBJ_SUFFIX)',
-              ],
-            }],
-          ],
           'defines': [
             'HAVE_OPENSSL=1',
           ],
         }],
         [ 'node_use_perfctr=="true"', {
           'defines': [ 'HAVE_PERFCTR=1' ],
-          'libraries': [
-            '<(OBJ_PATH)<(OBJ_SEPARATOR)node_counters.<(OBJ_SUFFIX)',
-            '<(OBJ_PATH)<(OBJ_SEPARATOR)'
-              'node_win32_perfctr_provider.<(OBJ_SUFFIX)',
-          ],
         }],
         ['v8_enable_inspector==1', {
           'sources': [
             'test/cctest/test_inspector_socket.cc',
             'test/cctest/test_inspector_socket_server.cc'
           ],
-          'conditions': [
-            ['node_target_type!="static_library"', {
-              'libraries': [
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_agent.<(OBJ_SUFFIX)',
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_io.<(OBJ_SUFFIX)',
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_js_api.<(OBJ_SUFFIX)',
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket.<(OBJ_SUFFIX)',
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket_server.<(OBJ_SUFFIX)',
-              ],
-            }],
-          ],
           'defines': [
             'HAVE_INSPECTOR=1',
           ],
-        }],
-        [ 'node_use_dtrace=="true" and node_target_type!="static_library"', {
-          'libraries': [
-            '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
-          ],
-          'conditions': [
-            ['OS!="mac" and OS!="linux"', {
-              'libraries': [
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)',
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)',
-              ]
-            }],
-            ['OS=="linux"', {
-              'libraries': [
-                '<(SHARED_INTERMEDIATE_DIR)<(OBJ_SEPARATOR)'
-                  'node_dtrace_provider.<(OBJ_SUFFIX)',
-              ]
-            }],
-          ],
-        }, {
-          'conditions': [
-            [ 'node_use_etw=="true" and OS=="win"', {
-              'libraries': [
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)'
-                  'node_win32_etw_provider.<(OBJ_SUFFIX)',
-              ],
-            }]
-          ]
-        }],
-        [ 'OS=="win" and node_target_type!="static_library"', {
-          'libraries': [
-            '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)',
-          ],
         }, {
-          'conditions': [
-            ['node_target_type!="static_library"', {
-              'libraries': [
-                '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
-              ],
-            }],
-          ],
+          'defines': [ 'HAVE_INSPECTOR=0' ]
         }],
         ['OS=="solaris"', {
           'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
         }],
-      ]
+      ],
     }
   ], # end targets
 
diff --git a/node.gypi b/node.gypi
index 386601906fbe4a..49384db0a5ddb5 100644
--- a/node.gypi
+++ b/node.gypi
@@ -99,7 +99,7 @@
         [ 'force_load=="true"', {
           'xcode_settings': {
             'OTHER_LDFLAGS': [
-              '-Wl,-force_load,<(V8_BASE)',
+              '-Wl,-force_load,<(v8_base)',
             ],
           },
         }],
@@ -154,7 +154,7 @@
             {
               'action_name': 'expfile',
               'inputs': [
-                '<(OBJ_DIR)'
+                '<(obj_dir)'
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/node.exp'
@@ -186,13 +186,13 @@
     [ '(OS=="freebsd" or OS=="linux") and node_shared=="false"'
         ' and coverage=="false" and force_load=="true"', {
       'ldflags': [ '-Wl,-z,noexecstack',
-                   '-Wl,--whole-archive <(V8_BASE)',
+                   '-Wl,--whole-archive <(v8_base)',
                    '-Wl,--no-whole-archive' ]
     }],
     [ '(OS=="freebsd" or OS=="linux") and node_shared=="false"'
         ' and coverage=="true" and force_load=="true"', {
       'ldflags': [ '-Wl,-z,noexecstack',
-                   '-Wl,--whole-archive <(V8_BASE)',
+                   '-Wl,--whole-archive <(v8_base)',
                    '-Wl,--no-whole-archive',
                    '--coverage',
                    '-g',
@@ -237,15 +237,15 @@
             [ 'force_load=="true"', {
               'xcode_settings': {
                 'OTHER_LDFLAGS': [
-                  '-Wl,-force_load,<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)',
+                  '-Wl,-force_load,<(PRODUCT_DIR)/<(openssl_product)',
                 ],
               },
               'conditions': [
                 ['OS in "linux freebsd" and node_shared=="false"', {
                   'ldflags': [
                     '-Wl,--whole-archive,'
-                        '<(OBJ_DIR)/deps/openssl/'
-                        '<(OPENSSL_PRODUCT)',
+                        '<(obj_dir)/deps/openssl/'
+                        '<(openssl_product)',
                     '-Wl,--no-whole-archive',
                   ],
                 }],
diff --git a/src/async_wrap.cc b/src/async_wrap.cc
index b1212e97704ef0..fe4dcbdffccd9b 100644
--- a/src/async_wrap.cc
+++ b/src/async_wrap.cc
@@ -351,7 +351,7 @@ static void PromiseHook(PromiseHookType type, Local<Promise> promise,
     if (env->execution_async_id() == wrap->get_async_id()) {
       // This condition might not be true if async_hooks was enabled during
       // the promise callback execution.
-      // Popping it off the stack can be skipped in that case, because is is
+      // Popping it off the stack can be skipped in that case, because it is
       // known that it would correspond to exactly one call with
       // PromiseHookType::kBefore that was not witnessed by the PromiseHook.
       env->async_hooks()->pop_async_id(wrap->get_async_id());
diff --git a/src/backtrace_posix.cc b/src/backtrace_posix.cc
index 0c69d820e7212a..c7a6bea1938a7c 100644
--- a/src/backtrace_posix.cc
+++ b/src/backtrace_posix.cc
@@ -25,9 +25,6 @@ void DumpBacktrace(FILE* fp) {
 #if HAVE_EXECINFO_H
   void* frames[256];
   const int size = backtrace(frames, arraysize(frames));
-  if (size <= 0) {
-    return;
-  }
   for (int i = 1; i < size; i += 1) {
     void* frame = frames[i];
     fprintf(fp, "%2d: ", i);
diff --git a/src/base-object.h b/src/base-object.h
index 0998920f49dd15..965683d029e43e 100644
--- a/src/base-object.h
+++ b/src/base-object.h
@@ -65,6 +65,12 @@ class BaseObject {
   static inline void WeakCallback(
       const v8::WeakCallbackInfo<Type>& data);
 
+  // persistent_handle_ needs to be at a fixed offset from the start of the
+  // class because it is used by src/node_postmortem_metadata.cc to calculate
+  // offsets and generate debug symbols for BaseObject, which assumes that the
+  // position of members in memory are predictable. For more information please
+  // refer to `doc/guides/node-postmortem-support.md`
+  friend int GenDebugSymbols();
   v8::Persistent<v8::Object> persistent_handle_;
   Environment* env_;
 };
diff --git a/src/env-inl.h b/src/env-inl.h
index 4b6f147f64778c..e856b0fea65b90 100644
--- a/src/env-inl.h
+++ b/src/env-inl.h
@@ -318,7 +318,6 @@ inline Environment::Environment(IsolateData* isolate_data,
       printed_error_(false),
       trace_sync_io_(false),
       abort_on_uncaught_exception_(false),
-      emit_napi_warning_(true),
       makecallback_cntr_(0),
       scheduled_immediate_count_(isolate_, 1),
 #if HAVE_INSPECTOR
diff --git a/src/env.cc b/src/env.cc
index e105fcd7c57ef1..e6788249d8c230 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -202,12 +202,6 @@ bool Environment::RemovePromiseHook(promise_hook_func fn, void* arg) {
   return true;
 }
 
-bool Environment::EmitNapiWarning() {
-  bool current_value = emit_napi_warning_;
-  emit_napi_warning_ = false;
-  return current_value;
-}
-
 void Environment::EnvPromiseHook(v8::PromiseHookType type,
                                  v8::Local<v8::Promise> promise,
                                  v8::Local<v8::Value> parent) {
diff --git a/src/env.h b/src/env.h
index fd208038157b8b..1e4e798bfd3df2 100644
--- a/src/env.h
+++ b/src/env.h
@@ -316,6 +316,7 @@ class ModuleWrap;
   V(context, v8::Context)                                                     \
   V(domain_array, v8::Array)                                                  \
   V(domains_stack_array, v8::Array)                                           \
+  V(host_import_module_dynamically_callback, v8::Function)                    \
   V(http2ping_constructor_template, v8::ObjectTemplate)                       \
   V(http2stream_constructor_template, v8::ObjectTemplate)                     \
   V(http2settings_constructor_template, v8::ObjectTemplate)                   \
@@ -687,7 +688,6 @@ class Environment {
 
   void AddPromiseHook(promise_hook_func fn, void* arg);
   bool RemovePromiseHook(promise_hook_func fn, void* arg);
-  bool EmitNapiWarning();
 
   typedef void (*native_immediate_callback)(Environment* env, void* data);
   // cb will be called as cb(env, data) on the next event loop iteration.
@@ -719,7 +719,6 @@ class Environment {
   bool printed_error_;
   bool trace_sync_io_;
   bool abort_on_uncaught_exception_;
-  bool emit_napi_warning_;
   size_t makecallback_cntr_;
   std::vector<double> destroy_async_id_list_;
 
@@ -732,6 +731,13 @@ class Environment {
   std::unique_ptr<inspector::Agent> inspector_agent_;
 #endif
 
+  // handle_wrap_queue_ and req_wrap_queue_ needs to be at a fixed offset from
+  // the start of the class because it is used by
+  // src/node_postmortem_metadata.cc to calculate offsets and generate debug
+  // symbols for Environment, which assumes that the position of members in
+  // memory are predictable. For more information please refer to
+  // `doc/guides/node-postmortem-support.md`
+  friend int GenDebugSymbols();
   HandleWrapQueue handle_wrap_queue_;
   ReqWrapQueue req_wrap_queue_;
   ListHead<HandleCleanup,
diff --git a/src/fs_event_wrap.cc b/src/fs_event_wrap.cc
index e4165e5ac69bfd..4c074827c19f9d 100644
--- a/src/fs_event_wrap.cc
+++ b/src/fs_event_wrap.cc
@@ -112,7 +112,8 @@ void FSEventWrap::Start(const FunctionCallbackInfo<Value>& args) {
 
   FSEventWrap* wrap;
   ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
-  CHECK_EQ(wrap->initialized_, false);
+  if (wrap->initialized_)
+    return args.GetReturnValue().Set(0);
 
   static const char kErrMsg[] = "filename must be a string or Buffer";
   if (args.Length() < 1)
diff --git a/src/handle_wrap.h b/src/handle_wrap.h
index 29e4f364603bda..19fd36891a2fed 100644
--- a/src/handle_wrap.h
+++ b/src/handle_wrap.h
@@ -81,6 +81,13 @@ class HandleWrap : public AsyncWrap {
   friend class Environment;
   friend void GetActiveHandles(const v8::FunctionCallbackInfo<v8::Value>&);
   static void OnClose(uv_handle_t* handle);
+
+  // handle_wrap_queue_ needs to be at a fixed offset from the start of the
+  // class because it is used by src/node_postmortem_metadata.cc to calculate
+  // offsets and generate debug symbols for HandleWrap, which assumes that the
+  // position of members in memory are predictable. For more information please
+  // refer to `doc/guides/node-postmortem-support.md`
+  friend int GenDebugSymbols();
   ListNode<HandleWrap> handle_wrap_queue_;
   enum { kInitialized, kClosing, kClosingWithCallback, kClosed } state_;
   uv_handle_t* const handle_;
diff --git a/src/inspector_agent.h b/src/inspector_agent.h
index 29b9546b514aea..3890c87539dca2 100644
--- a/src/inspector_agent.h
+++ b/src/inspector_agent.h
@@ -83,7 +83,7 @@ class Agent {
     return io_.get();
   }
 
-  // Can only be called from the the main thread.
+  // Can only be called from the main thread.
   bool StartIoThread(bool wait_for_connect);
 
   // Calls StartIoThread() from off the main thread.
diff --git a/src/js_stream.cc b/src/js_stream.cc
index e8e31f41cb64ad..2aeda3197739c9 100644
--- a/src/js_stream.cc
+++ b/src/js_stream.cc
@@ -14,9 +14,9 @@ using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
 using v8::HandleScope;
 using v8::Local;
-using v8::MaybeLocal;
 using v8::Object;
 using v8::String;
+using v8::TryCatch;
 using v8::Value;
 
 
@@ -98,24 +98,41 @@ bool JSStream::IsAlive() {
 bool JSStream::IsClosing() {
   HandleScope scope(env()->isolate());
   Context::Scope context_scope(env()->context());
-  return MakeCallback(env()->isclosing_string(), 0, nullptr)
-      .ToLocalChecked()->IsTrue();
+  TryCatch try_catch(env()->isolate());
+  Local<Value> value;
+  if (!MakeCallback(env()->isclosing_string(), 0, nullptr).ToLocal(&value)) {
+    FatalException(env()->isolate(), try_catch);
+    return true;
+  }
+  return value->IsTrue();
 }
 
 
 int JSStream::ReadStart() {
   HandleScope scope(env()->isolate());
   Context::Scope context_scope(env()->context());
-  return MakeCallback(env()->onreadstart_string(), 0, nullptr)
-      .ToLocalChecked()->Int32Value();
+  TryCatch try_catch(env()->isolate());
+  Local<Value> value;
+  int value_int = UV_EPROTO;
+  if (!MakeCallback(env()->onreadstart_string(), 0, nullptr).ToLocal(&value) ||
+      !value->Int32Value(env()->context()).To(&value_int)) {
+    FatalException(env()->isolate(), try_catch);
+  }
+  return value_int;
 }
 
 
 int JSStream::ReadStop() {
   HandleScope scope(env()->isolate());
   Context::Scope context_scope(env()->context());
-  return MakeCallback(env()->onreadstop_string(), 0, nullptr)
-      .ToLocalChecked()->Int32Value();
+  TryCatch try_catch(env()->isolate());
+  Local<Value> value;
+  int value_int = UV_EPROTO;
+  if (!MakeCallback(env()->onreadstop_string(), 0, nullptr).ToLocal(&value) ||
+      !value->Int32Value(env()->context()).To(&value_int)) {
+    FatalException(env()->isolate(), try_catch);
+  }
+  return value_int;
 }
 
 
@@ -128,10 +145,17 @@ int JSStream::DoShutdown(ShutdownWrap* req_wrap) {
   };
 
   req_wrap->Dispatched();
-  MaybeLocal<Value> res =
-      MakeCallback(env()->onshutdown_string(), arraysize(argv), argv);
 
-  return res.ToLocalChecked()->Int32Value();
+  TryCatch try_catch(env()->isolate());
+  Local<Value> value;
+  int value_int = UV_EPROTO;
+  if (!MakeCallback(env()->onshutdown_string(),
+                    arraysize(argv),
+                    argv).ToLocal(&value) ||
+      !value->Int32Value(env()->context()).To(&value_int)) {
+    FatalException(env()->isolate(), try_catch);
+  }
+  return value_int;
 }
 
 
@@ -157,10 +181,17 @@ int JSStream::DoWrite(WriteWrap* w,
   };
 
   w->Dispatched();
-  MaybeLocal<Value> res =
-      MakeCallback(env()->onwrite_string(), arraysize(argv), argv);
 
-  return res.ToLocalChecked()->Int32Value();
+  TryCatch try_catch(env()->isolate());
+  Local<Value> value;
+  int value_int = UV_EPROTO;
+  if (!MakeCallback(env()->onwrite_string(),
+                    arraysize(argv),
+                    argv).ToLocal(&value) ||
+      !value->Int32Value(env()->context()).To(&value_int)) {
+    FatalException(env()->isolate(), try_catch);
+  }
+  return value_int;
 }
 
 
@@ -206,14 +237,14 @@ void JSStream::ReadBuffer(const FunctionCallbackInfo<Value>& args) {
   do {
     uv_buf_t buf;
     ssize_t avail = len;
-    wrap->OnAlloc(len, &buf);
+    wrap->EmitAlloc(len, &buf);
     if (static_cast<ssize_t>(buf.len) < avail)
       avail = buf.len;
 
     memcpy(buf.base, data, avail);
     data += avail;
     len -= avail;
-    wrap->OnRead(avail, &buf);
+    wrap->EmitRead(avail, &buf);
   } while (len != 0);
 }
 
@@ -222,7 +253,7 @@ void JSStream::EmitEOF(const FunctionCallbackInfo<Value>& args) {
   JSStream* wrap;
   ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
 
-  wrap->OnRead(UV_EOF, nullptr);
+  wrap->EmitRead(UV_EOF, nullptr);
 }
 
 
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
index dfba4d5b300f66..4368fc6d0586c3 100644
--- a/src/module_wrap.cc
+++ b/src/module_wrap.cc
@@ -550,6 +550,62 @@ void ModuleWrap::Resolve(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(result.FromJust().ToObject(env));
 }
 
+static MaybeLocal<Promise> ImportModuleDynamically(
+    Local<Context> context,
+    Local<v8::ScriptOrModule> referrer,
+    Local<String> specifier) {
+  Isolate* iso = context->GetIsolate();
+  Environment* env = Environment::GetCurrent(context);
+  v8::EscapableHandleScope handle_scope(iso);
+
+  if (env->context() != context) {
+    auto maybe_resolver = Promise::Resolver::New(context);
+    Local<Promise::Resolver> resolver;
+    if (maybe_resolver.ToLocal(&resolver)) {
+      // TODO(jkrems): Turn into proper error object w/ code
+      Local<Value> error = v8::Exception::Error(
+        OneByteString(iso, "import() called outside of main context"));
+      if (resolver->Reject(context, error).IsJust()) {
+        return handle_scope.Escape(resolver.As<Promise>());
+      }
+    }
+    return MaybeLocal<Promise>();
+  }
+
+  Local<Function> import_callback =
+    env->host_import_module_dynamically_callback();
+  Local<Value> import_args[] = {
+    referrer->GetResourceName(),
+    Local<Value>(specifier)
+  };
+  MaybeLocal<Value> maybe_result = import_callback->Call(context,
+                                                         v8::Undefined(iso),
+                                                         2,
+                                                         import_args);
+
+  Local<Value> result;
+  if (maybe_result.ToLocal(&result)) {
+    return handle_scope.Escape(result.As<Promise>());
+  }
+  return MaybeLocal<Promise>();
+}
+
+void ModuleWrap::SetImportModuleDynamicallyCallback(
+    const FunctionCallbackInfo<Value>& args) {
+  Isolate* iso = args.GetIsolate();
+  Environment* env = Environment::GetCurrent(args);
+  HandleScope handle_scope(iso);
+  if (!args[0]->IsFunction()) {
+    env->ThrowError("first argument is not a function");
+    return;
+  }
+
+  Local<Function> import_callback = args[0].As<Function>();
+  env->set_host_import_module_dynamically_callback(import_callback);
+
+  iso->SetHostImportModuleDynamicallyCallback(ImportModuleDynamically);
+}
+
 void ModuleWrap::Initialize(Local<Object> target,
                             Local<Value> unused,
                             Local<Context> context) {
@@ -567,6 +623,9 @@ void ModuleWrap::Initialize(Local<Object> target,
 
   target->Set(FIXED_ONE_BYTE_STRING(isolate, "ModuleWrap"), tpl->GetFunction());
   env->SetMethod(target, "resolve", node::loader::ModuleWrap::Resolve);
+  env->SetMethod(target,
+                 "setImportModuleDynamicallyCallback",
+                 node::loader::ModuleWrap::SetImportModuleDynamicallyCallback);
 }
 
 }  // namespace loader
diff --git a/src/module_wrap.h b/src/module_wrap.h
index 980c802c1f1952..71ebda4c109b5f 100644
--- a/src/module_wrap.h
+++ b/src/module_wrap.h
@@ -39,6 +39,8 @@ class ModuleWrap : public BaseObject {
   static void GetUrl(v8::Local<v8::String> property,
                      const v8::PropertyCallbackInfo<v8::Value>& info);
   static void Resolve(const v8::FunctionCallbackInfo<v8::Value>& args);
+  static void SetImportModuleDynamicallyCallback(
+      const v8::FunctionCallbackInfo<v8::Value>& args);
   static v8::MaybeLocal<v8::Module> ResolveCallback(
       v8::Local<v8::Context> context,
       v8::Local<v8::String> specifier,
diff --git a/src/node.cc b/src/node.cc
index 67c8a808ffb00e..ddd99b00aa9c67 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -192,6 +192,8 @@ static node_module* modlist_linked;
 static node_module* modlist_addon;
 static bool trace_enabled = false;
 static std::string trace_enabled_categories;  // NOLINT(runtime/string)
+static std::string trace_file_pattern =  // NOLINT(runtime/string)
+  "node_trace.${rotation}.log";
 static bool abort_on_uncaught_exception = false;
 
 // Bit flag used to track security reverts (see node_revert.h)
@@ -273,7 +275,7 @@ static struct {
 #if NODE_USE_V8_PLATFORM
   void Initialize(int thread_pool_size, uv_loop_t* loop) {
     if (trace_enabled) {
-      tracing_agent_.reset(new tracing::Agent());
+      tracing_agent_.reset(new tracing::Agent(trace_file_pattern));
       platform_ = new NodePlatform(thread_pool_size, loop,
         tracing_agent_->GetTracingController());
       V8::InitializePlatform(platform_);
@@ -2664,12 +2666,9 @@ static void DLOpen(const FunctionCallbackInfo<Value>& args) {
     env->ThrowError("Module did not self-register.");
     return;
   }
-  if (mp->nm_version == -1) {
-    if (env->EmitNapiWarning()) {
-      ProcessEmitWarning(env, "N-API is an experimental feature and could "
-                         "change at any time.");
-    }
-  } else if (mp->nm_version != NODE_MODULE_VERSION) {
+
+  // -1 is used for N-API modules
+  if ((mp->nm_version != -1) && (mp->nm_version != NODE_MODULE_VERSION)) {
     char errmsg[1024];
     snprintf(errmsg,
              sizeof(errmsg),
@@ -3853,6 +3852,10 @@ static void PrintHelp() {
          "  --trace-events-enabled     track trace events\n"
          "  --trace-event-categories   comma separated list of trace event\n"
          "                             categories to record\n"
+         "  --trace-event-file-pattern Template string specifying the\n"
+         "                             filepath for the trace-events data, it\n"
+         "                             supports ${rotation} and ${pid}\n"
+         "                             log-rotation id. %%2$u is the pid.\n"
          "  --track-heap-objects       track heap object allocations for heap "
          "snapshots\n"
          "  --prof-process             process v8 profiler output generated\n"
@@ -3979,6 +3982,7 @@ static void CheckIfAllowedInEnv(const char* exe, bool is_env,
     "--force-async-hooks-checks",
     "--trace-events-enabled",
     "--trace-event-categories",
+    "--trace-event-file-pattern",
     "--track-heap-objects",
     "--zero-fill-buffers",
     "--v8-pool-size",
@@ -4128,6 +4132,14 @@ static void ParseArgs(int* argc,
       }
       args_consumed += 1;
       trace_enabled_categories = categories;
+    } else if (strcmp(arg, "--trace-event-file-pattern") == 0) {
+      const char* file_pattern = argv[index + 1];
+      if (file_pattern == nullptr) {
+        fprintf(stderr, "%s: %s requires an argument\n", argv[0], arg);
+        exit(9);
+      }
+      args_consumed += 1;
+      trace_file_pattern = file_pattern;
     } else if (strcmp(arg, "--track-heap-objects") == 0) {
       track_heap_objects = true;
     } else if (strcmp(arg, "--throw-deprecation") == 0) {
@@ -4139,6 +4151,8 @@ static void ParseArgs(int* argc,
       config_preserve_symlinks = true;
     } else if (strcmp(arg, "--experimental-modules") == 0) {
       config_experimental_modules = true;
+      new_v8_argv[new_v8_argc] = "--harmony-dynamic-import";
+      new_v8_argc += 1;
     }  else if (strcmp(arg, "--loader") == 0) {
       const char* module = argv[index + 1];
       if (!config_experimental_modules) {
diff --git a/src/node_api.cc b/src/node_api.cc
index b0456811bfb1dd..6990d1ccd904cf 100644
--- a/src/node_api.cc
+++ b/src/node_api.cc
@@ -1,13 +1,3 @@
-/******************************************************************************
- * Experimental prototype for demonstrating VM agnostic and ABI stable API
- * for native modules to use instead of using Nan and V8 APIs directly.
- *
- * The current status is "Experimental" and should not be used for
- * production applications.  The API is still subject to change
- * and as an experimental feature is NOT subject to semver.
- *
- ******************************************************************************/
-
 #include <node_buffer.h>
 #include <node_object_wrap.h>
 #include <limits.h>  // INT_MAX
diff --git a/src/node_api.h b/src/node_api.h
index 627e56118011e6..aaf002b7584449 100644
--- a/src/node_api.h
+++ b/src/node_api.h
@@ -1,12 +1,3 @@
-/******************************************************************************
- * Experimental prototype for demonstrating VM agnostic and ABI stable API
- * for native modules to use instead of using Nan and V8 APIs directly.
- *
- * The current status is "Experimental" and should not be used for
- * production applications.  The API is still subject to change
- * and as an experimental feature is NOT subject to semver.
- *
- ******************************************************************************/
 #ifndef SRC_NODE_API_H_
 #define SRC_NODE_API_H_
 
@@ -179,7 +170,7 @@ NAPI_EXTERN napi_status napi_create_range_error(napi_env env,
                                                 napi_value msg,
                                                 napi_value* result);
 
-// Methods to get the the native napi_value from Primitive type
+// Methods to get the native napi_value from Primitive type
 NAPI_EXTERN napi_status napi_typeof(napi_env env,
                                     napi_value value,
                                     napi_valuetype* result);
diff --git a/src/node_config.cc b/src/node_config.cc
index 07f891cf0c012a..0a78da7198b6b0 100644
--- a/src/node_config.cc
+++ b/src/node_config.cc
@@ -85,6 +85,9 @@ static void InitConfig(Local<Object> target,
   if (config_expose_http2)
     READONLY_BOOLEAN_PROPERTY("exposeHTTP2");
 
+  if (env->abort_on_uncaught_exception())
+    READONLY_BOOLEAN_PROPERTY("shouldAbortOnUncaughtException");
+
   READONLY_PROPERTY(target,
                     "bits",
                     Number::New(env->isolate(), 8 * sizeof(intptr_t)));
diff --git a/src/node_crypto_bio.cc b/src/node_crypto_bio.cc
index eb0500952b15a5..526d0d4ae568b1 100644
--- a/src/node_crypto_bio.cc
+++ b/src/node_crypto_bio.cc
@@ -68,8 +68,6 @@ void NodeBIO::AssignEnvironment(Environment* env) {
 int NodeBIO::New(BIO* bio) {
   BIO_set_data(bio, new NodeBIO());
 
-  // XXX Why am I doing it?!
-  BIO_set_shutdown(bio, 1);
   BIO_set_init(bio, 1);
 
   return 1;
diff --git a/src/node_http2.cc b/src/node_http2.cc
index b31878582301ed..4aa9fceec18ced 100644
--- a/src/node_http2.cc
+++ b/src/node_http2.cc
@@ -1687,7 +1687,7 @@ void Http2Session::OnStreamReadImpl(ssize_t nread,
     // ssize_t to int. Cast here so that the < 0 check actually works on
     // Windows.
     if (static_cast<int>(ret) < 0) {
-      DEBUG_HTTP2SESSION2(this, "fatal error receiving data: %d", ret);
+      DEBUG_HTTP2SESSION2(session, "fatal error receiving data: %d", ret);
 
       Local<Value> argv[1] = {
         Integer::New(isolate, ret),
diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc
index 31dd013736e42b..ab0ab2f0bb8e68 100644
--- a/src/node_http_parser.cc
+++ b/src/node_http_parser.cc
@@ -74,22 +74,6 @@ const uint32_t kOnMessageComplete = 3;
 const uint32_t kOnExecute = 4;
 
 
-#define HTTP_CB(name)                                                         \
-  static int name(http_parser* p_) {                                          \
-    Parser* self = ContainerOf(&Parser::parser_, p_);                         \
-    return self->name##_();                                                   \
-  }                                                                           \
-  int name##_()
-
-
-#define HTTP_DATA_CB(name)                                                    \
-  static int name(http_parser* p_, const char* at, size_t length) {           \
-    Parser* self = ContainerOf(&Parser::parser_, p_);                         \
-    return self->name##_(at, length);                                         \
-  }                                                                           \
-  int name##_(const char* at, size_t length)
-
-
 // helper class for the Parser
 struct StringPtr {
   StringPtr() {
@@ -184,7 +168,7 @@ class Parser : public AsyncWrap {
   }
 
 
-  HTTP_CB(on_message_begin) {
+  int on_message_begin() {
     num_fields_ = num_values_ = 0;
     url_.Reset();
     status_message_.Reset();
@@ -192,19 +176,19 @@ class Parser : public AsyncWrap {
   }
 
 
-  HTTP_DATA_CB(on_url) {
+  int on_url(const char* at, size_t length) {
     url_.Update(at, length);
     return 0;
   }
 
 
-  HTTP_DATA_CB(on_status) {
+  int on_status(const char* at, size_t length) {
     status_message_.Update(at, length);
     return 0;
   }
 
 
-  HTTP_DATA_CB(on_header_field) {
+  int on_header_field(const char* at, size_t length) {
     if (num_fields_ == num_values_) {
       // start of new field name
       num_fields_++;
@@ -226,7 +210,7 @@ class Parser : public AsyncWrap {
   }
 
 
-  HTTP_DATA_CB(on_header_value) {
+  int on_header_value(const char* at, size_t length) {
     if (num_values_ != num_fields_) {
       // start of new header value
       num_values_++;
@@ -242,7 +226,7 @@ class Parser : public AsyncWrap {
   }
 
 
-  HTTP_CB(on_headers_complete) {
+  int on_headers_complete() {
     // Arguments for the on-headers-complete javascript callback. This
     // list needs to be kept in sync with the actual argument list for
     // `parserOnHeadersComplete` in lib/_http_common.js.
@@ -319,7 +303,7 @@ class Parser : public AsyncWrap {
   }
 
 
-  HTTP_DATA_CB(on_body) {
+  int on_body(const char* at, size_t length) {
     EscapableHandleScope scope(env()->isolate());
 
     Local<Object> obj = object();
@@ -356,7 +340,7 @@ class Parser : public AsyncWrap {
   }
 
 
-  HTTP_CB(on_message_complete) {
+  int on_message_complete() {
     HandleScope scope(env()->isolate());
 
     if (num_fields_)
@@ -394,8 +378,7 @@ class Parser : public AsyncWrap {
     Parser* parser;
     ASSIGN_OR_RETURN_UNWRAP(&parser, args.Holder());
 
-    if (--parser->refcount_ == 0)
-      delete parser;
+    delete parser;
   }
 
 
@@ -561,22 +544,6 @@ class Parser : public AsyncWrap {
   }
 
  protected:
-  class ScopedRetainParser {
-   public:
-    explicit ScopedRetainParser(Parser* p) : p_(p) {
-      CHECK_GT(p_->refcount_, 0);
-      p_->refcount_++;
-    }
-
-    ~ScopedRetainParser() {
-      if (0 == --p_->refcount_)
-        delete p_;
-    }
-
-   private:
-    Parser* const p_;
-  };
-
   static const size_t kAllocBufferSize = 64 * 1024;
 
   static void OnAllocImpl(size_t suggested_size, uv_buf_t* buf, void* ctx) {
@@ -613,8 +580,6 @@ class Parser : public AsyncWrap {
     if (nread == 0)
       return;
 
-    ScopedRetainParser retain(parser);
-
     parser->current_buffer_.Clear();
     Local<Value> ret = parser->Execute(buf->base, nread);
 
@@ -752,22 +717,33 @@ class Parser : public AsyncWrap {
   char* current_buffer_data_;
   StreamResource::Callback<StreamResource::AllocCb> prev_alloc_cb_;
   StreamResource::Callback<StreamResource::ReadCb> prev_read_cb_;
-  int refcount_ = 1;
-  static const struct http_parser_settings settings;
 
-  friend class ScopedRetainParser;
-};
+  // These are helper functions for filling `http_parser_settings`, which turn
+  // a member function of Parser into a C-style HTTP parser callback.
+  template <typename Parser, Parser> struct Proxy;
+  template <typename Parser, typename ...Args, int (Parser::*Member)(Args...)>
+  struct Proxy<int (Parser::*)(Args...), Member> {
+    static int Raw(http_parser* p, Args ... args) {
+      Parser* parser = ContainerOf(&Parser::parser_, p);
+      return (parser->*Member)(std::forward<Args>(args)...);
+    }
+  };
+
+  typedef int (Parser::*Call)();
+  typedef int (Parser::*DataCall)(const char* at, size_t length);
 
+  static const struct http_parser_settings settings;
+};
 
 const struct http_parser_settings Parser::settings = {
-  Parser::on_message_begin,
-  Parser::on_url,
-  Parser::on_status,
-  Parser::on_header_field,
-  Parser::on_header_value,
-  Parser::on_headers_complete,
-  Parser::on_body,
-  Parser::on_message_complete,
+  Proxy<Call, &Parser::on_message_begin>::Raw,
+  Proxy<DataCall, &Parser::on_url>::Raw,
+  Proxy<DataCall, &Parser::on_status>::Raw,
+  Proxy<DataCall, &Parser::on_header_field>::Raw,
+  Proxy<DataCall, &Parser::on_header_value>::Raw,
+  Proxy<Call, &Parser::on_headers_complete>::Raw,
+  Proxy<DataCall, &Parser::on_body>::Raw,
+  Proxy<Call, &Parser::on_message_complete>::Raw,
   nullptr,  // on_chunk_header
   nullptr   // on_chunk_complete
 };
diff --git a/src/node_main.cc b/src/node_main.cc
index 2a511b92996e86..7ab612d53e500a 100644
--- a/src/node_main.cc
+++ b/src/node_main.cc
@@ -34,7 +34,7 @@ int wmain(int argc, wchar_t *wargv[]) {
     exit(ERROR_EXE_MACHINE_TYPE_MISMATCH);
   }
 
-  // Convert argv to to UTF8
+  // Convert argv to UTF8
   char** argv = new char*[argc + 1];
   for (int i = 0; i < argc; i++) {
     // Compute the size of the required buffer
diff --git a/src/node_perf.cc b/src/node_perf.cc
index d37f8ad002ec22..97f351a9748c8b 100644
--- a/src/node_perf.cc
+++ b/src/node_perf.cc
@@ -184,8 +184,9 @@ void SetupPerformanceObservers(const FunctionCallbackInfo<Value>& args) {
 }
 
 // Creates a GC Performance Entry and passes it to observers
-void PerformanceGCCallback(Environment* env, void* ptr) {
-  GCPerformanceEntry* entry = static_cast<GCPerformanceEntry*>(ptr);
+void PerformanceGCCallback(uv_async_t* handle) {
+  GCPerformanceEntry* entry = static_cast<GCPerformanceEntry*>(handle->data);
+  Environment* env = entry->env();
   HandleScope scope(env->isolate());
   Local<Context> context = env->context();
 
@@ -203,6 +204,10 @@ void PerformanceGCCallback(Environment* env, void* ptr) {
   }
 
   delete entry;
+  auto closeCB = [](uv_handle_t* handle) {
+    delete reinterpret_cast<uv_async_t*>(handle);
+  };
+  uv_close(reinterpret_cast<uv_handle_t*>(handle), closeCB);
 }
 
 // Marks the start of a GC cycle
@@ -219,11 +224,16 @@ void MarkGarbageCollectionEnd(Isolate* isolate,
                               v8::GCCallbackFlags flags,
                               void* data) {
   Environment* env = static_cast<Environment*>(data);
-  env->SetImmediate(PerformanceGCCallback,
-                    new GCPerformanceEntry(env,
-                                           static_cast<PerformanceGCKind>(type),
-                                           performance_last_gc_start_mark_,
-                                           PERFORMANCE_NOW()));
+  uv_async_t* async = new uv_async_t();
+  if (uv_async_init(env->event_loop(), async, PerformanceGCCallback))
+    return delete async;
+  uv_unref(reinterpret_cast<uv_handle_t*>(async));
+  async->data =
+      new GCPerformanceEntry(env,
+                             static_cast<PerformanceGCKind>(type),
+                             performance_last_gc_start_mark_,
+                             PERFORMANCE_NOW());
+  CHECK_EQ(0, uv_async_send(async));
 }
 
 
diff --git a/src/node_postmortem_metadata.cc b/src/node_postmortem_metadata.cc
new file mode 100644
index 00000000000000..5d7a8c88ecb2c7
--- /dev/null
+++ b/src/node_postmortem_metadata.cc
@@ -0,0 +1,64 @@
+#include "env.h"
+#include "base-object-inl.h"
+#include "handle_wrap.h"
+#include "util-inl.h"
+#include "req-wrap.h"
+#include "v8abbr.h"
+
+#define NODEDBG_SYMBOL(Name)  nodedbg_ ## Name
+
+// nodedbg_offset_CLASS__MEMBER__TYPE: Describes the offset to a class member.
+#define NODEDBG_OFFSET(Class, Member, Type) \
+    NODEDBG_SYMBOL(offset_ ## Class ## __ ## Member ## __ ## Type)
+
+// These are the constants describing Node internal structures. Every constant
+// should use the format described above.  These constants are declared as
+// global integers so that they'll be present in the generated node binary. They
+// also need to be declared outside any namespace to avoid C++ name-mangling.
+#define NODE_OFFSET_POSTMORTEM_METADATA(V)                                    \
+  V(BaseObject, persistent_handle_, v8_Persistent_v8_Object,                  \
+    BaseObject::persistent_handle_)                                           \
+  V(Environment, handle_wrap_queue_, Environment_HandleWrapQueue,             \
+    Environment::handle_wrap_queue_)                                          \
+  V(Environment, req_wrap_queue_, Environment_ReqWrapQueue,                   \
+    Environment::req_wrap_queue_)                                             \
+  V(HandleWrap, handle_wrap_queue_, ListNode_HandleWrap,                      \
+    HandleWrap::handle_wrap_queue_)                                           \
+  V(Environment_HandleWrapQueue, head_, ListNode_HandleWrap,                  \
+    Environment::HandleWrapQueue::head_)                                      \
+  V(ListNode_HandleWrap, next_, uintptr_t, ListNode<HandleWrap>::next_)       \
+  V(ReqWrap, req_wrap_queue_, ListNode_ReqWrapQueue,                          \
+    ReqWrap<uv_req_t>::req_wrap_queue_)                                       \
+  V(Environment_ReqWrapQueue, head_, ListNode_ReqWrapQueue,                   \
+    Environment::ReqWrapQueue::head_)                                         \
+  V(ListNode_ReqWrap, next_, uintptr_t, ListNode<ReqWrap<uv_req_t>>::next_)
+
+extern "C" {
+int nodedbg_const_Environment__kContextEmbedderDataIndex__int;
+uintptr_t nodedbg_offset_ExternalString__data__uintptr_t;
+
+#define V(Class, Member, Type, Accessor)                                      \
+  NODE_EXTERN uintptr_t NODEDBG_OFFSET(Class, Member, Type);
+  NODE_OFFSET_POSTMORTEM_METADATA(V)
+#undef V
+}
+
+namespace node {
+
+int GenDebugSymbols() {
+  nodedbg_const_Environment__kContextEmbedderDataIndex__int =
+      Environment::kContextEmbedderDataIndex;
+
+  nodedbg_offset_ExternalString__data__uintptr_t = NODE_OFF_EXTSTR_DATA;
+
+  #define V(Class, Member, Type, Accessor)                                    \
+    NODEDBG_OFFSET(Class, Member, Type) = OffsetOf(&Accessor);
+    NODE_OFFSET_POSTMORTEM_METADATA(V)
+  #undef V
+
+  return 1;
+}
+
+int debug_symbols_generated = GenDebugSymbols();
+
+}  // namespace node
diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc
index 96f836a3c8f24e..70ee6b6ac622eb 100644
--- a/src/node_stat_watcher.cc
+++ b/src/node_stat_watcher.cc
@@ -112,9 +112,15 @@ void StatWatcher::Start(const FunctionCallbackInfo<Value>& args) {
   const bool persistent = args[1]->BooleanValue();
   const uint32_t interval = args[2]->Uint32Value();
 
-  if (!persistent)
+  if (uv_is_active(reinterpret_cast<uv_handle_t*>(wrap->watcher_)))
+    return;
+  // Safe, uv_ref/uv_unref are idempotent.
+  if (persistent)
+    uv_ref(reinterpret_cast<uv_handle_t*>(wrap->watcher_));
+  else
     uv_unref(reinterpret_cast<uv_handle_t*>(wrap->watcher_));
   uv_fs_poll_start(wrap->watcher_, Callback, *path, interval);
+
   wrap->ClearWeak();
 }
 
diff --git a/src/node_url.cc b/src/node_url.cc
index 0f7992264ecf0f..a28859d285939b 100644
--- a/src/node_url.cc
+++ b/src/node_url.cc
@@ -332,6 +332,74 @@ const uint8_t C0_CONTROL_ENCODE_SET[32] = {
     0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80
 };
 
+const uint8_t FRAGMENT_ENCODE_SET[32] = {
+  // 00     01     02     03     04     05     06     07
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // 08     09     0A     0B     0C     0D     0E     0F
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // 10     11     12     13     14     15     16     17
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // 18     19     1A     1B     1C     1D     1E     1F
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // 20     21     22     23     24     25     26     27
+    0x01 | 0x00 | 0x04 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
+  // 28     29     2A     2B     2C     2D     2E     2F
+    0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
+  // 30     31     32     33     34     35     36     37
+    0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
+  // 38     39     3A     3B     3C     3D     3E     3F
+    0x00 | 0x00 | 0x00 | 0x00 | 0x10 | 0x00 | 0x40 | 0x00,
+  // 40     41     42     43     44     45     46     47
+    0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
+  // 48     49     4A     4B     4C     4D     4E     4F
+    0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
+  // 50     51     52     53     54     55     56     57
+    0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
+  // 58     59     5A     5B     5C     5D     5E     5F
+    0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
+  // 60     61     62     63     64     65     66     67
+    0x01 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
+  // 68     69     6A     6B     6C     6D     6E     6F
+    0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
+  // 70     71     72     73     74     75     76     77
+    0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00,
+  // 78     79     7A     7B     7C     7D     7E     7F
+    0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x00 | 0x80,
+  // 80     81     82     83     84     85     86     87
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // 88     89     8A     8B     8C     8D     8E     8F
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // 90     91     92     93     94     95     96     97
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // 98     99     9A     9B     9C     9D     9E     9F
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // A0     A1     A2     A3     A4     A5     A6     A7
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // A8     A9     AA     AB     AC     AD     AE     AF
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // B0     B1     B2     B3     B4     B5     B6     B7
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // B8     B9     BA     BB     BC     BD     BE     BF
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // C0     C1     C2     C3     C4     C5     C6     C7
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // C8     C9     CA     CB     CC     CD     CE     CF
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // D0     D1     D2     D3     D4     D5     D6     D7
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // D8     D9     DA     DB     DC     DD     DE     DF
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // E0     E1     E2     E3     E4     E5     E6     E7
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // E8     E9     EA     EB     EC     ED     EE     EF
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // F0     F1     F2     F3     F4     F5     F6     F7
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
+  // F8     F9     FA     FB     FC     FD     FE     FF
+    0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80
+};
+
+
 const uint8_t PATH_ENCODE_SET[32] = {
   // 00     01     02     03     04     05     06     07
     0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80,
@@ -1896,7 +1964,7 @@ void URL::Parse(const char* input,
           case 0:
             break;
           default:
-            AppendOrEscape(&buffer, ch, C0_CONTROL_ENCODE_SET);
+            AppendOrEscape(&buffer, ch, FRAGMENT_ENCODE_SET);
         }
         break;
       default:
diff --git a/src/req-wrap.h b/src/req-wrap.h
index 83baf9d2a35285..ddd0840aad2ab6 100644
--- a/src/req-wrap.h
+++ b/src/req-wrap.h
@@ -22,14 +22,19 @@ class ReqWrap : public AsyncWrap {
 
  private:
   friend class Environment;
+  friend int GenDebugSymbols();
   ListNode<ReqWrap> req_wrap_queue_;
 
  protected:
   // req_wrap_queue_ needs to be at a fixed offset from the start of the class
   // because it is used by ContainerOf to calculate the address of the embedding
-  // ReqWrap. ContainerOf compiles down to simple, fixed pointer arithmetic.
-  // sizeof(req_) depends on the type of T, so req_wrap_queue_ would
-  // no longer be at a fixed offset if it came after req_.
+  // ReqWrap. ContainerOf compiles down to simple, fixed pointer arithmetic. It
+  // is also used by src/node_postmortem_metadata.cc to calculate offsets and
+  // generate debug symbols for ReqWrap, which assumes that the position of
+  // members in memory are predictable. sizeof(req_) depends on the type of T,
+  // so req_wrap_queue_ would no longer be at a fixed offset if it came after
+  // req_. For more information please refer to
+  // `doc/guides/node-postmortem-support.md`
   T req_;
 };
 
diff --git a/src/stream_base.cc b/src/stream_base.cc
index 4d9e1dfc6b2dba..225103cc8d727a 100644
--- a/src/stream_base.cc
+++ b/src/stream_base.cc
@@ -408,7 +408,7 @@ void StreamBase::AfterWrite(WriteWrap* req_wrap, int status) {
   // Unref handle property
   Local<Object> req_wrap_obj = req_wrap->object();
   req_wrap_obj->Delete(env->context(), env->handle_string()).FromJust();
-  OnAfterWrite(req_wrap, status);
+  EmitAfterWrite(req_wrap, status);
 
   Local<Value> argv[] = {
     Integer::New(env->isolate(), status),
diff --git a/src/stream_base.h b/src/stream_base.h
index 8c0a302d76dd2d..e5e69d2b0b81a8 100644
--- a/src/stream_base.h
+++ b/src/stream_base.h
@@ -166,19 +166,19 @@ class StreamResource {
   virtual void ClearError();
 
   // Events
-  inline void OnAfterWrite(WriteWrap* w, int status) {
+  inline void EmitAfterWrite(WriteWrap* w, int status) {
     if (!after_write_cb_.is_empty())
       after_write_cb_.fn(w, status, after_write_cb_.ctx);
   }
 
-  inline void OnAlloc(size_t size, uv_buf_t* buf) {
+  inline void EmitAlloc(size_t size, uv_buf_t* buf) {
     if (!alloc_cb_.is_empty())
       alloc_cb_.fn(size, buf, alloc_cb_.ctx);
   }
 
-  inline void OnRead(ssize_t nread,
-                     const uv_buf_t* buf,
-                     uv_handle_type pending = UV_UNKNOWN_HANDLE) {
+  inline void EmitRead(ssize_t nread,
+                       const uv_buf_t* buf,
+                       uv_handle_type pending = UV_UNKNOWN_HANDLE) {
     if (nread > 0)
       bytes_read_ += static_cast<uint64_t>(nread);
     if (!read_cb_.is_empty())
diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc
index 9ff6a8b69a3689..92c7da64c86937 100644
--- a/src/stream_wrap.cc
+++ b/src/stream_wrap.cc
@@ -171,7 +171,7 @@ void LibuvStreamWrap::OnAlloc(uv_handle_t* handle,
 
   CHECK_EQ(wrap->stream(), reinterpret_cast<uv_stream_t*>(handle));
 
-  return static_cast<StreamBase*>(wrap)->OnAlloc(suggested_size, buf);
+  return wrap->EmitAlloc(suggested_size, buf);
 }
 
 
@@ -269,7 +269,7 @@ void LibuvStreamWrap::OnRead(uv_stream_t* handle,
     }
   }
 
-  static_cast<StreamBase*>(wrap)->OnRead(nread, buf, type);
+  wrap->EmitRead(nread, buf, type);
 }
 
 
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index c15cf166fb29d8..c3e6e699c9c22c 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -230,11 +230,11 @@ void TLSWrap::Receive(const FunctionCallbackInfo<Value>& args) {
 
   // Copy given buffer entirely or partiall if handle becomes closed
   while (len > 0 && wrap->IsAlive() && !wrap->IsClosing()) {
-    wrap->stream_->OnAlloc(len, &buf);
+    wrap->stream_->EmitAlloc(len, &buf);
     size_t copy = buf.len > len ? len : buf.len;
     memcpy(buf.base, data, copy);
     buf.len = copy;
-    wrap->stream_->OnRead(buf.len, &buf);
+    wrap->stream_->EmitRead(buf.len, &buf);
 
     data += copy;
     len -= copy;
@@ -443,11 +443,11 @@ void TLSWrap::ClearOut() {
       int avail = read;
 
       uv_buf_t buf;
-      OnAlloc(avail, &buf);
+      EmitAlloc(avail, &buf);
       if (static_cast<int>(buf.len) < avail)
         avail = buf.len;
       memcpy(buf.base, current, avail);
-      OnRead(avail, &buf);
+      EmitRead(avail, &buf);
 
       // Caveat emptor: OnRead() calls into JS land which can result in
       // the SSL context object being destroyed.  We have to carefully
@@ -463,7 +463,7 @@ void TLSWrap::ClearOut() {
   int flags = SSL_get_shutdown(ssl_);
   if (!eof_ && flags & SSL_RECEIVED_SHUTDOWN) {
     eof_ = true;
-    OnRead(UV_EOF, nullptr);
+    EmitRead(UV_EOF, nullptr);
   }
 
   // We need to check whether an error occurred or the connection was
@@ -744,13 +744,13 @@ void TLSWrap::DoRead(ssize_t nread,
       eof_ = true;
     }
 
-    OnRead(nread, nullptr);
+    EmitRead(nread, nullptr);
     return;
   }
 
   // Only client connections can receive data
   if (ssl_ == nullptr) {
-    OnRead(UV_EPROTO, nullptr);
+    EmitRead(UV_EPROTO, nullptr);
     return;
   }
 
diff --git a/src/tracing/agent.cc b/src/tracing/agent.cc
index 4514a0fce1f0a2..71e53e787a464e 100644
--- a/src/tracing/agent.cc
+++ b/src/tracing/agent.cc
@@ -13,11 +13,12 @@ namespace tracing {
 using v8::platform::tracing::TraceConfig;
 using std::string;
 
-Agent::Agent() {
+Agent::Agent(const std::string& log_file_pattern) {
   int err = uv_loop_init(&tracing_loop_);
   CHECK_EQ(err, 0);
 
-  NodeTraceWriter* trace_writer = new NodeTraceWriter(&tracing_loop_);
+  NodeTraceWriter* trace_writer = new NodeTraceWriter(
+      log_file_pattern, &tracing_loop_);
   TraceBuffer* trace_buffer = new NodeTraceBuffer(
       NodeTraceBuffer::kBufferChunks, trace_writer, &tracing_loop_);
   tracing_controller_ = new TracingController();
diff --git a/src/tracing/agent.h b/src/tracing/agent.h
index bd8e90004b015c..bbb94a0c10d43e 100644
--- a/src/tracing/agent.h
+++ b/src/tracing/agent.h
@@ -12,7 +12,7 @@ using v8::platform::tracing::TracingController;
 
 class Agent {
  public:
-  Agent();
+  explicit Agent(const std::string& log_file_pattern);
   void Start(const std::string& enabled_categories);
   void Stop();
 
diff --git a/src/tracing/node_trace_writer.cc b/src/tracing/node_trace_writer.cc
index 9293e9cb8f7b4a..15c59fc98a8747 100644
--- a/src/tracing/node_trace_writer.cc
+++ b/src/tracing/node_trace_writer.cc
@@ -8,8 +8,9 @@
 namespace node {
 namespace tracing {
 
-NodeTraceWriter::NodeTraceWriter(uv_loop_t* tracing_loop)
-    : tracing_loop_(tracing_loop) {
+NodeTraceWriter::NodeTraceWriter(const std::string& log_file_pattern,
+                                 uv_loop_t* tracing_loop)
+    : tracing_loop_(tracing_loop), log_file_pattern_(log_file_pattern) {
   flush_signal_.data = this;
   int err = uv_async_init(tracing_loop_, &flush_signal_, FlushSignalCb);
   CHECK_EQ(err, 0);
@@ -54,12 +55,27 @@ NodeTraceWriter::~NodeTraceWriter() {
   }
 }
 
+void replace_substring(std::string* target,
+                       const std::string& search,
+                       const std::string& insert) {
+  size_t pos = target->find(search);
+  for (; pos != std::string::npos; pos = target->find(search, pos)) {
+    target->replace(pos, search.size(), insert);
+    pos += insert.size();
+  }
+}
+
 void NodeTraceWriter::OpenNewFileForStreaming() {
   ++file_num_;
   uv_fs_t req;
-  std::ostringstream log_file;
-  log_file << "node_trace." << file_num_ << ".log";
-  fd_ = uv_fs_open(tracing_loop_, &req, log_file.str().c_str(),
+
+  // Evaluate a JS-style template string, it accepts the values ${pid} and
+  // ${rotation}
+  std::string filepath(log_file_pattern_);
+  replace_substring(&filepath, "${pid}", std::to_string(uv_os_getpid()));
+  replace_substring(&filepath, "${rotation}", std::to_string(file_num_));
+
+  fd_ = uv_fs_open(tracing_loop_, &req, filepath.c_str(),
       O_CREAT | O_WRONLY | O_TRUNC, 0644, nullptr);
   CHECK_NE(fd_, -1);
   uv_fs_req_cleanup(&req);
diff --git a/src/tracing/node_trace_writer.h b/src/tracing/node_trace_writer.h
index 5abb3e2a617d96..9211790777bddb 100644
--- a/src/tracing/node_trace_writer.h
+++ b/src/tracing/node_trace_writer.h
@@ -16,7 +16,8 @@ using v8::platform::tracing::TraceWriter;
 
 class NodeTraceWriter : public TraceWriter {
  public:
-  explicit NodeTraceWriter(uv_loop_t* tracing_loop);
+  explicit NodeTraceWriter(const std::string& log_file_pattern,
+                           uv_loop_t* tracing_loop);
   ~NodeTraceWriter();
 
   void AppendTraceEvent(TraceObject* trace_event) override;
@@ -62,6 +63,7 @@ class NodeTraceWriter : public TraceWriter {
   int highest_request_id_completed_ = 0;
   int total_traces_ = 0;
   int file_num_ = 0;
+  const std::string& log_file_pattern_;
   std::ostringstream stream_;
   TraceWriter* json_trace_writer_ = nullptr;
   bool exited_ = false;
diff --git a/src/util-inl.h b/src/util-inl.h
index c3855eba098c67..56c94148d6e820 100644
--- a/src/util-inl.h
+++ b/src/util-inl.h
@@ -154,13 +154,17 @@ typename ListHead<T, M>::Iterator ListHead<T, M>::end() const {
   return Iterator(const_cast<ListNode<T>*>(&head_));
 }
 
+template <typename Inner, typename Outer>
+constexpr uintptr_t OffsetOf(Inner Outer::*field) {
+  return reinterpret_cast<uintptr_t>(&(static_cast<Outer*>(0)->*field));
+}
+
 template <typename Inner, typename Outer>
 ContainerOfHelper<Inner, Outer>::ContainerOfHelper(Inner Outer::*field,
                                                    Inner* pointer)
-    : pointer_(reinterpret_cast<Outer*>(
-          reinterpret_cast<uintptr_t>(pointer) -
-          reinterpret_cast<uintptr_t>(&(static_cast<Outer*>(0)->*field)))) {
-}
+    : pointer_(
+        reinterpret_cast<Outer*>(
+            reinterpret_cast<uintptr_t>(pointer) - OffsetOf(field))) {}
 
 template <typename Inner, typename Outer>
 template <typename TypeName>
diff --git a/src/util.h b/src/util.h
index 1272de1893294c..0ca3d8ea0efb4b 100644
--- a/src/util.h
+++ b/src/util.h
@@ -159,6 +159,7 @@ class ListNode {
 
  private:
   template <typename U, ListNode<U> (U::*M)> friend class ListHead;
+  friend int GenDebugSymbols();
   ListNode* prev_;
   ListNode* next_;
   DISALLOW_COPY_AND_ASSIGN(ListNode);
@@ -190,6 +191,7 @@ class ListHead {
   inline Iterator end() const;
 
  private:
+  friend int GenDebugSymbols();
   ListNode<T> head_;
   DISALLOW_COPY_AND_ASSIGN(ListHead);
 };
diff --git a/src/uv.cc b/src/uv.cc
index 6cbba07e59039c..db650377d8092d 100644
--- a/src/uv.cc
+++ b/src/uv.cc
@@ -27,14 +27,20 @@
 namespace node {
 namespace {
 
+using v8::Array;
 using v8::Context;
 using v8::FunctionCallbackInfo;
 using v8::Integer;
+using v8::Isolate;
 using v8::Local;
+using v8::Map;
 using v8::Object;
+using v8::String;
 using v8::Value;
 
 
+// TODO(joyeecheung): deprecate this function in favor of
+// lib/util.getSystemErrorName()
 void ErrName(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
   int err = args[0]->Int32Value();
@@ -49,15 +55,31 @@ void InitializeUV(Local<Object> target,
                   Local<Value> unused,
                   Local<Context> context) {
   Environment* env = Environment::GetCurrent(context);
-  target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "errname"),
+  Isolate* isolate = env->isolate();
+  target->Set(FIXED_ONE_BYTE_STRING(isolate, "errname"),
               env->NewFunctionTemplate(ErrName)->GetFunction());
 #define V(name, _)                                                            \
   target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "UV_" # name),            \
               Integer::New(env->isolate(), UV_ ## name));
   UV_ERRNO_MAP(V)
 #undef V
-}
 
+  Local<Map> err_map = Map::New(isolate);
+
+#define V(name, msg) do {                                                     \
+  Local<Array> arr = Array::New(isolate, 2);                                  \
+  arr->Set(0, OneByteString(isolate, #name));                                 \
+  arr->Set(1, OneByteString(isolate, msg));                                   \
+  err_map->Set(context,                                                       \
+               Integer::New(isolate, UV_##name),                              \
+               arr).ToLocalChecked();                                         \
+} while (0);
+  UV_ERRNO_MAP(V)
+#undef V
+
+  target->Set(context, FIXED_ONE_BYTE_STRING(isolate, "errmap"),
+              err_map).FromJust();
+}
 
 }  // anonymous namespace
 }  // namespace node
diff --git a/test/addons-napi/test_warning/binding.gyp b/test/addons-napi/test_warning/binding.gyp
deleted file mode 100644
index a44593e2518c24..00000000000000
--- a/test/addons-napi/test_warning/binding.gyp
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "test_warning",
-      "sources": [ "test_warning.c" ]
-    },
-    {
-      "target_name": "test_warning2",
-      "sources": [ "test_warning2.c" ]
-    }
-  ]
-}
diff --git a/test/addons-napi/test_warning/test.js b/test/addons-napi/test_warning/test.js
deleted file mode 100644
index c82008435fd8fd..00000000000000
--- a/test/addons-napi/test_warning/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-if (process.argv[2] === 'child') {
-  const common = require('../../common');
-  console.log(require(`./build/${common.buildType}/test_warning`));
-  console.log(require(`./build/${common.buildType}/test_warning2`));
-} else {
-  const run = require('child_process').spawnSync;
-  const assert = require('assert');
-  const warning = 'Warning: N-API is an experimental feature and could ' +
-                  'change at any time.';
-
-  const result = run(process.execPath, [__filename, 'child']);
-  assert.deepStrictEqual(result.stdout.toString().match(/\S+/g), ['42', '1337']);
-  assert.deepStrictEqual(result.stderr.toString().split(warning).length, 2);
-}
diff --git a/test/addons-napi/test_warning/test_warning.c b/test/addons-napi/test_warning/test_warning.c
deleted file mode 100644
index d0821be1f2268d..00000000000000
--- a/test/addons-napi/test_warning/test_warning.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <node_api.h>
-#include "../common.h"
-
-napi_value Init(napi_env env, napi_value exports) {
-  napi_value result;
-  NAPI_CALL(env,
-    napi_create_uint32(env, 42, &result));
-  return result;
-}
-
-NAPI_MODULE(NODE_GYP_MODULE_NAME, Init)
diff --git a/test/addons-napi/test_warning/test_warning2.c b/test/addons-napi/test_warning/test_warning2.c
deleted file mode 100644
index 3c8ee9db01390b..00000000000000
--- a/test/addons-napi/test_warning/test_warning2.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <node_api.h>
-#include "../common.h"
-
-napi_value Init(napi_env env, napi_value exports) {
-  napi_value result;
-  NAPI_CALL(env,
-    napi_create_uint32(env, 1337, &result));
-  return result;
-}
-
-NAPI_MODULE(NODE_GYP_MODULE_NAME, Init)
diff --git a/test/async-hooks/test-signalwrap.js b/test/async-hooks/test-signalwrap.js
index fa975ff0178f3c..ae4f41c6a413ba 100644
--- a/test/async-hooks/test-signalwrap.js
+++ b/test/async-hooks/test-signalwrap.js
@@ -1,7 +1,8 @@
 'use strict';
 const common = require('../common');
 
-if (common.isWindows) return common.skip('no signals in Windows');
+if (common.isWindows)
+  common.skip('no signals in Windows');
 
 const assert = require('assert');
 const initHooks = require('./init-hooks');
@@ -11,6 +12,10 @@ const exec = require('child_process').exec;
 const hooks = initHooks();
 
 hooks.enable();
+
+// Keep the event loop open so process doesn't exit before receiving signals.
+const interval = setInterval(() => {}, 9999);
+
 process.on('SIGUSR2', common.mustCall(onsigusr2, 2));
 
 const as = hooks.activitiesOfTypes('SIGNALWRAP');
@@ -66,6 +71,7 @@ function onsigusr2() {
 }
 
 function onsigusr2Again() {
+  clearInterval(interval);
   setImmediate(() => {
     checkInvocations(
       signal1, { init: 1, before: 2, after: 2, destroy: 1 },
diff --git a/test/cctest/node_module_reg.cc b/test/cctest/node_module_reg.cc
deleted file mode 100644
index a0736d2cc3e692..00000000000000
--- a/test/cctest/node_module_reg.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// Need to create empty definition for these modules'
-// registration function for cctest. Because when
-// building cctest, the definitions for the following
-// registration functions are not included.
-void _register_cares_wrap() {}
-void _register_config() {}
-void _register_contextify() {}
-void _register_fs() {}
-void _register_fs_event_wrap() {}
-void _register_http2() {}
-void _register_http_parser() {}
-void _register_js_stream() {}
-void _register_module_wrap() {}
-void _register_os() {}
-void _register_pipe_wrap() {}
-void _register_process_wrap() {}
-void _register_serdes() {}
-void _register_signal_wrap() {}
-void _register_spawn_sync() {}
-void _register_stream_wrap() {}
-void _register_tcp_wrap() {}
-void _register_timer_wrap() {}
-void _register_trace_events() {}
-void _register_tty_wrap() {}
-void _register_udp_wrap() {}
-void _register_util() {}
-void _register_uv() {}
-void _register_v8() {}
-void _register_zlib() {}
diff --git a/test/cctest/node_test_fixture.h b/test/cctest/node_test_fixture.h
index f6f851973bb778..1d9e574a32f73d 100644
--- a/test/cctest/node_test_fixture.h
+++ b/test/cctest/node_test_fixture.h
@@ -5,6 +5,7 @@
 #include "gtest/gtest.h"
 #include "node.h"
 #include "node_platform.h"
+#include "node_internals.h"
 #include "env.h"
 #include "v8.h"
 #include "libplatform/libplatform.h"
@@ -69,6 +70,13 @@ class NodeTestFixture : public ::testing::Test {
     v8::Isolate::CreateParams params_;
     params_.array_buffer_allocator = allocator_.get();
     isolate_ = v8::Isolate::New(params_);
+
+    // As the TracingController is stored globally, we only need to create it
+    // one time for all tests.
+    if (node::tracing::TraceEventHelper::GetTracingController() == nullptr) {
+      node::tracing::TraceEventHelper::SetTracingController(
+          new v8::TracingController());
+    }
   }
 
   virtual void TearDown() {
@@ -88,4 +96,48 @@ class NodeTestFixture : public ::testing::Test {
       v8::ArrayBuffer::Allocator::NewDefaultAllocator()};
 };
 
+
+class EnvironmentTestFixture : public NodeTestFixture {
+ public:
+  class Env {
+   public:
+    Env(const v8::HandleScope& handle_scope, const Argv& argv) {
+      auto isolate = handle_scope.GetIsolate();
+      context_ = v8::Context::New(isolate);
+      CHECK(!context_.IsEmpty());
+      context_->Enter();
+
+      isolate_data_ = node::CreateIsolateData(isolate,
+                                              NodeTestFixture::CurrentLoop());
+      CHECK_NE(nullptr, isolate_data_);
+      environment_ = node::CreateEnvironment(isolate_data_,
+                                             context_,
+                                             1, *argv,
+                                             argv.nr_args(), *argv);
+      CHECK_NE(nullptr, environment_);
+    }
+
+    ~Env() {
+      environment_->CleanupHandles();
+      node::FreeEnvironment(environment_);
+      node::FreeIsolateData(isolate_data_);
+      context_->Exit();
+    }
+
+    node::Environment* operator*() const {
+      return environment_;
+    }
+
+    v8::Local<v8::Context> context()  const {
+      return context_;
+    }
+
+   private:
+    v8::Local<v8::Context> context_;
+    node::IsolateData* isolate_data_;
+    node::Environment* environment_;
+    DISALLOW_COPY_AND_ASSIGN(Env);
+  };
+};
+
 #endif  // TEST_CCTEST_NODE_TEST_FIXTURE_H_
diff --git a/test/cctest/test_environment.cc b/test/cctest/test_environment.cc
index 8beacfa95ece7e..4575d3b65ae318 100644
--- a/test/cctest/test_environment.cc
+++ b/test/cctest/test_environment.cc
@@ -20,41 +20,7 @@ static void at_exit_callback1(void* arg);
 static void at_exit_callback2(void* arg);
 static std::string cb_1_arg;  // NOLINT(runtime/string)
 
-class EnvironmentTest : public NodeTestFixture {
- public:
-  class Env {
-   public:
-    Env(const v8::HandleScope& handle_scope,
-        v8::Isolate* isolate,
-        const Argv& argv) {
-      context_ = v8::Context::New(isolate);
-      CHECK(!context_.IsEmpty());
-      isolate_data_ = CreateIsolateData(isolate,
-                                        NodeTestFixture::CurrentLoop());
-      CHECK_NE(nullptr, isolate_data_);
-      environment_ = CreateEnvironment(isolate_data_,
-                                       context_,
-                                       1, *argv,
-                                       argv.nr_args(), *argv);
-      CHECK_NE(nullptr, environment_);
-    }
-
-    ~Env() {
-      environment_->CleanupHandles();
-      FreeEnvironment(environment_);
-      FreeIsolateData(isolate_data_);
-    }
-
-    Environment* operator*() const {
-      return environment_;
-    }
-
-   private:
-    v8::Local<v8::Context> context_;
-    IsolateData* isolate_data_;
-    Environment* environment_;
-  };
-
+class EnvironmentTest : public EnvironmentTestFixture {
  private:
   virtual void TearDown() {
     NodeTestFixture::TearDown();
@@ -66,7 +32,7 @@ class EnvironmentTest : public NodeTestFixture {
 TEST_F(EnvironmentTest, AtExitWithEnvironment) {
   const v8::HandleScope handle_scope(isolate_);
   const Argv argv;
-  Env env {handle_scope, isolate_, argv};
+  Env env {handle_scope, argv};
 
   AtExit(*env, at_exit_callback1);
   RunAtExit(*env);
@@ -76,7 +42,7 @@ TEST_F(EnvironmentTest, AtExitWithEnvironment) {
 TEST_F(EnvironmentTest, AtExitWithArgument) {
   const v8::HandleScope handle_scope(isolate_);
   const Argv argv;
-  Env env {handle_scope, isolate_, argv};
+  Env env {handle_scope, argv};
 
   std::string arg{"some args"};
   AtExit(*env, at_exit_callback1, static_cast<void*>(&arg));
@@ -87,8 +53,8 @@ TEST_F(EnvironmentTest, AtExitWithArgument) {
 TEST_F(EnvironmentTest, MultipleEnvironmentsPerIsolate) {
   const v8::HandleScope handle_scope(isolate_);
   const Argv argv;
-  Env env1 {handle_scope, isolate_, argv};
-  Env env2 {handle_scope, isolate_, argv};
+  Env env1 {handle_scope, argv};
+  Env env2 {handle_scope, argv};
 
   AtExit(*env1, at_exit_callback1);
   AtExit(*env2, at_exit_callback2);
diff --git a/test/cctest/test_node_postmortem_metadata.cc b/test/cctest/test_node_postmortem_metadata.cc
new file mode 100644
index 00000000000000..b6e684b705303e
--- /dev/null
+++ b/test/cctest/test_node_postmortem_metadata.cc
@@ -0,0 +1,168 @@
+#include "gtest/gtest.h"
+#include "node.h"
+#include "node_internals.h"
+#include "node_test_fixture.h"
+#include "req-wrap-inl.h"
+#include "tracing/agent.h"
+#include "v8.h"
+#include "v8abbr.h"
+
+extern "C" {
+extern uintptr_t
+    nodedbg_offset_HandleWrap__handle_wrap_queue___ListNode_HandleWrap;
+extern uintptr_t
+    nodedbg_offset_Environment__handle_wrap_queue___Environment_HandleWrapQueue;
+extern int debug_symbols_generated;
+extern int nodedbg_const_Environment__kContextEmbedderDataIndex__int;
+extern uintptr_t
+    nodedbg_offset_Environment_HandleWrapQueue__head___ListNode_HandleWrap;
+extern uintptr_t
+    nodedbg_offset_Environment__req_wrap_queue___Environment_ReqWrapQueue;
+extern uintptr_t nodedbg_offset_ExternalString__data__uintptr_t;
+extern uintptr_t nodedbg_offset_ListNode_ReqWrap__next___uintptr_t;
+extern uintptr_t nodedbg_offset_ReqWrap__req_wrap_queue___ListNode_ReqWrapQueue;
+extern uintptr_t nodedbg_offset_ListNode_HandleWrap__next___uintptr_t;
+extern uintptr_t
+    nodedbg_offset_Environment_ReqWrapQueue__head___ListNode_ReqWrapQueue;
+extern uintptr_t
+    nodedbg_offset_BaseObject__persistent_handle___v8_Persistent_v8_Object;
+}
+
+
+class DebugSymbolsTest : public EnvironmentTestFixture {};
+
+
+class TestHandleWrap : public node::HandleWrap {
+ public:
+  size_t self_size() const override { return sizeof(*this); }
+
+  TestHandleWrap(node::Environment* env,
+                 v8::Local<v8::Object> object,
+                 uv_tcp_t* handle)
+      : node::HandleWrap(env,
+                         object,
+                         reinterpret_cast<uv_handle_t*>(handle),
+                         node::AsyncWrap::PROVIDER_TIMERWRAP) {}
+};
+
+
+class TestReqWrap : public node::ReqWrap<uv_req_t> {
+ public:
+  size_t self_size() const override { return sizeof(*this); }
+
+  TestReqWrap(node::Environment* env, v8::Local<v8::Object> object)
+      : node::ReqWrap<uv_req_t>(env,
+                                object,
+                                node::AsyncWrap::PROVIDER_TIMERWRAP) {}
+};
+
+TEST_F(DebugSymbolsTest, ContextEmbedderDataIndex) {
+  int kContextEmbedderDataIndex = node::Environment::kContextEmbedderDataIndex;
+  EXPECT_EQ(nodedbg_const_Environment__kContextEmbedderDataIndex__int,
+            kContextEmbedderDataIndex);
+}
+
+TEST_F(DebugSymbolsTest, ExternalStringDataOffset) {
+  EXPECT_EQ(nodedbg_offset_ExternalString__data__uintptr_t,
+            NODE_OFF_EXTSTR_DATA);
+}
+
+TEST_F(DebugSymbolsTest, BaseObjectPersistentHandle) {
+  const v8::HandleScope handle_scope(isolate_);
+  const Argv argv;
+  Env env{handle_scope, argv};
+
+  v8::Local<v8::Object> object = v8::Object::New(isolate_);
+  node::BaseObject obj(*env, object);
+
+  auto expected = reinterpret_cast<uintptr_t>(&obj.persistent());
+  auto calculated = reinterpret_cast<uintptr_t>(&obj) +
+      nodedbg_offset_BaseObject__persistent_handle___v8_Persistent_v8_Object;
+  EXPECT_EQ(expected, calculated);
+
+  obj.persistent().Reset();  // ~BaseObject() expects an empty handle.
+}
+
+
+TEST_F(DebugSymbolsTest, EnvironmentHandleWrapQueue) {
+  const v8::HandleScope handle_scope(isolate_);
+  const Argv argv;
+  Env env{handle_scope, argv};
+
+  auto expected = reinterpret_cast<uintptr_t>((*env)->handle_wrap_queue());
+  auto calculated = reinterpret_cast<uintptr_t>(*env) +
+      nodedbg_offset_Environment__handle_wrap_queue___Environment_HandleWrapQueue;  // NOLINT(whitespace/line_length)
+  EXPECT_EQ(expected, calculated);
+}
+
+TEST_F(DebugSymbolsTest, EnvironmentReqWrapQueue) {
+  const v8::HandleScope handle_scope(isolate_);
+  const Argv argv;
+  Env env{handle_scope, argv};
+
+  auto expected = reinterpret_cast<uintptr_t>((*env)->req_wrap_queue());
+  auto calculated = reinterpret_cast<uintptr_t>(*env) +
+      nodedbg_offset_Environment__req_wrap_queue___Environment_ReqWrapQueue;
+  EXPECT_EQ(expected, calculated);
+}
+
+TEST_F(DebugSymbolsTest, HandleWrapList) {
+  const v8::HandleScope handle_scope(isolate_);
+  const Argv argv;
+  Env env{handle_scope, argv};
+
+  uv_tcp_t handle;
+
+  auto obj_template = v8::FunctionTemplate::New(isolate_);
+  obj_template->InstanceTemplate()->SetInternalFieldCount(1);
+
+  v8::Local<v8::Object> object =
+      obj_template->GetFunction()->NewInstance(env.context()).ToLocalChecked();
+  TestHandleWrap obj(*env, object, &handle);
+
+  auto queue = reinterpret_cast<uintptr_t>((*env)->handle_wrap_queue());
+  auto head = queue +
+      nodedbg_offset_Environment_HandleWrapQueue__head___ListNode_HandleWrap;
+  auto next =
+      head + nodedbg_offset_ListNode_HandleWrap__next___uintptr_t;
+  next = *reinterpret_cast<uintptr_t*>(next);
+
+  auto expected = reinterpret_cast<uintptr_t>(&obj);
+  auto calculated = next -
+      nodedbg_offset_HandleWrap__handle_wrap_queue___ListNode_HandleWrap;
+  EXPECT_EQ(expected, calculated);
+
+  obj.persistent().Reset();  // ~HandleWrap() expects an empty handle.
+}
+
+TEST_F(DebugSymbolsTest, ReqWrapList) {
+  const v8::HandleScope handle_scope(isolate_);
+  const Argv argv;
+  Env env{handle_scope, argv};
+
+  auto obj_template = v8::FunctionTemplate::New(isolate_);
+  obj_template->InstanceTemplate()->SetInternalFieldCount(1);
+
+  v8::Local<v8::Object> object =
+      obj_template->GetFunction()->NewInstance(env.context()).ToLocalChecked();
+  TestReqWrap obj(*env, object);
+
+  // NOTE (mmarchini): Workaround to fix failing tests on ARM64 machines with
+  // older GCC. Should be removed once we upgrade the GCC version used on our
+  // ARM64 CI machinies.
+  for (auto it : *(*env)->req_wrap_queue()) (void) &it;
+
+  auto queue = reinterpret_cast<uintptr_t>((*env)->req_wrap_queue());
+  auto head = queue +
+      nodedbg_offset_Environment_ReqWrapQueue__head___ListNode_ReqWrapQueue;
+  auto next =
+      head + nodedbg_offset_ListNode_ReqWrap__next___uintptr_t;
+  next = *reinterpret_cast<uintptr_t*>(next);
+
+  auto expected = reinterpret_cast<uintptr_t>(&obj);
+  auto calculated =
+      next - nodedbg_offset_ReqWrap__req_wrap_queue___ListNode_ReqWrapQueue;
+  EXPECT_EQ(expected, calculated);
+
+  obj.Dispatched();
+}
diff --git a/test/common/index.js b/test/common/index.js
index cb82cd6a93ee3a..41d4534307c7d6 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -692,6 +692,9 @@ exports.expectsError = function expectsError(fn, settings, exact) {
   }
   function innerFn(error) {
     assert.strictEqual(error.code, settings.code);
+    const descriptor = Object.getOwnPropertyDescriptor(error, 'message');
+    assert.strictEqual(descriptor.enumerable,
+                       false, 'The error message should be non-enumerable');
     if ('type' in settings) {
       const type = settings.type;
       if (type !== Error && !Error.isPrototypeOf(type)) {
diff --git a/test/es-module/test-esm-dynamic-import.js b/test/es-module/test-esm-dynamic-import.js
new file mode 100644
index 00000000000000..773b77350180fe
--- /dev/null
+++ b/test/es-module/test-esm-dynamic-import.js
@@ -0,0 +1,113 @@
+// Flags: --experimental-modules
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const { URL } = require('url');
+const vm = require('vm');
+
+common.crashOnUnhandledRejection();
+
+const relativePath = './test-esm-ok.mjs';
+const absolutePath = require.resolve('./test-esm-ok.mjs');
+const targetURL = new URL('file:///');
+targetURL.pathname = absolutePath;
+
+function expectErrorProperty(result, propertyKey, value) {
+  Promise.resolve(result)
+    .catch(common.mustCall(error => {
+      assert.equal(error[propertyKey], value);
+    }));
+}
+
+function expectMissingModuleError(result) {
+  expectErrorProperty(result, 'code', 'MODULE_NOT_FOUND');
+}
+
+function expectInvalidUrlError(result) {
+  expectErrorProperty(result, 'code', 'ERR_INVALID_URL');
+}
+
+function expectInvalidReferrerError(result) {
+  expectErrorProperty(result, 'code', 'ERR_INVALID_URL');
+}
+
+function expectInvalidProtocolError(result) {
+  expectErrorProperty(result, 'code', 'ERR_INVALID_PROTOCOL');
+}
+
+function expectInvalidContextError(result) {
+  expectErrorProperty(result,
+    'message', 'import() called outside of main context');
+}
+
+function expectOkNamespace(result) {
+  Promise.resolve(result)
+    .then(common.mustCall(ns => {
+      // Can't deepStrictEqual because ns isn't a normal object
+      assert.deepEqual(ns, { default: true });
+    }));
+}
+
+function expectFsNamespace(result) {
+  Promise.resolve(result)
+    .then(common.mustCall(ns => {
+      assert.equal(typeof ns.default.writeFile, 'function');
+    }));
+}
+
+// For direct use of import expressions inside of CJS or ES modules, including
+// via eval, all kinds of specifiers should work without issue.
+(function testScriptOrModuleImport() {
+  // Importing another file, both direct & via eval
+  // expectOkNamespace(import(relativePath));
+  expectOkNamespace(eval.call(null, `import("${relativePath}")`));
+  expectOkNamespace(eval(`import("${relativePath}")`));
+  expectOkNamespace(eval.call(null, `import("${targetURL}")`));
+
+  // Importing a built-in, both direct & via eval
+  expectFsNamespace(import("fs"));
+  expectFsNamespace(eval('import("fs")'));
+  expectFsNamespace(eval.call(null, 'import("fs")'));
+
+  expectMissingModuleError(import("./not-an-existing-module.mjs"));
+  // TODO(jkrems): Right now this doesn't hit a protocol error because the
+  // module resolution step already rejects it. These arguably should be
+  // protocol errors.
+  expectMissingModuleError(import("node:fs"));
+  expectMissingModuleError(import('http://example.com/foo.js'));
+})();
+
+// vm.runInThisContext:
+// * Supports built-ins, always
+// * Supports imports if the script has a known defined origin
+(function testRunInThisContext() {
+  // Succeeds because it's got an valid base url
+  expectFsNamespace(vm.runInThisContext(`import("fs")`, {
+    filename: __filename,
+  }));
+  expectOkNamespace(vm.runInThisContext(`import("${relativePath}")`, {
+    filename: __filename,
+  }));
+  // Rejects because it's got an invalid referrer URL.
+  // TODO(jkrems): Arguably the first two (built-in + absolute URL) could work
+  // with some additional effort.
+  expectInvalidReferrerError(vm.runInThisContext('import("fs")'));
+  expectInvalidReferrerError(vm.runInThisContext(`import("${targetURL}")`));
+  expectInvalidReferrerError(vm.runInThisContext(`import("${relativePath}")`));
+})();
+
+// vm.runInNewContext is currently completely unsupported, pending well-defined
+// semantics for per-context/realm module maps in node.
+(function testRunInNewContext() {
+  // Rejects because it's running in the wrong context
+  expectInvalidContextError(
+    vm.runInNewContext(`import("${targetURL}")`, undefined, {
+      filename: __filename,
+    })
+  );
+
+  // Rejects because it's running in the wrong context
+  expectInvalidContextError(vm.runInNewContext(`import("fs")`, undefined, {
+    filename: __filename,
+  }));
+})();
diff --git a/test/fixtures/url-setter-tests.js b/test/fixtures/url-setter-tests.js
index 6f769eaec7543d..289812cb7e33ff 100644
--- a/test/fixtures/url-setter-tests.js
+++ b/test/fixtures/url-setter-tests.js
@@ -2,7 +2,7 @@
 
 /* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
-   https://github.com/w3c/web-platform-tests/blob/b30abaecf4/url/setters_tests.json
+   https://github.com/w3c/web-platform-tests/blob/ed4bb727ed/url/setters_tests.json
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
 module.exports =
@@ -1793,13 +1793,53 @@ module.exports =
                 "hash": ""
             }
         },
+        {
+            "href": "http://example.net",
+            "new_value": "#foo bar",
+            "expected": {
+                "href": "http://example.net/#foo%20bar",
+                "hash": "#foo%20bar"
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "#foo\"bar",
+            "expected": {
+                "href": "http://example.net/#foo%22bar",
+                "hash": "#foo%22bar"
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "#foo<bar",
+            "expected": {
+                "href": "http://example.net/#foo%3Cbar",
+                "hash": "#foo%3Cbar"
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "#foo>bar",
+            "expected": {
+                "href": "http://example.net/#foo%3Ebar",
+                "hash": "#foo%3Ebar"
+            }
+        },
+        {
+            "href": "http://example.net",
+            "new_value": "#foo`bar",
+            "expected": {
+                "href": "http://example.net/#foo%60bar",
+                "hash": "#foo%60bar"
+            }
+        },
         {
             "comment": "Simple percent-encoding; nuls, tabs, and newlines are removed",
             "href": "a:/",
             "new_value": "\u0000\u0001\t\n\r\u001f !\"#$%&'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~\u007f\u0080\u0081Éé",
             "expected": {
-                "href": "a:/#%01%1F !\"#$%&'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9",
-                "hash": "#%01%1F !\"#$%&'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9"
+                "href": "a:/#%01%1F%20!%22#$%&'()*+,-./09:;%3C=%3E?@AZ[\\]^_%60az{|}~%7F%C2%80%C2%81%C3%89%C3%A9",
+                "hash": "#%01%1F%20!%22#$%&'()*+,-./09:;%3C=%3E?@AZ[\\]^_%60az{|}~%7F%C2%80%C2%81%C3%89%C3%A9"
             }
         },
         {
diff --git a/test/fixtures/url-tests.js b/test/fixtures/url-tests.js
index 48f77fe0774d64..745adb8d8aab43 100644
--- a/test/fixtures/url-tests.js
+++ b/test/fixtures/url-tests.js
@@ -2,7 +2,7 @@
 
 /* The following tests are copied from WPT. Modifications to them should be
    upstreamed first. Refs:
-   https://github.com/w3c/web-platform-tests/blob/11757f1/url/urltestdata.json
+   https://github.com/w3c/web-platform-tests/blob/ed4bb727ed/url/urltestdata.json
    License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
 */
 module.exports =
@@ -161,7 +161,7 @@ module.exports =
   {
     "input": "http://f:21/ b ? d # e ",
     "base": "http://example.org/foo/bar",
-    "href": "http://f:21/%20b%20?%20d%20# e",
+    "href": "http://f:21/%20b%20?%20d%20#%20e",
     "origin": "http://f:21",
     "protocol": "http:",
     "username": "",
@@ -171,12 +171,12 @@ module.exports =
     "port": "21",
     "pathname": "/%20b%20",
     "search": "?%20d%20",
-    "hash": "# e"
+    "hash": "#%20e"
   },
   {
     "input": "lolscheme:x x#x x",
     "base": "about:blank",
-    "href": "lolscheme:x x#x x",
+    "href": "lolscheme:x x#x%20x",
     "protocol": "lolscheme:",
     "username": "",
     "password": "",
@@ -185,7 +185,7 @@ module.exports =
     "port": "",
     "pathname": "x x",
     "search": "",
-    "hash": "#x x"
+    "hash": "#x%20x"
   },
   {
     "input": "http://f:/c",
@@ -2268,7 +2268,7 @@ module.exports =
   {
     "input": "http://www.google.com/foo?bar=baz# »",
     "base": "about:blank",
-    "href": "http://www.google.com/foo?bar=baz# %C2%BB",
+    "href": "http://www.google.com/foo?bar=baz#%20%C2%BB",
     "origin": "http://www.google.com",
     "protocol": "http:",
     "username": "",
@@ -2278,12 +2278,12 @@ module.exports =
     "port": "",
     "pathname": "/foo",
     "search": "?bar=baz",
-    "hash": "# %C2%BB"
+    "hash": "#%20%C2%BB"
   },
   {
     "input": "data:test# »",
     "base": "about:blank",
-    "href": "data:test# %C2%BB",
+    "href": "data:test#%20%C2%BB",
     "origin": "null",
     "protocol": "data:",
     "username": "",
@@ -2293,7 +2293,7 @@ module.exports =
     "port": "",
     "pathname": "test",
     "search": "",
-    "hash": "# %C2%BB"
+    "hash": "#%20%C2%BB"
   },
   {
     "input": "http://www.google.com",
@@ -4795,6 +4795,70 @@ module.exports =
     "searchParams": "qux=",
     "hash": "#foo%08bar"
   },
+  {
+    "input": "http://foo.bar/baz?qux#foo\"bar",
+    "base": "about:blank",
+    "href": "http://foo.bar/baz?qux#foo%22bar",
+    "origin": "http://foo.bar",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo.bar",
+    "hostname": "foo.bar",
+    "port": "",
+    "pathname": "/baz",
+    "search": "?qux",
+    "searchParams": "qux=",
+    "hash": "#foo%22bar"
+  },
+  {
+    "input": "http://foo.bar/baz?qux#foo<bar",
+    "base": "about:blank",
+    "href": "http://foo.bar/baz?qux#foo%3Cbar",
+    "origin": "http://foo.bar",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo.bar",
+    "hostname": "foo.bar",
+    "port": "",
+    "pathname": "/baz",
+    "search": "?qux",
+    "searchParams": "qux=",
+    "hash": "#foo%3Cbar"
+  },
+  {
+    "input": "http://foo.bar/baz?qux#foo>bar",
+    "base": "about:blank",
+    "href": "http://foo.bar/baz?qux#foo%3Ebar",
+    "origin": "http://foo.bar",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo.bar",
+    "hostname": "foo.bar",
+    "port": "",
+    "pathname": "/baz",
+    "search": "?qux",
+    "searchParams": "qux=",
+    "hash": "#foo%3Ebar"
+  },
+  {
+    "input": "http://foo.bar/baz?qux#foo`bar",
+    "base": "about:blank",
+    "href": "http://foo.bar/baz?qux#foo%60bar",
+    "origin": "http://foo.bar",
+    "protocol": "http:",
+    "username": "",
+    "password": "",
+    "host": "foo.bar",
+    "hostname": "foo.bar",
+    "port": "",
+    "pathname": "/baz",
+    "search": "?qux",
+    "searchParams": "qux=",
+    "hash": "#foo%60bar"
+  },
   "# IPv4 parsing (via https://github.com/nodejs/node/pull/10317)",
   {
     "input": "http://192.168.257",
diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 2297aad9c88edf..8163bc672f34a5 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -5,6 +5,8 @@ prefix parallel
 # sample-test                        : PASS,FLAKY
 
 [true] # This section applies to all platforms
+# Postmortem debugging data is prone to accidental removal during V8 updates.
+test-postmortem-metadata: PASS,FLAKY
 
 [$system==win32]
 
diff --git a/test/parallel/test-child-process-execfile.js b/test/parallel/test-child-process-execfile.js
index a64128d6a3ab6b..af69d685789d62 100644
--- a/test/parallel/test-child-process-execfile.js
+++ b/test/parallel/test-child-process-execfile.js
@@ -1,8 +1,9 @@
 'use strict';
+
 const common = require('../common');
 const assert = require('assert');
 const execFile = require('child_process').execFile;
-const uv = process.binding('uv');
+const { getSystemErrorName } = require('util');
 const fixtures = require('../common/fixtures');
 
 const fixture = fixtures.path('exit.js');
@@ -27,7 +28,7 @@ const execOpts = { encoding: 'utf8', shell: true };
   const code = -1;
   const callback = common.mustCall((err, stdout, stderr) => {
     assert.strictEqual(err.toString().trim(), errorString);
-    assert.strictEqual(err.code, uv.errname(code));
+    assert.strictEqual(err.code, getSystemErrorName(code));
     assert.strictEqual(err.killed, true);
     assert.strictEqual(err.signal, null);
     assert.strictEqual(err.cmd, process.execPath);
diff --git a/test/parallel/test-cli-node-options.js b/test/parallel/test-cli-node-options.js
index 29358134c22c99..3118c6bc1bc27d 100644
--- a/test/parallel/test-cli-node-options.js
+++ b/test/parallel/test-cli-node-options.js
@@ -25,6 +25,8 @@ expect('--throw-deprecation', 'B\n');
 expect('--zero-fill-buffers', 'B\n');
 expect('--v8-pool-size=10', 'B\n');
 expect('--trace-event-categories node', 'B\n');
+// eslint-disable-next-line no-template-curly-in-string
+expect('--trace-event-file-pattern {pid}-${rotation}.trace_events', 'B\n');
 
 if (common.hasCrypto) {
   expect('--use-openssl-ca', 'B\n');
diff --git a/test/parallel/test-dns-lookup.js b/test/parallel/test-dns-lookup.js
index a1fad873e33f37..3f0017c36b56b4 100644
--- a/test/parallel/test-dns-lookup.js
+++ b/test/parallel/test-dns-lookup.js
@@ -81,6 +81,9 @@ assert.doesNotThrow(() => {
     assert(error);
     assert.strictEqual(tickValue, 1);
     assert.strictEqual(error.code, 'ENOENT');
+    const descriptor = Object.getOwnPropertyDescriptor(error, 'message');
+    assert.strictEqual(descriptor.enumerable,
+                       false, 'The error message should be non-enumerable');
   }));
 
   // Make sure that the error callback is called
diff --git a/test/parallel/test-dns-resolveany-bad-ancount.js b/test/parallel/test-dns-resolveany-bad-ancount.js
index 25ce15935caad9..63ed1774b11933 100644
--- a/test/parallel/test-dns-resolveany-bad-ancount.js
+++ b/test/parallel/test-dns-resolveany-bad-ancount.js
@@ -30,6 +30,9 @@ server.bind(0, common.mustCall(() => {
     assert.strictEqual(err.code, 'EBADRESP');
     assert.strictEqual(err.syscall, 'queryAny');
     assert.strictEqual(err.hostname, 'example.org');
+    const descriptor = Object.getOwnPropertyDescriptor(err, 'message');
+    assert.strictEqual(descriptor.enumerable,
+                       false, 'The error message should be non-enumerable');
     server.close();
   }));
 }));
diff --git a/test/parallel/test-fs-watch.js b/test/parallel/test-fs-watch.js
index 37701c84b8932a..7affe370c7ed03 100644
--- a/test/parallel/test-fs-watch.js
+++ b/test/parallel/test-fs-watch.js
@@ -65,6 +65,8 @@ for (const testCase of cases) {
       assert.strictEqual(eventType, 'change');
     assert.strictEqual(argFilename, testCase.fileName);
 
+    watcher.start();  // should not crash
+
     // end of test case
     watcher.close();
   }));
diff --git a/test/parallel/test-fs-watchfile.js b/test/parallel/test-fs-watchfile.js
index 5a30981c33e882..bcb4cbcf3a698f 100644
--- a/test/parallel/test-fs-watchfile.js
+++ b/test/parallel/test-fs-watchfile.js
@@ -44,27 +44,30 @@ tmpdir.refresh();
 // time, the callback should be invoked again with proper values in stat object
 let fileExists = false;
 
-fs.watchFile(enoentFile, { interval: 0 }, common.mustCall(function(curr, prev) {
-  if (!fileExists) {
-    // If the file does not exist, all the fields should be zero and the date
-    // fields should be UNIX EPOCH time
-    assert.deepStrictEqual(curr, expectedStatObject);
-    assert.deepStrictEqual(prev, expectedStatObject);
-    // Create the file now, so that the callback will be called back once the
-    // event loop notices it.
-    fs.closeSync(fs.openSync(enoentFile, 'w'));
-    fileExists = true;
-  } else {
-    // If the ino (inode) value is greater than zero, it means that the file is
-    // present in the filesystem and it has a valid inode number.
-    assert(curr.ino > 0);
-    // As the file just got created, previous ino value should be lesser than
-    // or equal to zero (non-existent file).
-    assert(prev.ino <= 0);
-    // Stop watching the file
-    fs.unwatchFile(enoentFile);
-  }
-}, 2));
+const watcher =
+  fs.watchFile(enoentFile, { interval: 0 }, common.mustCall((curr, prev) => {
+    if (!fileExists) {
+      // If the file does not exist, all the fields should be zero and the date
+      // fields should be UNIX EPOCH time
+      assert.deepStrictEqual(curr, expectedStatObject);
+      assert.deepStrictEqual(prev, expectedStatObject);
+      // Create the file now, so that the callback will be called back once the
+      // event loop notices it.
+      fs.closeSync(fs.openSync(enoentFile, 'w'));
+      fileExists = true;
+    } else {
+      // If the ino (inode) value is greater than zero, it means that the file
+      // is present in the filesystem and it has a valid inode number.
+      assert(curr.ino > 0);
+      // As the file just got created, previous ino value should be lesser than
+      // or equal to zero (non-existent file).
+      assert(prev.ino <= 0);
+      // Stop watching the file
+      fs.unwatchFile(enoentFile);
+    }
+  }, 2));
+
+watcher.start();  // should not crash
 
 // Watch events should callback with a filename on supported systems.
 // Omitting AIX. It works but not reliably.
diff --git a/test/parallel/test-http-server-options-incoming-message.js b/test/parallel/test-http-server-options-incoming-message.js
new file mode 100644
index 00000000000000..a4bfa1b7646fc6
--- /dev/null
+++ b/test/parallel/test-http-server-options-incoming-message.js
@@ -0,0 +1,41 @@
+'use strict';
+
+/**
+ * This test covers http.Server({ IncomingMessage }) option:
+ * With IncomingMessage option the server should use
+ * the new class for creating req Object instead of the default
+ * http.IncomingMessage.
+ */
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+
+class MyIncomingMessage extends http.IncomingMessage {
+  getUserAgent() {
+    return this.headers['user-agent'] || 'unknown';
+  }
+}
+
+const server = http.Server({
+  IncomingMessage: MyIncomingMessage
+}, common.mustCall(function(req, res) {
+  assert.strictEqual(req.getUserAgent(), 'node-test');
+  res.statusCode = 200;
+  res.end();
+}));
+server.listen();
+
+server.on('listening', function makeRequest() {
+  http.get({
+    port: this.address().port,
+    headers: {
+      'User-Agent': 'node-test'
+    }
+  }, (res) => {
+    assert.strictEqual(res.statusCode, 200);
+    res.on('end', () => {
+      server.close();
+    });
+    res.resume();
+  });
+});
diff --git a/test/parallel/test-http-server-options-server-response.js b/test/parallel/test-http-server-options-server-response.js
new file mode 100644
index 00000000000000..f5adf39bed6d16
--- /dev/null
+++ b/test/parallel/test-http-server-options-server-response.js
@@ -0,0 +1,35 @@
+'use strict';
+
+/**
+ * This test covers http.Server({ ServerResponse }) option:
+ * With ServerResponse option the server should use
+ * the new class for creating res Object instead of the default
+ * http.ServerResponse.
+ */
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+
+class MyServerResponse extends http.ServerResponse {
+  status(code) {
+    return this.writeHead(code, { 'Content-Type': 'text/plain' });
+  }
+}
+
+const server = http.Server({
+  ServerResponse: MyServerResponse
+}, common.mustCall(function(req, res) {
+  res.status(200);
+  res.end();
+}));
+server.listen();
+
+server.on('listening', function makeRequest() {
+  http.get({ port: this.address().port }, (res) => {
+    assert.strictEqual(res.statusCode, 200);
+    res.on('end', () => {
+      server.close();
+    });
+    res.resume();
+  });
+});
diff --git a/test/parallel/test-http2-https-fallback-http-server-options.js b/test/parallel/test-http2-https-fallback-http-server-options.js
new file mode 100644
index 00000000000000..20e2b122a24e8c
--- /dev/null
+++ b/test/parallel/test-http2-https-fallback-http-server-options.js
@@ -0,0 +1,90 @@
+// Flags: --expose-http2
+'use strict';
+
+const common = require('../common');
+const fixtures = require('../common/fixtures');
+
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+const url = require('url');
+const tls = require('tls');
+const http2 = require('http2');
+const https = require('https');
+const http = require('http');
+
+const key = fixtures.readKey('agent8-key.pem');
+const cert = fixtures.readKey('agent8-cert.pem');
+const ca = fixtures.readKey('fake-startcom-root-cert.pem');
+
+function onRequest(request, response) {
+  const { socket: { alpnProtocol } } = request.httpVersion === '2.0' ?
+    request.stream.session : request;
+  response.status(200);
+  response.end(JSON.stringify({
+    alpnProtocol,
+    httpVersion: request.httpVersion,
+    userAgent: request.getUserAgent()
+  }));
+}
+
+class MyIncomingMessage extends http.IncomingMessage {
+  getUserAgent() {
+    return this.headers['user-agent'] || 'unknown';
+  }
+}
+
+class MyServerResponse extends http.ServerResponse {
+  status(code) {
+    return this.writeHead(code, { 'Content-Type': 'application/json' });
+  }
+}
+
+// HTTP/2 & HTTP/1.1 server
+{
+  const server = http2.createSecureServer(
+    {
+      cert,
+      key, allowHTTP1: true,
+      Http1IncomingMessage: MyIncomingMessage,
+      Http1ServerResponse: MyServerResponse
+    },
+    common.mustCall(onRequest, 1)
+  );
+
+  server.listen(0);
+
+  server.on('listening', common.mustCall(() => {
+    const { port } = server.address();
+    const origin = `https://localhost:${port}`;
+
+    // HTTP/1.1 client
+    https.get(
+      Object.assign(url.parse(origin), {
+        secureContext: tls.createSecureContext({ ca }),
+        headers: { 'User-Agent': 'node-test' }
+      }),
+      common.mustCall((response) => {
+        assert.strictEqual(response.statusCode, 200);
+        assert.strictEqual(response.statusMessage, 'OK');
+        assert.strictEqual(
+          response.headers['content-type'],
+          'application/json'
+        );
+
+        response.setEncoding('utf8');
+        let raw = '';
+        response.on('data', (chunk) => { raw += chunk; });
+        response.on('end', common.mustCall(() => {
+          const { alpnProtocol, httpVersion, userAgent } = JSON.parse(raw);
+          assert.strictEqual(alpnProtocol, false);
+          assert.strictEqual(httpVersion, '1.1');
+          assert.strictEqual(userAgent, 'node-test');
+
+          server.close();
+        }));
+      })
+    );
+  }));
+}
diff --git a/test/parallel/test-http2-options-server-request.js b/test/parallel/test-http2-options-server-request.js
new file mode 100644
index 00000000000000..2143d379823d51
--- /dev/null
+++ b/test/parallel/test-http2-options-server-request.js
@@ -0,0 +1,40 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+const assert = require('assert');
+const h2 = require('http2');
+
+class MyServerRequest extends h2.Http2ServerRequest {
+  getUserAgent() {
+    return this.headers['user-agent'] || 'unknown';
+  }
+}
+
+const server = h2.createServer({
+  Http2ServerRequest: MyServerRequest
+}, (req, res) => {
+  assert.strictEqual(req.getUserAgent(), 'node-test');
+
+  res.writeHead(200, { 'Content-Type': 'text/plain' });
+  res.end();
+});
+server.listen(0);
+
+server.on('listening', common.mustCall(() => {
+
+  const client = h2.connect(`http://localhost:${server.address().port}`);
+  const req = client.request({
+    ':path': '/',
+    'User-Agent': 'node-test'
+  });
+
+  req.on('response', common.mustCall());
+
+  req.resume();
+  req.on('end', common.mustCall(() => {
+    server.close();
+    client.destroy();
+  }));
+}));
diff --git a/test/parallel/test-http2-options-server-response.js b/test/parallel/test-http2-options-server-response.js
new file mode 100644
index 00000000000000..6f1ae1881d22d8
--- /dev/null
+++ b/test/parallel/test-http2-options-server-response.js
@@ -0,0 +1,34 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+const h2 = require('http2');
+
+class MyServerResponse extends h2.Http2ServerResponse {
+  status(code) {
+    return this.writeHead(code, { 'Content-Type': 'text/plain' });
+  }
+}
+
+const server = h2.createServer({
+  Http2ServerResponse: MyServerResponse
+}, (req, res) => {
+  res.status(200);
+  res.end();
+});
+server.listen(0);
+
+server.on('listening', common.mustCall(() => {
+
+  const client = h2.connect(`http://localhost:${server.address().port}`);
+  const req = client.request({ ':path': '/' });
+
+  req.on('response', common.mustCall());
+
+  req.resume();
+  req.on('end', common.mustCall(() => {
+    server.close();
+    client.destroy();
+  }));
+}));
diff --git a/test/parallel/test-https-server-options-incoming-message.js b/test/parallel/test-https-server-options-incoming-message.js
new file mode 100644
index 00000000000000..102ee56751b800
--- /dev/null
+++ b/test/parallel/test-https-server-options-incoming-message.js
@@ -0,0 +1,51 @@
+'use strict';
+
+/**
+ * This test covers http.Server({ IncomingMessage }) option:
+ * With IncomingMessage option the server should use
+ * the new class for creating req Object instead of the default
+ * http.IncomingMessage.
+ */
+const common = require('../common');
+const fixtures = require('../common/fixtures');
+
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+const http = require('http');
+const https = require('https');
+
+class MyIncomingMessage extends http.IncomingMessage {
+  getUserAgent() {
+    return this.headers['user-agent'] || 'unknown';
+  }
+}
+
+const server = https.createServer({
+  key: fixtures.readKey('agent1-key.pem'),
+  cert: fixtures.readKey('agent1-cert.pem'),
+  ca: fixtures.readKey('ca1-cert.pem'),
+  IncomingMessage: MyIncomingMessage
+}, common.mustCall(function(req, res) {
+  assert.strictEqual(req.getUserAgent(), 'node-test');
+  res.statusCode = 200;
+  res.end();
+}));
+server.listen();
+
+server.on('listening', function makeRequest() {
+  https.get({
+    port: this.address().port,
+    rejectUnauthorized: false,
+    headers: {
+      'User-Agent': 'node-test'
+    }
+  }, (res) => {
+    assert.strictEqual(res.statusCode, 200);
+    res.on('end', () => {
+      server.close();
+    });
+    res.resume();
+  });
+});
diff --git a/test/parallel/test-https-server-options-server-response.js b/test/parallel/test-https-server-options-server-response.js
new file mode 100644
index 00000000000000..8745415f8b6596
--- /dev/null
+++ b/test/parallel/test-https-server-options-server-response.js
@@ -0,0 +1,47 @@
+'use strict';
+
+/**
+ * This test covers http.Server({ ServerResponse }) option:
+ * With ServerResponse option the server should use
+ * the new class for creating res Object instead of the default
+ * http.ServerResponse.
+ */
+const common = require('../common');
+const fixtures = require('../common/fixtures');
+
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+const http = require('http');
+const https = require('https');
+
+class MyServerResponse extends http.ServerResponse {
+  status(code) {
+    return this.writeHead(code, { 'Content-Type': 'text/plain' });
+  }
+}
+
+const server = https.createServer({
+  key: fixtures.readKey('agent1-key.pem'),
+  cert: fixtures.readKey('agent1-cert.pem'),
+  ca: fixtures.readKey('ca1-cert.pem'),
+  ServerResponse: MyServerResponse
+}, common.mustCall(function(req, res) {
+  res.status(200);
+  res.end();
+}));
+server.listen();
+
+server.on('listening', function makeRequest() {
+  https.get({
+    port: this.address().port,
+    rejectUnauthorized: false
+  }, (res) => {
+    assert.strictEqual(res.statusCode, 200);
+    res.on('end', () => {
+      server.close();
+    });
+    res.resume();
+  });
+});
diff --git a/test/parallel/test-net-server-listen-handle.js b/test/parallel/test-net-server-listen-handle.js
index 532674bc7a2819..5bf8451302fae9 100644
--- a/test/parallel/test-net-server-listen-handle.js
+++ b/test/parallel/test-net-server-listen-handle.js
@@ -4,7 +4,7 @@ const common = require('../common');
 const assert = require('assert');
 const net = require('net');
 const fs = require('fs');
-const uv = process.binding('uv');
+const { getSystemErrorName } = require('util');
 const { TCP, constants: TCPConstants } = process.binding('tcp_wrap');
 const { Pipe, constants: PipeConstants } = process.binding('pipe_wrap');
 
@@ -47,9 +47,10 @@ function randomHandle(type) {
     handleName = `pipe ${path}`;
   }
 
-  if (errno < 0) {  // uv.errname requires err < 0
-    assert(errno >= 0, `unable to bind ${handleName}: ${uv.errname(errno)}`);
+  if (errno < 0) {
+    assert.fail(`unable to bind ${handleName}: ${getSystemErrorName(errno)}`);
   }
+
   if (!common.isWindows) {  // fd doesn't work on windows
     // err >= 0 but fd = -1, should not happen
     assert.notStrictEqual(handle.fd, -1,
diff --git a/test/parallel/test-performance-gc.js b/test/parallel/test-performance-gc.js
index 89a9041c1c1159..ec0714ea50034d 100644
--- a/test/parallel/test-performance-gc.js
+++ b/test/parallel/test-performance-gc.js
@@ -51,3 +51,13 @@ const kinds = [
   // Keep the event loop alive to witness the GC async callback happen.
   setImmediate(() => setImmediate(() => 0));
 }
+
+// GC should not keep the event loop alive
+{
+  let didCall = false;
+  process.on('beforeExit', () => {
+    assert(!didCall);
+    didCall = true;
+    global.gc();
+  });
+}
diff --git a/test/parallel/test-postmortem-metadata.js b/test/parallel/test-postmortem-metadata.js
new file mode 100644
index 00000000000000..95d2ff67e1fb1d
--- /dev/null
+++ b/test/parallel/test-postmortem-metadata.js
@@ -0,0 +1,181 @@
+'use strict';
+
+// This test verifies that expected postmortem debugging metadata is present
+// in the Node.js binary. These constants are used by tools such as llnode and
+// mdb_v8, so this test ensures that they don't vanish between V8 updates.
+
+const common = require('../common');
+const assert = require('assert');
+const { spawnSync } = require('child_process');
+const args = [process.execPath];
+
+if (common.isAIX)
+  args.unshift('-Xany', '-B');
+
+const nm = spawnSync('nm', args);
+
+if (nm.error && nm.error.errno === 'ENOENT')
+  common.skip('nm not found on system');
+
+const symbolRe = /\s_?(v8dbg_.+)$/;
+const symbols = nm.stdout.toString().split('\n').reduce((filtered, line) => {
+  const match = line.match(symbolRe);
+  const symbol = match && match[1];
+
+  if (symbol)
+    filtered.push(symbol);
+
+  return filtered;
+}, []);
+const missing = getExpectedSymbols().filter((symbol) => {
+  return !symbols.includes(symbol);
+});
+
+assert.strictEqual(missing.length, 0, `Missing constants: ${missing}`);
+
+// This is only a function so that the long list of expected symbols can be
+// pushed to the bottom of the file for improved readability.
+function getExpectedSymbols() {
+  return [
+    'v8dbg_bit_field3_dictionary_map_shift',
+    'v8dbg_bit_field3_number_of_own_descriptors_shift',
+    'v8dbg_class_Code__instruction_size__int',
+    'v8dbg_class_Code__instruction_start__uintptr_t',
+    'v8dbg_class_ConsString__first__String',
+    'v8dbg_class_ConsString__second__String',
+    'v8dbg_class_FixedArray__data__uintptr_t',
+    'v8dbg_class_FixedArrayBase__length__SMI',
+    'v8dbg_class_FixedTypedArrayBase__base_pointer__Object',
+    'v8dbg_class_FixedTypedArrayBase__external_pointer__Object',
+    'v8dbg_class_HeapNumber__value__double',
+    'v8dbg_class_HeapObject__map__Map',
+    'v8dbg_class_JSArray__length__Object',
+    'v8dbg_class_JSArrayBuffer__backing_store__Object',
+    'v8dbg_class_JSArrayBuffer__byte_length__Object',
+    'v8dbg_class_JSArrayBufferView__buffer__Object',
+    'v8dbg_class_JSArrayBufferView__raw_byte_length__Object',
+    'v8dbg_class_JSArrayBufferView__raw_byte_offset__Object',
+    'v8dbg_class_JSDate__value__Object',
+    'v8dbg_class_JSFunction__context__Context',
+    'v8dbg_class_JSFunction__shared__SharedFunctionInfo',
+    'v8dbg_class_JSObject__elements__Object',
+    'v8dbg_class_JSObject__internal_fields__uintptr_t',
+    'v8dbg_class_JSReceiver__raw_properties_or_hash__Object',
+    'v8dbg_class_JSRegExp__source__Object',
+    'v8dbg_class_Map__bit_field3__int',
+    'v8dbg_class_Map__constructor_or_backpointer__Object',
+    'v8dbg_class_Map__inobject_properties_or_constructor_function_index__int',
+    'v8dbg_class_Map__instance_attributes__int',
+    'v8dbg_class_Map__instance_descriptors__DescriptorArray',
+    'v8dbg_class_Map__instance_size__int',
+    'v8dbg_class_Oddball__kind_offset__int',
+    'v8dbg_class_Script__line_ends__Object',
+    'v8dbg_class_Script__line_offset__SMI',
+    'v8dbg_class_Script__name__Object',
+    'v8dbg_class_Script__source__Object',
+    'v8dbg_class_SeqOneByteString__chars__char',
+    'v8dbg_class_SeqTwoByteString__chars__char',
+    'v8dbg_class_SharedFunctionInfo__code__Code',
+    'v8dbg_class_SharedFunctionInfo__compiler_hints__int',
+    'v8dbg_class_SharedFunctionInfo__end_position__int',
+    'v8dbg_class_SharedFunctionInfo__function_identifier__Object',
+    'v8dbg_class_SharedFunctionInfo__internal_formal_parameter_count__int',
+    'v8dbg_class_SharedFunctionInfo__raw_name__Object',
+    'v8dbg_class_SharedFunctionInfo__scope_info__ScopeInfo',
+    'v8dbg_class_SharedFunctionInfo__script__Object',
+    'v8dbg_class_SharedFunctionInfo__start_position_and_type__int',
+    'v8dbg_class_SlicedString__offset__SMI',
+    'v8dbg_class_SlicedString__parent__String',
+    'v8dbg_class_String__length__SMI',
+    'v8dbg_class_ThinString__actual__String',
+    'v8dbg_context_idx_closure',
+    'v8dbg_context_idx_prev',
+    'v8dbg_context_min_slots',
+    'v8dbg_frametype_ArgumentsAdaptorFrame',
+    'v8dbg_frametype_ConstructEntryFrame',
+    'v8dbg_frametype_ConstructFrame',
+    'v8dbg_frametype_EntryFrame',
+    'v8dbg_frametype_ExitFrame',
+    'v8dbg_frametype_InternalFrame',
+    'v8dbg_frametype_OptimizedFrame',
+    'v8dbg_frametype_StubFrame',
+    'v8dbg_jsarray_buffer_was_neutered_mask',
+    'v8dbg_jsarray_buffer_was_neutered_shift',
+    'v8dbg_namedictionary_prefix_start_index',
+    'v8dbg_namedictionaryshape_entry_size',
+    'v8dbg_namedictionaryshape_prefix_size',
+    'v8dbg_off_fp_args',
+    'v8dbg_off_fp_context',
+    'v8dbg_off_fp_function',
+    'v8dbg_prop_attributes_mask',
+    'v8dbg_prop_attributes_shift',
+    'v8dbg_prop_attributes_DONT_ENUM',
+    'v8dbg_prop_attributes_DONT_ENUM',
+    'v8dbg_prop_attributes_NONE',
+    'v8dbg_prop_attributes_READ_ONLY',
+    'v8dbg_prop_desc_details',
+    'v8dbg_prop_desc_key',
+    'v8dbg_prop_desc_size',
+    'v8dbg_prop_desc_value',
+    'v8dbg_prop_idx_first',
+    'v8dbg_prop_index_mask',
+    'v8dbg_prop_index_shift',
+    'v8dbg_prop_kind_mask',
+    'v8dbg_prop_kind_Accessor',
+    'v8dbg_prop_kind_Data',
+    'v8dbg_prop_location_mask',
+    'v8dbg_prop_location_shift',
+    'v8dbg_prop_location_Descriptor',
+    'v8dbg_prop_location_Field',
+    'v8dbg_prop_representation_double',
+    'v8dbg_prop_representation_mask',
+    'v8dbg_prop_representation_shift',
+    'v8dbg_scopeinfo_idx_first_vars',
+    'v8dbg_scopeinfo_idx_ncontextlocals',
+    'v8dbg_scopeinfo_idx_nparams',
+    'v8dbg_scopeinfo_idx_nstacklocals',
+    'v8dbg_sharedfunctioninfo_start_position_mask',
+    'v8dbg_sharedfunctioninfo_start_position_shift',
+    'v8dbg_type_Code__CODE_TYPE',
+    'v8dbg_type_FixedArray__FIXED_ARRAY_TYPE',
+    'v8dbg_type_HeapNumber__HEAP_NUMBER_TYPE',
+    'v8dbg_type_JSArray__JS_ARRAY_TYPE',
+    'v8dbg_type_JSArrayBuffer__JS_ARRAY_BUFFER_TYPE',
+    'v8dbg_type_JSDate__JS_DATE_TYPE',
+    'v8dbg_type_JSFunction__JS_FUNCTION_TYPE',
+    'v8dbg_type_JSGlobalObject__JS_GLOBAL_OBJECT_TYPE',
+    'v8dbg_type_JSGlobalProxy__JS_GLOBAL_PROXY_TYPE',
+    'v8dbg_type_JSObject__JS_OBJECT_TYPE',
+    'v8dbg_type_JSRegExp__JS_REGEXP_TYPE',
+    'v8dbg_type_JSTypedArray__JS_TYPED_ARRAY_TYPE',
+    'v8dbg_type_Map__MAP_TYPE',
+    'v8dbg_type_Oddball__ODDBALL_TYPE',
+    'v8dbg_type_Script__SCRIPT_TYPE',
+    'v8dbg_type_SharedFunctionInfo__SHARED_FUNCTION_INFO_TYPE',
+    'v8dbg_APIObjectType',
+    'v8dbg_ConsStringTag',
+    'v8dbg_ExternalStringTag',
+    'v8dbg_FirstNonstringType',
+    'v8dbg_HeapObjectTag',
+    'v8dbg_HeapObjectTagMask',
+    'v8dbg_OddballException',
+    'v8dbg_OddballFalse',
+    'v8dbg_OddballNull',
+    'v8dbg_OddballTheHole',
+    'v8dbg_OddballTrue',
+    'v8dbg_OddballUndefined',
+    'v8dbg_OddballUninitialized',
+    'v8dbg_OneByteStringTag',
+    'v8dbg_PointerSizeLog2',
+    'v8dbg_SeqStringTag',
+    'v8dbg_SlicedStringTag',
+    'v8dbg_SmiShiftSize',
+    'v8dbg_SmiTag',
+    'v8dbg_SmiTagMask',
+    'v8dbg_SpecialAPIObjectType',
+    'v8dbg_StringEncodingMask',
+    'v8dbg_StringRepresentationMask',
+    'v8dbg_ThinStringTag',
+    'v8dbg_TwoByteStringTag',
+  ];
+}
diff --git a/test/parallel/test-repl.js b/test/parallel/test-repl.js
index 74db2ba0cd6d7f..9d660607991c24 100644
--- a/test/parallel/test-repl.js
+++ b/test/parallel/test-repl.js
@@ -24,543 +24,748 @@ const common = require('../common');
 const fixtures = require('../common/fixtures');
 const tmpdir = require('../common/tmpdir');
 const assert = require('assert');
+const net = require('net');
+const repl = require('repl');
 
 common.globalCheck = false;
 tmpdir.refresh();
+common.crashOnUnhandledRejection();
 
-const net = require('net');
-const repl = require('repl');
 const message = 'Read, Eval, Print Loop';
 const prompt_unix = 'node via Unix socket> ';
 const prompt_tcp = 'node via TCP socket> ';
-const prompt_multiline = '... ';
-const prompt_npm = 'npm should be run outside of the ' +
-                   'node repl, in your normal shell.\n' +
-                   '(Press Control-D to exit.)\n';
-const expect_npm = prompt_npm + prompt_unix;
-let server_tcp, server_unix, client_tcp, client_unix, replServer;
-
 
 // absolute path to test/fixtures/a.js
 const moduleFilename = fixtures.path('a');
 
-console.error('repl test');
-
 // function for REPL to run
 global.invoke_me = function(arg) {
   return `invoked ${arg}`;
 };
 
-function send_expect(list) {
-  if (list.length > 0) {
-    const cur = list.shift();
 
-    console.error(`sending ${JSON.stringify(cur.send)}`);
+// Helpers for describing the expected output:
+const kArrow = /^ *\^+ *$/;  // Arrow of ^ pointing to syntax error location
+const kSource = Symbol('kSource');  // Placeholder standing for input readback
 
-    cur.client.expect = cur.expect;
-    cur.client.list = list;
-    if (cur.send.length > 0) {
-      cur.client.write(`${cur.send}\n`);
-    }
-  }
-}
+async function runReplTests(socket, prompt, tests) {
+  let lineBuffer = '';
 
-function clean_up() {
-  client_tcp.end();
-  client_unix.end();
-}
+  for (const { send, expect } of tests) {
+    // expect can be a single line or multiple lines
+    const expectedLines = Array.isArray(expect) ? expect : [ expect ];
 
-function strict_mode_error_test() {
-  send_expect([
-    { client: client_unix, send: 'ref = 1',
-      expect: /^ReferenceError:\sref\sis\snot\sdefined\nnode via Unix socket> $/ },
-  ]);
-}
+    console.error('out:', JSON.stringify(send));
+    socket.write(`${send}\n`);
 
-function error_test() {
-  // The other stuff is done so reuse unix socket
-  let read_buffer = '';
-  let run_strict_test = true;
-  client_unix.removeAllListeners('data');
-
-  client_unix.on('data', function(data) {
-    read_buffer += data.toString('ascii', 0, data.length);
-    console.error(
-      `Unix data: ${JSON.stringify(read_buffer)}, expecting ${
-        client_unix.expect.exec ?
-          client_unix.expect :
-          JSON.stringify(client_unix.expect)}`);
-
-    if (read_buffer.includes(prompt_unix)) {
-      // if it's an exact match, then don't do the regexp
-      if (read_buffer !== client_unix.expect) {
-        let expect = client_unix.expect;
-        if (expect === prompt_multiline)
-          expect = /[.]{3} /;
-        assert.ok(RegExp(expect).test(read_buffer));
-        console.error('match');
-      }
-      read_buffer = '';
-      if (client_unix.list && client_unix.list.length > 0) {
-        send_expect(client_unix.list);
-      } else if (run_strict_test) {
-        replServer.replMode = repl.REPL_MODE_STRICT;
-        run_strict_test = false;
-        strict_mode_error_test();
-      } else {
-        console.error('End of Error test, running TCP test.');
-        tcp_test();
+    for (let expectedLine of expectedLines) {
+      // special value: kSource refers to last sent source text
+      if (expectedLine === kSource)
+        expectedLine = send;
+
+      while (!lineBuffer.includes('\n')) {
+        lineBuffer += await event(socket, 'data');
+
+        // Cut away the initial prompt
+        while (lineBuffer.startsWith(prompt))
+          lineBuffer = lineBuffer.substr(prompt.length);
+
+        // Allow to match partial text if no newline was received, because
+        // sending newlines from the REPL itself would be redundant
+        // (e.g. in the `... ` multiline prompt: The user already pressed
+        // enter for that, so the REPL shouldn't do it again!).
+        if (lineBuffer === expectedLine && !expectedLine.includes('\n'))
+          lineBuffer += '\n';
       }
 
-    } else if (read_buffer.includes(prompt_multiline)) {
-      // Check that you meant to send a multiline test
-      assert.strictEqual(prompt_multiline, client_unix.expect);
-      read_buffer = '';
-      if (client_unix.list && client_unix.list.length > 0) {
-        send_expect(client_unix.list);
-      } else if (run_strict_test) {
-        replServer.replMode = repl.REPL_MODE_STRICT;
-        run_strict_test = false;
-        strict_mode_error_test();
+      // Split off the current line.
+      const newlineOffset = lineBuffer.indexOf('\n');
+      let actualLine = lineBuffer.substr(0, newlineOffset);
+      lineBuffer = lineBuffer.substr(newlineOffset + 1);
+
+      // This might have been skipped in the loop above because the buffer
+      // already contained a \n to begin with and the entire loop was skipped.
+      while (actualLine.startsWith(prompt))
+        actualLine = actualLine.substr(prompt.length);
+
+      console.error('in:', JSON.stringify(actualLine));
+
+      // Match a string directly, or a RegExp through .test().
+      if (typeof expectedLine === 'string') {
+        assert.strictEqual(actualLine, expectedLine);
       } else {
-        console.error('End of Error test, running TCP test.\n');
-        tcp_test();
+        assert(expectedLine.test(actualLine),
+               `${actualLine} match ${expectedLine}`);
       }
-
-    } else {
-      console.error('didn\'t see prompt yet, buffering.');
     }
-  });
+  }
 
-  send_expect([
-    // Uncaught error throws and prints out
-    { client: client_unix, send: 'throw new Error(\'test error\');',
-      expect: /^Error: test error/ },
-    // Common syntax error is treated as multiline command
-    { client: client_unix, send: 'function test_func() {',
-      expect: prompt_multiline },
-    // You can recover with the .break command
-    { client: client_unix, send: '.break',
-      expect: prompt_unix },
-    // But passing the same string to eval() should throw
-    { client: client_unix, send: 'eval("function test_func() {")',
-      expect: /^SyntaxError: Unexpected end of input/ },
-    // Can handle multiline template literals
-    { client: client_unix, send: '`io.js',
-      expect: prompt_multiline },
-    // Special REPL commands still available
-    { client: client_unix, send: '.break',
-      expect: prompt_unix },
-    // Template expressions can cross lines
-    { client: client_unix, send: '`io.js ${"1.0"',
-      expect: prompt_multiline },
-    { client: client_unix, send: '+ ".2"}`',
-      expect: `'io.js 1.0.2'\n${prompt_unix}` },
-    // Dot prefix in multiline commands aren't treated as commands
-    { client: client_unix, send: '("a"',
-      expect: prompt_multiline },
-    { client: client_unix, send: '.charAt(0))',
-      expect: `'a'\n${prompt_unix}` },
-    // Floating point numbers are not interpreted as REPL commands.
-    { client: client_unix, send: '.1234',
-      expect: '0.1234' },
-    // Floating point expressions are not interpreted as REPL commands
-    { client: client_unix, send: '.1+.1',
-      expect: '0.2' },
-    // Can parse valid JSON
-    { client: client_unix, send: 'JSON.parse(\'{"valid": "json"}\');',
-      expect: '{ valid: \'json\' }' },
-    // invalid input to JSON.parse error is special case of syntax error,
-    // should throw
-    { client: client_unix, send: 'JSON.parse(\'{invalid: \\\'json\\\'}\');',
-      expect: /^SyntaxError: Unexpected token i/ },
-    // end of input to JSON.parse error is special case of syntax error,
-    // should throw
-    { client: client_unix, send: 'JSON.parse(\'066\');',
-      expect: /^SyntaxError: Unexpected number/ },
-    // should throw
-    { client: client_unix, send: 'JSON.parse(\'{\');',
-      expect: /^SyntaxError: Unexpected end of JSON input/ },
-    // invalid RegExps are a special case of syntax error,
-    // should throw
-    { client: client_unix, send: '/(/;',
-      expect: /^SyntaxError: Invalid regular expression:/ },
-    // invalid RegExp modifiers are a special case of syntax error,
-    // should throw (GH-4012)
-    { client: client_unix, send: 'new RegExp("foo", "wrong modifier");',
-      expect: /^SyntaxError: Invalid flags supplied to RegExp constructor/ },
-    // strict mode syntax errors should be caught (GH-5178)
-    { client: client_unix,
-      send: '(function() { "use strict"; return 0755; })()',
-      expect: /\bSyntaxError: Octal literals are not allowed in strict mode/ },
-    {
-      client: client_unix,
-      send: '(function(a, a, b) { "use strict"; return a + b + c; })()',
-      expect:
-        /\bSyntaxError: Duplicate parameter name not allowed in this context/
-    },
-    {
-      client: client_unix,
-      send: '(function() { "use strict"; with (this) {} })()',
-      expect: /\bSyntaxError: Strict mode code may not include a with statement/
-    },
-    {
-      client: client_unix,
-      send: '(function() { "use strict"; var x; delete x; })()',
-      expect:
-        /\bSyntaxError: Delete of an unqualified identifier in strict mode/
-    },
-    { client: client_unix,
-      send: '(function() { "use strict"; eval = 17; })()',
-      expect: /\bSyntaxError: Unexpected eval or arguments in strict mode/ },
-    {
-      client: client_unix,
-      send: '(function() { "use strict"; if (true) function f() { } })()',
-      expect:
-        /\bSyntaxError: In strict mode code, functions can only be declared at top level or inside a block\./
-    },
-    // Named functions can be used:
-    { client: client_unix, send: 'function blah() { return 1; }',
-      expect: prompt_unix },
-    { client: client_unix, send: 'blah()',
-      expect: `1\n${prompt_unix}` },
-    // Functions should not evaluate twice (#2773)
-    { client: client_unix, send: 'var I = [1,2,3,function() {}]; I.pop()',
-      expect: '[Function]' },
-    // Multiline object
-    { client: client_unix, send: '{ a: ',
-      expect: prompt_multiline },
-    { client: client_unix, send: '1 }',
-      expect: '{ a: 1 }' },
-    // Multiline anonymous function with comment
-    { client: client_unix, send: '(function() {',
-      expect: prompt_multiline },
-    { client: client_unix, send: '// blah',
-      expect: prompt_multiline },
-    { client: client_unix, send: 'return 1;',
-      expect: prompt_multiline },
-    { client: client_unix, send: '})()',
-      expect: '1' },
-    // Multiline function call
-    { client: client_unix, send: 'function f(){}; f(f(1,',
-      expect: prompt_multiline },
-    { client: client_unix, send: '2)',
-      expect: prompt_multiline },
-    { client: client_unix, send: ')',
-      expect: `undefined\n${prompt_unix}` },
-    // npm prompt error message
-    { client: client_unix, send: 'npm install foobar',
-      expect: expect_npm },
-    { client: client_unix, send: '(function() {\n\nreturn 1;\n})()',
-      expect: '1' },
-    { client: client_unix, send: '{\n\na: 1\n}',
-      expect: '{ a: 1 }' },
-    { client: client_unix, send: 'url.format("http://google.com")',
-      expect: 'http://google.com/' },
-    { client: client_unix, send: 'var path = 42; path',
-      expect: '42' },
-    // this makes sure that we don't print `undefined` when we actually print
-    // the error message
-    { client: client_unix, send: '.invalid_repl_command',
-      expect: `Invalid REPL keyword\n${prompt_unix}` },
-    // this makes sure that we don't crash when we use an inherited property as
-    // a REPL command
-    { client: client_unix, send: '.toString',
-      expect: `Invalid REPL keyword\n${prompt_unix}` },
-    // fail when we are not inside a String and a line continuation is used
-    { client: client_unix, send: '[] \\',
-      expect: /\bSyntaxError: Invalid or unexpected token/ },
-    // do not fail when a String is created with line continuation
-    { client: client_unix, send: '\'the\\\nfourth\\\neye\'',
-      expect: `${prompt_multiline}${prompt_multiline}'thefourtheye'\n${
-        prompt_unix}` },
-    // Don't fail when a partial String is created and line continuation is used
-    // with whitespace characters at the end of the string. We are to ignore it.
-    // This test is to make sure that we properly remove the whitespace
-    // characters at the end of line, unlike the buggy `trimWhitespace` function
-    { client: client_unix, send: '  \t    .break  \t  ',
-      expect: prompt_unix },
-    // multiline strings preserve whitespace characters in them
-    { client: client_unix, send: '\'the \\\n   fourth\t\t\\\n  eye  \'',
-      expect: `${prompt_multiline}${
-        prompt_multiline}'the    fourth\\t\\t  eye  '\n${prompt_unix}` },
-    // more than one multiline strings also should preserve whitespace chars
-    { client: client_unix, send: '\'the \\\n   fourth\' +  \'\t\t\\\n  eye  \'',
-      expect: `${prompt_multiline}${
-        prompt_multiline}'the    fourth\\t\\t  eye  '\n${prompt_unix}` },
-    // using REPL commands within a string literal should still work
-    { client: client_unix, send: '\'\\\n.break',
-      expect: prompt_unix },
-    // using REPL command "help" within a string literal should still work
-    { client: client_unix, send: '\'thefourth\\\n.help\neye\'',
-      expect: /'thefourtheye'/ },
-    // empty lines in the REPL should be allowed
-    { client: client_unix, send: '\n\r\n\r\n',
-      expect: prompt_unix + prompt_unix + prompt_unix },
-    // empty lines in the string literals should not affect the string
-    { client: client_unix, send: '\'the\\\n\\\nfourtheye\'\n',
-      expect: `${prompt_multiline}${
-        prompt_multiline}'thefourtheye'\n${prompt_unix}` },
-    // Regression test for https://github.com/nodejs/node/issues/597
-    { client: client_unix,
-      send: '/(.)(.)(.)(.)(.)(.)(.)(.)(.)/.test(\'123456789\')\n',
-      expect: `true\n${prompt_unix}` },
-    // the following test's result depends on the RegExp's match from the above
-    { client: client_unix,
-      send: 'RegExp.$1\nRegExp.$2\nRegExp.$3\nRegExp.$4\nRegExp.$5\n' +
-            'RegExp.$6\nRegExp.$7\nRegExp.$8\nRegExp.$9\n',
-      expect: ['\'1\'\n', '\'2\'\n', '\'3\'\n', '\'4\'\n', '\'5\'\n', '\'6\'\n',
-               '\'7\'\n', '\'8\'\n', '\'9\'\n'].join(`${prompt_unix}`) },
-    // regression tests for https://github.com/nodejs/node/issues/2749
-    { client: client_unix, send: 'function x() {\nreturn \'\\n\';\n }',
-      expect: `${prompt_multiline}${prompt_multiline}undefined\n${
-        prompt_unix}` },
-    { client: client_unix, send: 'function x() {\nreturn \'\\\\\';\n }',
-      expect: `${prompt_multiline}${prompt_multiline}undefined\n${
-        prompt_unix}` },
-    // regression tests for https://github.com/nodejs/node/issues/3421
-    { client: client_unix, send: 'function x() {\n//\'\n }',
-      expect: `${prompt_multiline}${prompt_multiline}undefined\n${
-        prompt_unix}` },
-    { client: client_unix, send: 'function x() {\n//"\n }',
-      expect: `${prompt_multiline}${prompt_multiline}undefined\n${
-        prompt_unix}` },
-    { client: client_unix, send: 'function x() {//\'\n }',
-      expect: `${prompt_multiline}undefined\n${prompt_unix}` },
-    { client: client_unix, send: 'function x() {//"\n }',
-      expect: `${prompt_multiline}undefined\n${prompt_unix}` },
-    { client: client_unix, send: 'function x() {\nvar i = "\'";\n }',
-      expect: `${prompt_multiline}${prompt_multiline}undefined\n${
-        prompt_unix}` },
-    { client: client_unix, send: 'function x(/*optional*/) {}',
-      expect: `undefined\n${prompt_unix}` },
-    { client: client_unix, send: 'function x(/* // 5 */) {}',
-      expect: `undefined\n${prompt_unix}` },
-    { client: client_unix, send: '// /* 5 */',
-      expect: `undefined\n${prompt_unix}` },
-    { client: client_unix, send: '"//"',
-      expect: `'//'\n${prompt_unix}` },
-    { client: client_unix, send: '"data /*with*/ comment"',
-      expect: `'data /*with*/ comment'\n${prompt_unix}` },
-    { client: client_unix, send: 'function x(/*fn\'s optional params*/) {}',
-      expect: `undefined\n${prompt_unix}` },
-    { client: client_unix, send: '/* \'\n"\n\'"\'\n*/',
-      expect: `undefined\n${prompt_unix}` },
-    // REPL should get a normal require() function, not one that allows
-    // access to internal modules without the --expose_internals flag.
-    { client: client_unix, send: 'require("internal/repl")',
-      expect: /^Error: Cannot find module 'internal\/repl'/ },
-    // REPL should handle quotes within regexp literal in multiline mode
-    { client: client_unix,
-      send: "function x(s) {\nreturn s.replace(/'/,'');\n}",
-      expect: `${prompt_multiline}${prompt_multiline}` +
-            `undefined\n${prompt_unix}` },
-    { client: client_unix,
-      send: "function x(s) {\nreturn s.replace(/'/,'');\n}",
-      expect: `${prompt_multiline}${prompt_multiline}` +
-            `undefined\n${prompt_unix}` },
-    { client: client_unix,
-      send: 'function x(s) {\nreturn s.replace(/"/,"");\n}',
-      expect: `${prompt_multiline}${prompt_multiline}` +
-            `undefined\n${prompt_unix}` },
-    { client: client_unix,
-      send: 'function x(s) {\nreturn s.replace(/.*/,"");\n}',
-      expect: `${prompt_multiline}${prompt_multiline}` +
-            `undefined\n${prompt_unix}` },
-    { client: client_unix, send: '{ var x = 4; }',
-      expect: `undefined\n${prompt_unix}` },
-    // Illegal token is not recoverable outside string literal, RegExp literal,
-    // or block comment. https://github.com/nodejs/node/issues/3611
-    { client: client_unix, send: 'a = 3.5e',
-      expect: /\bSyntaxError: Invalid or unexpected token/ },
-    // Mitigate https://github.com/nodejs/node/issues/548
-    { client: client_unix, send: 'function name(){ return "node"; };name()',
-      expect: `'node'\n${prompt_unix}` },
-    { client: client_unix, send: 'function name(){ return "nodejs"; };name()',
-      expect: `'nodejs'\n${prompt_unix}` },
-    // Avoid emitting repl:line-number for SyntaxError
-    { client: client_unix, send: 'a = 3.5e',
-      expect: /^(?!repl)/ },
-    // Avoid emitting stack trace
-    { client: client_unix, send: 'a = 3.5e',
-      expect: /^(?!\s+at\s)/m },
-
-    // https://github.com/nodejs/node/issues/9850
-    { client: client_unix, send: 'function* foo() {}; foo().next();',
-      expect: '{ value: undefined, done: true }' },
-
-    { client: client_unix, send: 'function *foo() {}; foo().next();',
-      expect: '{ value: undefined, done: true }' },
-
-    { client: client_unix, send: 'function*foo() {}; foo().next();',
-      expect: '{ value: undefined, done: true }' },
-
-    { client: client_unix, send: 'function * foo() {}; foo().next()',
-      expect: '{ value: undefined, done: true }' },
-
-    // https://github.com/nodejs/node/issues/9300
-    {
-      client: client_unix, send: 'function foo() {\nvar bar = 1 / 1; // "/"\n}',
-      expect: `${prompt_multiline}${prompt_multiline}undefined\n${prompt_unix}`
-    },
-
-    {
-      client: client_unix, send: '(function() {\nreturn /foo/ / /bar/;\n}())',
-      expect: `${prompt_multiline}${prompt_multiline}NaN\n${prompt_unix}`
-    },
-
-    {
-      client: client_unix, send: '(function() {\nif (false) {} /bar"/;\n}())',
-      expect: `${prompt_multiline}${prompt_multiline}undefined\n${prompt_unix}`
-    },
-
-    // Newline within template string maintains whitespace.
-    { client: client_unix, send: '`foo \n`',
-      expect: `${prompt_multiline}'foo \\n'\n${prompt_unix}` },
-    // Whitespace is not evaluated.
-    { client: client_unix, send: ' \t  \n',
-      expect: prompt_unix },
-    // Do not parse `...[]` as a REPL keyword
-    { client: client_unix, send: '...[]\n',
-      expect: `${prompt_multiline}` },
-    // bring back the repl to prompt
-    { client: client_unix, send: '.break',
-      expect: `${prompt_unix}` }
-  ]);
+  const remainder = socket.read();
+  assert(remainder === '' || remainder === null);
 }
 
-function tcp_test() {
-  server_tcp = net.createServer(function(socket) {
-    assert.strictEqual(server_tcp, socket.server);
+const unixTests = [
+  {
+    send: '',
+    expect: ''
+  },
+  {
+    send: 'message',
+    expect: `'${message}'`
+  },
+  {
+    send: 'invoke_me(987)',
+    expect: '\'invoked 987\''
+  },
+  {
+    send: 'a = 12345',
+    expect: '12345'
+  },
+  {
+    send: '{a:1}',
+    expect: '{ a: 1 }'
+  }
+];
+
+const strictModeTests = [
+  {
+    send: 'ref = 1',
+    expect: /^ReferenceError:\s/
+  }
+];
+
+const errorTests = [
+  // Uncaught error throws and prints out
+  {
+    send: 'throw new Error(\'test error\');',
+    expect: /^Error: test error/
+  },
+  // Common syntax error is treated as multiline command
+  {
+    send: 'function test_func() {',
+    expect: '... '
+  },
+  // You can recover with the .break command
+  {
+    send: '.break',
+    expect: ''
+  },
+  // But passing the same string to eval() should throw
+  {
+    send: 'eval("function test_func() {")',
+    expect: /^SyntaxError: /
+  },
+  // Can handle multiline template literals
+  {
+    send: '`io.js',
+    expect: '... '
+  },
+  // Special REPL commands still available
+  {
+    send: '.break',
+    expect: ''
+  },
+  // Template expressions can cross lines
+  {
+    send: '`io.js ${"1.0"',
+    expect: '... '
+  },
+  {
+    send: '+ ".2"}`',
+    expect: '\'io.js 1.0.2\''
+  },
+  // Dot prefix in multiline commands aren't treated as commands
+  {
+    send: '("a"',
+    expect: '... '
+  },
+  {
+    send: '.charAt(0))',
+    expect: '\'a\''
+  },
+  // Floating point numbers are not interpreted as REPL commands.
+  {
+    send: '.1234',
+    expect: '0.1234'
+  },
+  // Floating point expressions are not interpreted as REPL commands
+  {
+    send: '.1+.1',
+    expect: '0.2'
+  },
+  // Can parse valid JSON
+  {
+    send: 'JSON.parse(\'{"valid": "json"}\');',
+    expect: '{ valid: \'json\' }'
+  },
+  // invalid input to JSON.parse error is special case of syntax error,
+  // should throw
+  {
+    send: 'JSON.parse(\'{invalid: \\\'json\\\'}\');',
+    expect: [/^SyntaxError: /, '']
+  },
+  // end of input to JSON.parse error is special case of syntax error,
+  // should throw
+  {
+    send: 'JSON.parse(\'066\');',
+    expect: [/^SyntaxError: /, '']
+  },
+  // should throw
+  {
+    send: 'JSON.parse(\'{\');',
+    expect: [/^SyntaxError: /, '']
+  },
+  // invalid RegExps are a special case of syntax error,
+  // should throw
+  {
+    send: '/(/;',
+    expect: /^SyntaxError: /
+  },
+  // invalid RegExp modifiers are a special case of syntax error,
+  // should throw (GH-4012)
+  {
+    send: 'new RegExp("foo", "wrong modifier");',
+    expect: [/^SyntaxError: /, '']
+  },
+  // strict mode syntax errors should be caught (GH-5178)
+  {
+    send: '(function() { "use strict"; return 0755; })()',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      /^SyntaxError: /,
+      ''
+    ]
+  },
+  {
+    send: '(function(a, a, b) { "use strict"; return a + b + c; })()',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      /^SyntaxError: /,
+      ''
+    ]
+  },
+  {
+    send: '(function() { "use strict"; with (this) {} })()',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      /^SyntaxError: /,
+      ''
+    ]
+  },
+  {
+    send: '(function() { "use strict"; var x; delete x; })()',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      /^SyntaxError: /,
+      ''
+    ]
+  },
+  {
+    send: '(function() { "use strict"; eval = 17; })()',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      /^SyntaxError: /,
+      ''
+    ]
+  },
+  {
+    send: '(function() { "use strict"; if (true) function f() { } })()',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      /^SyntaxError: /,
+      ''
+    ]
+  },
+  // Named functions can be used:
+  {
+    send: 'function blah() { return 1; }',
+    expect: 'undefined'
+  },
+  {
+    send: 'blah()',
+    expect: '1'
+  },
+  // Functions should not evaluate twice (#2773)
+  {
+    send: 'var I = [1,2,3,function() {}]; I.pop()',
+    expect: '[Function]'
+  },
+  // Multiline object
+  {
+    send: '{ a: ',
+    expect: '... '
+  },
+  {
+    send: '1 }',
+    expect: '{ a: 1 }'
+  },
+  // Multiline anonymous function with comment
+  {
+    send: '(function() {',
+    expect: '... '
+  },
+  {
+    send: '// blah',
+    expect: '... '
+  },
+  {
+    send: 'return 1;',
+    expect: '... '
+  },
+  {
+    send: '})()',
+    expect: '1'
+  },
+  // Multiline function call
+  {
+    send: 'function f(){}; f(f(1,',
+    expect: '... '
+  },
+  {
+    send: '2)',
+    expect: '... '
+  },
+  {
+    send: ')',
+    expect: 'undefined'
+  },
+  // npm prompt error message
+  {
+    send: 'npm install foobar',
+    expect: [
+      'npm should be run outside of the node repl, in your normal shell.',
+      '(Press Control-D to exit.)'
+    ]
+  },
+  {
+    send: '(function() {\n\nreturn 1;\n})()',
+    expect: '... ... ... 1'
+  },
+  {
+    send: '{\n\na: 1\n}',
+    expect: '... ... ... { a: 1 }'
+  },
+  {
+    send: 'url.format("http://google.com")',
+    expect: '\'http://google.com/\''
+  },
+  {
+    send: 'var path = 42; path',
+    expect: '42'
+  },
+  // this makes sure that we don't print `undefined` when we actually print
+  // the error message
+  {
+    send: '.invalid_repl_command',
+    expect: 'Invalid REPL keyword'
+  },
+  // this makes sure that we don't crash when we use an inherited property as
+  // a REPL command
+  {
+    send: '.toString',
+    expect: 'Invalid REPL keyword'
+  },
+  // fail when we are not inside a String and a line continuation is used
+  {
+    send: '[] \\',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      /^SyntaxError: /,
+      ''
+    ]
+  },
+  // do not fail when a String is created with line continuation
+  {
+    send: '\'the\\\nfourth\\\neye\'',
+    expect: ['... ... \'thefourtheye\'']
+  },
+  // Don't fail when a partial String is created and line continuation is used
+  // with whitespace characters at the end of the string. We are to ignore it.
+  // This test is to make sure that we properly remove the whitespace
+  // characters at the end of line, unlike the buggy `trimWhitespace` function
+  {
+    send: '  \t    .break  \t  ',
+    expect: ''
+  },
+  // multiline strings preserve whitespace characters in them
+  {
+    send: '\'the \\\n   fourth\t\t\\\n  eye  \'',
+    expect: '... ... \'the    fourth\\t\\t  eye  \''
+  },
+  // more than one multiline strings also should preserve whitespace chars
+  {
+    send: '\'the \\\n   fourth\' +  \'\t\t\\\n  eye  \'',
+    expect: '... ... \'the    fourth\\t\\t  eye  \''
+  },
+  // using REPL commands within a string literal should still work
+  {
+    send: '\'\\\n.break',
+    expect: '... ' + prompt_unix
+  },
+  // using REPL command "help" within a string literal should still work
+  {
+    send: '\'thefourth\\\n.help\neye\'',
+    expect: [
+      /\.break/,
+      /\.clear/,
+      /\.editor/,
+      /\.exit/,
+      /\.help/,
+      /\.load/,
+      /\.save/,
+      /'thefourtheye'/
+    ]
+  },
+  // empty lines in the REPL should be allowed
+  {
+    send: '\n\r\n\r\n',
+    expect: ''
+  },
+  // empty lines in the string literals should not affect the string
+  {
+    send: '\'the\\\n\\\nfourtheye\'\n',
+    expect: '... ... \'thefourtheye\''
+  },
+  // Regression test for https://github.com/nodejs/node/issues/597
+  {
+    send: '/(.)(.)(.)(.)(.)(.)(.)(.)(.)/.test(\'123456789\')\n',
+    expect: 'true'
+  },
+  // the following test's result depends on the RegEx's match from the above
+  {
+    send: 'RegExp.$1\nRegExp.$2\nRegExp.$3\nRegExp.$4\nRegExp.$5\n' +
+          'RegExp.$6\nRegExp.$7\nRegExp.$8\nRegExp.$9\n',
+    expect: ['\'1\'', '\'2\'', '\'3\'', '\'4\'', '\'5\'', '\'6\'',
+             '\'7\'', '\'8\'', '\'9\'']
+  },
+  // regression tests for https://github.com/nodejs/node/issues/2749
+  {
+    send: 'function x() {\nreturn \'\\n\';\n }',
+    expect: '... ... undefined'
+  },
+  {
+    send: 'function x() {\nreturn \'\\\\\';\n }',
+    expect: '... ... undefined'
+  },
+  // regression tests for https://github.com/nodejs/node/issues/3421
+  {
+    send: 'function x() {\n//\'\n }',
+    expect: '... ... undefined'
+  },
+  {
+    send: 'function x() {\n//"\n }',
+    expect: '... ... undefined'
+  },
+  {
+    send: 'function x() {//\'\n }',
+    expect: '... undefined'
+  },
+  {
+    send: 'function x() {//"\n }',
+    expect: '... undefined'
+  },
+  {
+    send: 'function x() {\nvar i = "\'";\n }',
+    expect: '... ... undefined'
+  },
+  {
+    send: 'function x(/*optional*/) {}',
+    expect: 'undefined'
+  },
+  {
+    send: 'function x(/* // 5 */) {}',
+    expect: 'undefined'
+  },
+  {
+    send: '// /* 5 */',
+    expect: 'undefined'
+  },
+  {
+    send: '"//"',
+    expect: '\'//\''
+  },
+  {
+    send: '"data /*with*/ comment"',
+    expect: '\'data /*with*/ comment\''
+  },
+  {
+    send: 'function x(/*fn\'s optional params*/) {}',
+    expect: 'undefined'
+  },
+  {
+    send: '/* \'\n"\n\'"\'\n*/',
+    expect: '... ... ... undefined'
+  },
+  // REPL should get a normal require() function, not one that allows
+  // access to internal modules without the --expose_internals flag.
+  {
+    send: 'require("internal/repl")',
+    expect: [
+      /^Error: Cannot find module 'internal\/repl'/,
+      /^    at .*/,
+      /^    at .*/,
+      /^    at .*/,
+      /^    at .*/
+    ]
+  },
+  // REPL should handle quotes within regexp literal in multiline mode
+  {
+    send: "function x(s) {\nreturn s.replace(/'/,'');\n}",
+    expect: '... ... undefined'
+  },
+  {
+    send: "function x(s) {\nreturn s.replace(/'/,'');\n}",
+    expect: '... ... undefined'
+  },
+  {
+    send: 'function x(s) {\nreturn s.replace(/"/,"");\n}',
+    expect: '... ... undefined'
+  },
+  {
+    send: 'function x(s) {\nreturn s.replace(/.*/,"");\n}',
+    expect: '... ... undefined'
+  },
+  {
+    send: '{ var x = 4; }',
+    expect: 'undefined'
+  },
+  // Illegal token is not recoverable outside string literal, RegExp literal,
+  // or block comment. https://github.com/nodejs/node/issues/3611
+  {
+    send: 'a = 3.5e',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      /^SyntaxError: /,
+      ''
+    ]
+  },
+  // Mitigate https://github.com/nodejs/node/issues/548
+  {
+    send: 'function name(){ return "node"; };name()',
+    expect: '\'node\''
+  },
+  {
+    send: 'function name(){ return "nodejs"; };name()',
+    expect: '\'nodejs\''
+  },
+  // Avoid emitting repl:line-number for SyntaxError
+  {
+    send: 'a = 3.5e',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      /^SyntaxError: /,
+      ''
+    ]
+  },
+  // Avoid emitting stack trace
+  {
+    send: 'a = 3.5e',
+    expect: [
+      kSource,
+      kArrow,
+      '',
+      /^SyntaxError: /,
+      ''
+    ]
+  },
+
+  // https://github.com/nodejs/node/issues/9850
+  {
+    send: 'function* foo() {}; foo().next();',
+    expect: '{ value: undefined, done: true }'
+  },
+
+  {
+    send: 'function *foo() {}; foo().next();',
+    expect: '{ value: undefined, done: true }'
+  },
+
+  {
+    send: 'function*foo() {}; foo().next();',
+    expect: '{ value: undefined, done: true }'
+  },
+
+  {
+    send: 'function * foo() {}; foo().next()',
+    expect: '{ value: undefined, done: true }'
+  },
+
+  // https://github.com/nodejs/node/issues/9300
+  {
+    send: 'function foo() {\nvar bar = 1 / 1; // "/"\n}',
+    expect: '... ... undefined'
+  },
+
+  {
+    send: '(function() {\nreturn /foo/ / /bar/;\n}())',
+    expect: '... ... NaN'
+  },
+
+  {
+    send: '(function() {\nif (false) {} /bar"/;\n}())',
+    expect: '... ... undefined'
+  },
+
+  // Newline within template string maintains whitespace.
+  {
+    send: '`foo \n`',
+    expect: '... \'foo \\n\''
+  },
+  // Whitespace is not evaluated.
+  {
+    send: ' \t  \n',
+    expect: 'undefined'
+  },
+  // Do not parse `...[]` as a REPL keyword
+  {
+    send: '...[]\n',
+    expect: '... ... '
+  },
+  // bring back the repl to prompt
+  {
+    send: '.break',
+    expect: ''
+  }
+];
+
+const tcpTests = [
+  {
+    send: '',
+    expect: ''
+  },
+  {
+    send: 'invoke_me(333)',
+    expect: '\'invoked 333\''
+  },
+  {
+    send: 'a += 1',
+    expect: '12346'
+  },
+  {
+    send: `require(${JSON.stringify(moduleFilename)}).number`,
+    expect: '42'
+  }
+];
+
+(async function() {
+  {
+    const [ socket, replServer ] = await startUnixRepl();
 
-    socket.on('end', function() {
+    await runReplTests(socket, prompt_unix, unixTests);
+    await runReplTests(socket, prompt_unix, errorTests);
+    replServer.replMode = repl.REPL_MODE_STRICT;
+    await runReplTests(socket, prompt_unix, strictModeTests);
+
+    socket.end();
+  }
+  {
+    const [ socket ] = await startTCPRepl();
+
+    await runReplTests(socket, prompt_tcp, tcpTests);
+
+    socket.end();
+  }
+})();
+
+function startTCPRepl() {
+  let resolveSocket, resolveReplServer;
+
+  const server = net.createServer(common.mustCall((socket) => {
+    assert.strictEqual(server, socket.server);
+
+    socket.on('end', common.mustCall(() => {
       socket.end();
-    });
+    }));
 
-    repl.start(prompt_tcp, socket);
-  });
+    resolveReplServer(repl.start(prompt_tcp, socket));
+  }));
 
-  server_tcp.listen(0, function() {
-    let read_buffer = '';
-
-    client_tcp = net.createConnection(this.address().port);
-
-    client_tcp.on('connect', function() {
-      assert.strictEqual(true, client_tcp.readable);
-      assert.strictEqual(true, client_tcp.writable);
-
-      send_expect([
-        { client: client_tcp, send: '',
-          expect: prompt_tcp },
-        { client: client_tcp, send: 'invoke_me(333)',
-          expect: (`'invoked 333'\n${prompt_tcp}`) },
-        { client: client_tcp, send: 'a += 1',
-          expect: (`12346\n${prompt_tcp}`) },
-        { client: client_tcp,
-          send: `require(${JSON.stringify(moduleFilename)}).number`,
-          expect: (`42\n${prompt_tcp}`) }
-      ]);
-    });
+  server.listen(0, common.mustCall(() => {
+    const client = net.createConnection(server.address().port);
 
-    client_tcp.on('data', function(data) {
-      read_buffer += data.toString('ascii', 0, data.length);
-      console.error(`TCP data: ${JSON.stringify(read_buffer)}, expecting ${
-        JSON.stringify(client_tcp.expect)}`);
-      if (read_buffer.includes(prompt_tcp)) {
-        assert.strictEqual(client_tcp.expect, read_buffer);
-        console.error('match');
-        read_buffer = '';
-        if (client_tcp.list && client_tcp.list.length > 0) {
-          send_expect(client_tcp.list);
-        } else {
-          console.error('End of TCP test.\n');
-          clean_up();
-        }
-      } else {
-        console.error('didn\'t see prompt yet, buffering');
-      }
-    });
+    client.setEncoding('utf8');
 
-    client_tcp.on('error', function(e) {
-      throw e;
-    });
+    client.on('connect', common.mustCall(() => {
+      assert.strictEqual(true, client.readable);
+      assert.strictEqual(true, client.writable);
 
-    client_tcp.on('close', function() {
-      server_tcp.close();
-    });
-  });
+      resolveSocket(client);
+    }));
+
+    client.on('close', common.mustCall(() => {
+      server.close();
+    }));
+  }));
 
+  return Promise.all([
+    new Promise((resolve) => resolveSocket = resolve),
+    new Promise((resolve) => resolveReplServer = resolve)
+  ]);
 }
 
-function unix_test() {
-  server_unix = net.createServer(function(socket) {
-    assert.strictEqual(server_unix, socket.server);
+function startUnixRepl() {
+  let resolveSocket, resolveReplServer;
+
+  const server = net.createServer(common.mustCall((socket) => {
+    assert.strictEqual(server, socket.server);
 
-    socket.on('end', function() {
+    socket.on('end', common.mustCall(() => {
       socket.end();
-    });
+    }));
 
-    replServer = repl.start({
+    const replServer = repl.start({
       prompt: prompt_unix,
       input: socket,
       output: socket,
       useGlobal: true
     });
     replServer.context.message = message;
-  });
+    resolveReplServer(replServer);
+  }));
 
-  server_unix.on('listening', function() {
-    let read_buffer = '';
-
-    client_unix = net.createConnection(common.PIPE);
-
-    client_unix.on('connect', function() {
-      assert.strictEqual(true, client_unix.readable);
-      assert.strictEqual(true, client_unix.writable);
-
-      send_expect([
-        { client: client_unix, send: '',
-          expect: prompt_unix },
-        { client: client_unix, send: 'message',
-          expect: (`'${message}'\n${prompt_unix}`) },
-        { client: client_unix, send: 'invoke_me(987)',
-          expect: (`'invoked 987'\n${prompt_unix}`) },
-        { client: client_unix, send: 'a = 12345',
-          expect: (`12345\n${prompt_unix}`) },
-        { client: client_unix, send: '{a:1}',
-          expect: (`{ a: 1 }\n${prompt_unix}`) }
-      ]);
-    });
+  server.listen(common.PIPE, common.mustCall(() => {
+    const client = net.createConnection(common.PIPE);
 
-    client_unix.on('data', function(data) {
-      read_buffer += data.toString('ascii', 0, data.length);
-      console.error(`Unix data: ${JSON.stringify(read_buffer)}, expecting ${
-        JSON.stringify(client_unix.expect)}`);
-      if (read_buffer.includes(prompt_unix)) {
-        assert.strictEqual(client_unix.expect, read_buffer);
-        console.error('match');
-        read_buffer = '';
-        if (client_unix.list && client_unix.list.length > 0) {
-          send_expect(client_unix.list);
-        } else {
-          console.error('End of Unix test, running Error test.\n');
-          process.nextTick(error_test);
-        }
-      } else {
-        console.error('didn\'t see prompt yet, buffering.');
-      }
-    });
+    client.setEncoding('utf8');
 
-    client_unix.on('error', function(e) {
-      throw e;
-    });
+    client.on('connect', common.mustCall(() => {
+      assert.strictEqual(true, client.readable);
+      assert.strictEqual(true, client.writable);
 
-    client_unix.on('close', function() {
-      server_unix.close();
-    });
-  });
+      resolveSocket(client);
+    }));
+
+    client.on('close', common.mustCall(() => {
+      server.close();
+    }));
+  }));
 
-  server_unix.listen(common.PIPE);
+  return Promise.all([
+    new Promise((resolve) => resolveSocket = resolve),
+    new Promise((resolve) => resolveReplServer = resolve)
+  ]);
 }
 
-unix_test();
+function event(ee, eventName) {
+  return new Promise((resolve) => {
+    ee.once(eventName, common.mustCall(resolve));
+  });
+}
diff --git a/test/parallel/test-tls-cnnic-whitelist.js b/test/parallel/test-tls-cnnic-whitelist.js
index 80f188f36670a1..e08e93013f6aca 100644
--- a/test/parallel/test-tls-cnnic-whitelist.js
+++ b/test/parallel/test-tls-cnnic-whitelist.js
@@ -14,22 +14,6 @@ function loadPEM(n) {
 }
 
 const testCases = [
-  { // Test 0: for the check of a cert not existed in the whitelist.
-    // agent7-cert.pem is issued by the fake CNNIC root CA so that its
-    // hash is not listed in the whitelist.
-    // fake-cnnic-root-cert has the same subject name as the original
-    // rootCA.
-    serverOpts: {
-      key: loadPEM('agent7-key'),
-      cert: loadPEM('agent7-cert')
-    },
-    clientOpts: {
-      port: undefined,
-      rejectUnauthorized: true,
-      ca: [loadPEM('fake-cnnic-root-cert')]
-    },
-    errorCode: 'UNABLE_TO_VERIFY_LEAF_SIGNATURE'
-  },
   // Test 1: for the fix of node#2061
   // agent6-cert.pem is signed by intermediate cert of ca3.
   // The server has a cert chain of agent6->ca3->ca1(root) but
@@ -58,7 +42,7 @@ function runTest(tindex) {
   const server = tls.createServer(tcase.serverOpts, (s) => {
     s.resume();
   }).listen(0, common.mustCall(function() {
-    tcase.clientOpts = this.address().port;
+    tcase.clientOpts.port = this.address().port;
     const client = tls.connect(tcase.clientOpts);
     client.on('error', common.mustCall((e) => {
       assert.strictEqual(e.code, tcase.errorCode);
diff --git a/test/parallel/test-tls-legacy-deprecated.js b/test/parallel/test-tls-legacy-deprecated.js
index 4a6120c71b1f77..3b1919010e40e6 100644
--- a/test/parallel/test-tls-legacy-deprecated.js
+++ b/test/parallel/test-tls-legacy-deprecated.js
@@ -9,7 +9,7 @@ const tls = require('tls');
 
 common.expectWarning(
   'DeprecationWarning',
-  'tls.createSecurePair() is deprecated. Please use tls.Socket instead.'
+  'tls.createSecurePair() is deprecated. Please use tls.TLSSocket instead.'
 );
 
 assert.doesNotThrow(() => tls.createSecurePair());
diff --git a/test/parallel/test-trace-events-file-pattern.js b/test/parallel/test-trace-events-file-pattern.js
new file mode 100644
index 00000000000000..46059ad31d58b2
--- /dev/null
+++ b/test/parallel/test-trace-events-file-pattern.js
@@ -0,0 +1,30 @@
+'use strict';
+const common = require('../common');
+const tmpdir = require('../common/tmpdir');
+const assert = require('assert');
+const cp = require('child_process');
+const fs = require('fs');
+
+tmpdir.refresh();
+process.chdir(tmpdir.path);
+
+const CODE =
+  'setTimeout(() => { for (var i = 0; i < 100000; i++) { "test" + i } }, 1)';
+
+const proc = cp.spawn(process.execPath, [
+  '--trace-events-enabled',
+  '--trace-event-file-pattern',
+  // eslint-disable-next-line no-template-curly-in-string
+  '${pid}-${rotation}-${pid}-${rotation}.tracing.log',
+  '-e', CODE
+]);
+
+proc.once('exit', common.mustCall(() => {
+  const expectedFilename = `${proc.pid}-1-${proc.pid}-1.tracing.log`;
+
+  assert(common.fileExists(expectedFilename));
+  fs.readFile(expectedFilename, common.mustCall((err, data) => {
+    const traces = JSON.parse(data.toString()).traceEvents;
+    assert(traces.length > 0);
+  }));
+}));
diff --git a/test/parallel/test-uv-errno.js b/test/parallel/test-uv-errno.js
new file mode 100644
index 00000000000000..28f43db94a247d
--- /dev/null
+++ b/test/parallel/test-uv-errno.js
@@ -0,0 +1,35 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const {
+  getSystemErrorName,
+  _errnoException
+} = require('util');
+
+const uv = process.binding('uv');
+const keys = Object.keys(uv);
+
+keys.forEach((key) => {
+  if (!key.startsWith('UV_'))
+    return;
+
+  assert.doesNotThrow(() => {
+    const err = _errnoException(uv[key], 'test');
+    const name = uv.errname(uv[key]);
+    assert.strictEqual(getSystemErrorName(uv[key]), name);
+    assert.strictEqual(err.code, name);
+    assert.strictEqual(err.code, err.errno);
+    assert.strictEqual(err.message, `test ${name}`);
+  });
+});
+
+[0, 1, 'test', {}, [], Infinity, -Infinity, NaN].forEach((key) => {
+  common.expectsError(
+    () => _errnoException(key),
+    {
+      code: 'ERR_INVALID_ARG_TYPE',
+      type: TypeError,
+      message: 'The "err" argument must be of type negative number'
+    });
+});
diff --git a/test/parallel/test-whatwg-url-searchparams-inspect.js b/test/parallel/test-whatwg-url-searchparams-inspect.js
index 163fa185ede58d..f2493cc6cff176 100644
--- a/test/parallel/test-whatwg-url-searchparams-inspect.js
+++ b/test/parallel/test-whatwg-url-searchparams-inspect.js
@@ -10,20 +10,20 @@ const sp = new URLSearchParams('?a=a&b=b&b=c');
 assert.strictEqual(util.inspect(sp),
                    "URLSearchParams { 'a' => 'a', 'b' => 'b', 'b' => 'c' }");
 assert.strictEqual(util.inspect(sp.keys()),
-                   "URLSearchParamsIterator { 'a', 'b', 'b' }");
+                   "URLSearchParams Iterator { 'a', 'b', 'b' }");
 assert.strictEqual(util.inspect(sp.values()),
-                   "URLSearchParamsIterator { 'a', 'b', 'c' }");
+                   "URLSearchParams Iterator { 'a', 'b', 'c' }");
 assert.strictEqual(util.inspect(sp.keys(), { breakLength: 1 }),
-                   "URLSearchParamsIterator {\n  'a',\n  'b',\n  'b' }");
+                   "URLSearchParams Iterator {\n  'a',\n  'b',\n  'b' }");
 
 const iterator = sp.entries();
 assert.strictEqual(util.inspect(iterator),
-                   "URLSearchParamsIterator { [ 'a', 'a' ], [ 'b', 'b' ], " +
+                   "URLSearchParams Iterator { [ 'a', 'a' ], [ 'b', 'b' ], " +
                                              "[ 'b', 'c' ] }");
 iterator.next();
 assert.strictEqual(util.inspect(iterator),
-                   "URLSearchParamsIterator { [ 'b', 'b' ], [ 'b', 'c' ] }");
+                   "URLSearchParams Iterator { [ 'b', 'b' ], [ 'b', 'c' ] }");
 iterator.next();
 iterator.next();
 assert.strictEqual(util.inspect(iterator),
-                   'URLSearchParamsIterator {  }');
+                   'URLSearchParams Iterator {  }');
diff --git a/test/parallel/test-whatwg-url-tostringtag.js b/test/parallel/test-whatwg-url-tostringtag.js
index 689056fd238dda..c352503fa09a66 100644
--- a/test/parallel/test-whatwg-url-tostringtag.js
+++ b/test/parallel/test-whatwg-url-tostringtag.js
@@ -14,13 +14,13 @@ const spIterator = sp.entries();
 const test = [
   [url, 'URL'],
   [sp, 'URLSearchParams'],
-  [spIterator, 'URLSearchParamsIterator'],
+  [spIterator, 'URLSearchParams Iterator'],
   // Web IDL spec says we have to return 'URLPrototype', but it is too
   // expensive to implement; therefore, use Chrome's behavior for now, until
   // spec is changed.
   [Object.getPrototypeOf(url), 'URL'],
   [Object.getPrototypeOf(sp), 'URLSearchParams'],
-  [Object.getPrototypeOf(spIterator), 'URLSearchParamsIterator'],
+  [Object.getPrototypeOf(spIterator), 'URLSearchParams Iterator'],
 ];
 
 test.forEach(([obj, expected]) => {
diff --git a/test/parallel/test-wrap-js-stream-exceptions.js b/test/parallel/test-wrap-js-stream-exceptions.js
new file mode 100644
index 00000000000000..57ecd70189d106
--- /dev/null
+++ b/test/parallel/test-wrap-js-stream-exceptions.js
@@ -0,0 +1,19 @@
+// Flags: --expose-internals
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const JSStreamWrap = require('internal/wrap_js_stream');
+const { Duplex } = require('stream');
+
+process.once('uncaughtException', common.mustCall((err) => {
+  assert.strictEqual(err.message, 'exception!');
+}));
+
+const socket = new JSStreamWrap(new Duplex({
+  read: common.mustCall(),
+  write: common.mustCall((buffer, data, cb) => {
+    throw new Error('exception!');
+  })
+}));
+
+assert.throws(() => socket.end('foo'), /Error: write EPROTO/);
diff --git a/test/sequential/test-async-wrap-getasyncid.js b/test/sequential/test-async-wrap-getasyncid.js
index c8c25725957824..16e235b97e2119 100644
--- a/test/sequential/test-async-wrap-getasyncid.js
+++ b/test/sequential/test-async-wrap-getasyncid.js
@@ -7,6 +7,7 @@ const net = require('net');
 const providers = Object.assign({}, process.binding('async_wrap').Providers);
 const fixtures = require('../common/fixtures');
 const tmpdir = require('../common/tmpdir');
+const { getSystemErrorName } = require('util');
 
 // Make sure that all Providers are tested.
 {
@@ -214,7 +215,7 @@ if (common.hasCrypto) { // eslint-disable-line crypto-check
       // Use a long string to make sure the write happens asynchronously.
       const err = handle.writeLatin1String(wreq, 'hi'.repeat(100000));
       if (err)
-        throw new Error(`write failed: ${process.binding('uv').errname(err)}`);
+        throw new Error(`write failed: ${getSystemErrorName(err)}`);
       testInitialized(wreq, 'WriteWrap');
     });
     req.address = common.localhostIPv4;
diff --git a/tools/icu/README.md b/tools/icu/README.md
index 2b5d74ac205fb6..c08c82d0cfe31c 100644
--- a/tools/icu/README.md
+++ b/tools/icu/README.md
@@ -1,4 +1,15 @@
-# Notes about the icu directory.
+# Notes about the `tools/icu` subdirectory
+
+This directory contains tools, data, and information about the [http://icu-project.org](ICU) (International Components for Unicode) integration. ICU is used to provide Intl functionality.
+
+- `patches/` are one-off patches, actually entire source file replacements, organized by ICU version number.
+- `icu_small.json` controls the "small" (English only) ICU. It is input to `icutrim.py`
+- `icu-generic.gyp` is the build file used for most ICU builds within ICU. <!-- have fun -->
+- `icu-system.gyp` is an alternate build file used when `--with-intl=system-icu` is invoked. It builds against the `pkg-config` located ICU.
+- `iculslocs.cc` is source for the `iculslocs` utility, invoked by `icutrim.py` as part of repackaging. Not used separately. See source for more details.
+- `no-op.cc` — empty function to convince gyp to use a C++ compiler.
+- `README.md` — you are here
+- `shrink-icu-src.py` — this is used during upgrade (see guide below)
 
 ## How to upgrade ICU
 
@@ -12,13 +23,13 @@
 make
 ```
 
-(The equivalent `vcbuild.bat` commands should work also. Note that we use the `.tgz` and not the `.zip` here,
-that is because of line endings.)
+> _Note_ in theory, the equivalent `vcbuild.bat` commands should work also,
+> but the commands below are makefile-centric.
 
-- (note- may need to make changes in `icu-generic.gyp` or `tools/icu/patches` for
-version specific stuff)
+- If there are ICU version-specific changes needed, you may need to make changes in `icu-generic.gyp` or add patch files to `tools/icu/patches`.
+  - Specifically, look for the lists in `sources!` in the `icu-generic.gyp` for files to exclude.
 
-- Verify the node build works
+- Verify the node build works:
 
 ```shell
 make test-ci
@@ -27,13 +38,12 @@ make test-ci
 Also running
 
 <!-- eslint-disable strict -->
+
 ```js
 new Intl.DateTimeFormat('es', {month: 'long'}).format(new Date(9E8));
 ```
 
 …Should return `January` not `enero`.
-(TODO here: improve [testing](https://github.com/nodejs/Intl/issues/16))
-
 
 - Now, copy `deps/icu` over to `deps/icu-small`
 
@@ -43,25 +53,25 @@ python tools/icu/shrink-icu-src.py
 
 - Now, do a clean rebuild of node to test:
 
-(TODO: fix this when these options become default)
-
 ```shell
-./configure --with-intl=small-icu --with-icu-source=deps/icu-small
+make -k distclean
+./configure
 make
 ```
 
 - Test this newly default-generated Node.js
 
 <!-- eslint-disable strict -->
+
 ```js
 process.versions.icu;
 new Intl.DateTimeFormat('es', {month: 'long'}).format(new Date(9E8));
 ```
 
-(should return your updated ICU version number, and also `January` again.)
+(This should print your updated ICU version number, and also `January` again.)
 
-- You are ready to check in the updated `deps/small-icu`.
-This is a big commit, so make this a separate commit from other changes.
+You are ready to check in the updated `deps/small-icu`. This is a big commit,
+so make this a separate commit from the smaller changes.
 
 - Now, rebuild the Node license.
 
@@ -85,22 +95,23 @@ make test-ci
 
 - commit the change to `configure` along with the updated `LICENSE` file.
 
+  - Note: To simplify review, I often will “pre-land” this patch, meaning that I run the patch through `curl -L https://github.com/nodejs/node/pull/xxx.patch | git am -3 --whitespace=fix` per the collaborator’s guide… and then push that patched branch into my PR's branch. This reduces the whitespace changes that show up in the PR, since the final land will eliminate those anyway.
+
 -----
 
-## Notes about these tools
+## Postscript about the tools
 
-The files in this directory were written for the node.js effort. It's
-the intent of their author (Steven R. Loomis / srl295) to merge them
-upstream into ICU, pending much discussion within the ICU-PMC.
+The files in this directory were written for the node.js effort.
+It was the intent of their author (Steven R. Loomis / srl295) to
+merge them upstream into ICU, pending much discussion within the
+ICU-TC.
 
 `icu_small.json` is somewhat node-specific as it specifies a "small ICU"
 configuration file for the `icutrim.py` script. `icutrim.py` and
 `iculslocs.cpp` may themselves be superseded by components built into
-ICU in the future.
-
-The following tickets were opened during this work, and their
-resolution may inform the reader as to the current state of icu-trim
-upstream:
+ICU in the future. As of this writing, however, the tools are separate
+entities within Node, although theyare being scrutinized by interested
+members of the ICU-TC. The “upstream” ICU bugs are given below.
 
    * [#10919](http://bugs.icu-project.org/trac/ticket/10919)
      (experimental branch - may copy any source patches here)
@@ -108,7 +119,3 @@ upstream:
      (data packaging improvements)
    * [#10923](http://bugs.icu-project.org/trac/ticket/10923)
      (rewrite data building in python)
-
-When/if components (not including the `.json` file) are merged into
-ICU, this code and `configure` will be updated to detect and use those
-variants rather than the ones in this directory.
diff --git a/tools/remark-cli/package-lock.json b/tools/remark-cli/package-lock.json
new file mode 100644
index 00000000000000..527bdf364fdfaf
--- /dev/null
+++ b/tools/remark-cli/package-lock.json
@@ -0,0 +1,1145 @@
+{
+  "name": "remark-cli",
+  "version": "3.0.1",
+  "lockfileVersion": 1,
+  "preserveSymlinks": "1",
+  "requires": true,
+  "dependencies": {
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "requires": {
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
+      }
+    },
+    "argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "requires": {
+        "sprintf-js": "1.0.3"
+      }
+    },
+    "arr-diff": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+      "requires": {
+        "arr-flatten": "1.1.0"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
+    },
+    "array-iterate": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.1.tgz",
+      "integrity": "sha1-hlv3+K851rCYLGCQKRSsdrwBCPY="
+    },
+    "array-unique": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0="
+    },
+    "bail": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz",
+      "integrity": "sha1-99bBcxYwqfnw1NNe0fli4gdKF2Q="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "binary-extensions": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
+      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA="
+    },
+    "brace-expansion": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "requires": {
+        "expand-range": "1.8.2",
+        "preserve": "0.2.0",
+        "repeat-element": "1.1.2"
+      }
+    },
+    "camelcase": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+      "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+    },
+    "ccount": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz",
+      "integrity": "sha1-U7ai+BW7d7nChx97mnLDol8djok="
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "requires": {
+        "ansi-styles": "2.2.1",
+        "escape-string-regexp": "1.0.5",
+        "has-ansi": "2.0.0",
+        "strip-ansi": "3.0.1",
+        "supports-color": "2.0.0"
+      }
+    },
+    "character-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz",
+      "integrity": "sha1-92hxvl72bdt/j440eOzDdMJ9bco="
+    },
+    "character-entities-html4": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz",
+      "integrity": "sha1-NZoqSg9+KdPcKsmb2+Ie45Q46lA="
+    },
+    "character-entities-legacy": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz",
+      "integrity": "sha1-9Ad53xoQGHK7UQo9KV4fzPFHIC8="
+    },
+    "character-reference-invalid": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz",
+      "integrity": "sha1-lCg191Dk7GGjCOYMLvjMEBEgLvw="
+    },
+    "chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+      "requires": {
+        "anymatch": "1.3.2",
+        "async-each": "1.0.1",
+        "glob-parent": "2.0.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "2.0.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.1.0"
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
+    "collapse-white-space": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz",
+      "integrity": "sha1-S5BvZw5aljqHt2sOFolkM0G2Ajw="
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "typedarray": "0.0.6"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "deep-extend": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
+    },
+    "error-ex": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "requires": {
+        "is-arrayish": "0.2.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "esprima": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
+    },
+    "expand-brackets": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+      "requires": {
+        "is-posix-bracket": "0.1.1"
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "requires": {
+        "fill-range": "2.2.3"
+      }
+    },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+    },
+    "extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "fault": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.1.tgz",
+      "integrity": "sha1-3o01Df1IviS13BsChn4IcbkTUJI=",
+      "requires": {
+        "format": "0.2.2"
+      }
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
+    },
+    "fill-range": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
+      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+      "requires": {
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "1.1.7",
+        "repeat-element": "1.1.2",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "fn-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz",
+      "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc="
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "requires": {
+        "for-in": "1.0.2"
+      }
+    },
+    "format": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
+      "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs="
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "requires": {
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "requires": {
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "requires": {
+        "is-glob": "2.0.1"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "has": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+      "requires": {
+        "function-bind": "1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
+    },
+    "ignore": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
+      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA=="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "ini": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
+    },
+    "is-alphabetical": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz",
+      "integrity": "sha1-x3B5zJHU76x3W+EDS/LSQ/lebwg="
+    },
+    "is-alphanumeric": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
+      "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ="
+    },
+    "is-alphanumerical": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz",
+      "integrity": "sha1-37SqTRCF4zvbYcLe6cgOnGwZ9Ts=",
+      "requires": {
+        "is-alphabetical": "1.0.1",
+        "is-decimal": "1.0.1"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "requires": {
+        "binary-extensions": "1.10.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "is-decimal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz",
+      "integrity": "sha1-9ftqlJlq2ejjdh+/vQkfH8qMToI="
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
+    },
+    "is-empty": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-empty/-/is-empty-1.2.0.tgz",
+      "integrity": "sha1-3pu1snhzigWgsJpX4ftNSjQan2s="
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "requires": {
+        "is-primitive": "2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "is-hexadecimal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz",
+      "integrity": "sha1-bghLvJIGH7sJcexYts5tQE4k2mk="
+    },
+    "is-hidden": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-hidden/-/is-hidden-1.1.1.tgz",
+      "integrity": "sha512-175UKecS8+U4hh2PSY0j4xnm2GKYzvSKnbh+naC93JjuBA7LgIo6YxlbcsSo6seFBdQO3RuIcH980yvqqD/2cA=="
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA="
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
+    },
+    "is-whitespace-character": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.1.tgz",
+      "integrity": "sha1-muAXbzKCtlRXoZks2whPil+DPjs="
+    },
+    "is-word-character": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.1.tgz",
+      "integrity": "sha1-WgP6HqkazopusMfNdw64bWXIvvs="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "requires": {
+        "isarray": "1.0.0"
+      }
+    },
+    "js-yaml": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "requires": {
+        "argparse": "1.0.9",
+        "esprima": "4.0.0"
+      }
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "requires": {
+        "is-buffer": "1.1.6"
+      }
+    },
+    "load-plugin": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/load-plugin/-/load-plugin-2.2.1.tgz",
+      "integrity": "sha512-raqInsJNdPGpzZyb+FjjJYmXsjIm8fIiOjOmqmUTGPyCXDMeEK3p4x4Xm1ZCNp43UmfDTWvo7pZkB2fKbD5AAA==",
+      "requires": {
+        "npm-prefix": "1.2.0",
+        "resolve-from": "2.0.0"
+      }
+    },
+    "longest-streak": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
+      "integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA=="
+    },
+    "markdown-escapes": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.1.tgz",
+      "integrity": "sha1-GZTfLTr0gR3lmmcUk0wrIpJzRRg="
+    },
+    "markdown-extensions": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-1.1.0.tgz",
+      "integrity": "sha1-+6Dxouu09BI9JbepO8NXksEfUE4="
+    },
+    "markdown-table": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.1.tgz",
+      "integrity": "sha1-Sz3ToTPRUYuO8NvHCb8qG0gkvIw="
+    },
+    "mdast-util-compact": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
+      "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
+      "requires": {
+        "unist-util-modify-children": "1.1.1",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "micromatch": {
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+      "requires": {
+        "arr-diff": "2.0.0",
+        "array-unique": "0.2.1",
+        "braces": "1.8.5",
+        "expand-brackets": "0.1.5",
+        "extglob": "0.3.2",
+        "filename-regex": "2.0.1",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1",
+        "kind-of": "3.2.2",
+        "normalize-path": "2.1.1",
+        "object.omit": "2.0.1",
+        "parse-glob": "3.0.4",
+        "regex-cache": "0.4.4"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "1.1.8"
+      }
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "requires": {
+        "remove-trailing-separator": "1.1.0"
+      }
+    },
+    "npm-prefix": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/npm-prefix/-/npm-prefix-1.2.0.tgz",
+      "integrity": "sha1-5hlFX3B0ulTMZtbQ033Z8b5ry8A=",
+      "requires": {
+        "rc": "1.2.2",
+        "shellsubstitute": "1.2.0",
+        "untildify": "2.1.0"
+      }
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "requires": {
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+    },
+    "parse-entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz",
+      "integrity": "sha1-gRLYhHExnyerrk1klksSL+ThuJA=",
+      "requires": {
+        "character-entities": "1.2.1",
+        "character-entities-legacy": "1.1.1",
+        "character-reference-invalid": "1.1.1",
+        "is-alphanumerical": "1.0.1",
+        "is-decimal": "1.0.1",
+        "is-hexadecimal": "1.0.1"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "requires": {
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "requires": {
+        "error-ex": "1.3.1"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+    },
+    "randomatic": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
+      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "requires": {
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "requires": {
+            "is-buffer": "1.1.6"
+          }
+        }
+      }
+    },
+    "rc": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
+      "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
+      "requires": {
+        "deep-extend": "0.4.2",
+        "ini": "1.3.4",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "requires": {
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "safe-buffer": "5.1.1",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "readdirp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.3.3",
+        "set-immediate-shim": "1.0.1"
+      }
+    },
+    "regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "requires": {
+        "is-equal-shallow": "0.1.3"
+      }
+    },
+    "remark": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-7.0.1.tgz",
+      "integrity": "sha1-pd5NrPq/D2CkmCbvJMR5gH+QS/s=",
+      "requires": {
+        "remark-parse": "3.0.1",
+        "remark-stringify": "3.0.1",
+        "unified": "6.1.5"
+      }
+    },
+    "remark-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-3.0.1.tgz",
+      "integrity": "sha1-G5+EGkTY9PvyJGhQJlRZpOs1TIA=",
+      "requires": {
+        "collapse-white-space": "1.0.3",
+        "has": "1.0.1",
+        "is-alphabetical": "1.0.1",
+        "is-decimal": "1.0.1",
+        "is-whitespace-character": "1.0.1",
+        "is-word-character": "1.0.1",
+        "markdown-escapes": "1.0.1",
+        "parse-entities": "1.1.1",
+        "repeat-string": "1.6.1",
+        "state-toggle": "1.0.0",
+        "trim": "0.0.1",
+        "trim-trailing-lines": "1.1.0",
+        "unherit": "1.1.0",
+        "unist-util-remove-position": "1.1.1",
+        "vfile-location": "2.0.2",
+        "xtend": "4.0.1"
+      }
+    },
+    "remark-stringify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-3.0.1.tgz",
+      "integrity": "sha1-eSQr6+CnUggbWAlRb6DAbt7Aac8=",
+      "requires": {
+        "ccount": "1.0.2",
+        "is-alphanumeric": "1.0.0",
+        "is-decimal": "1.0.1",
+        "is-whitespace-character": "1.0.1",
+        "longest-streak": "2.0.2",
+        "markdown-escapes": "1.0.1",
+        "markdown-table": "1.1.1",
+        "mdast-util-compact": "1.0.1",
+        "parse-entities": "1.1.1",
+        "repeat-string": "1.6.1",
+        "state-toggle": "1.0.0",
+        "stringify-entities": "1.3.1",
+        "unherit": "1.1.0",
+        "xtend": "4.0.1"
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo="
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+    },
+    "replace-ext": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs="
+    },
+    "resolve-from": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
+      "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
+    },
+    "shellsubstitute": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shellsubstitute/-/shellsubstitute-1.2.0.tgz",
+      "integrity": "sha1-5PcCpQxRiw9v6YRRiQ1wWvKba3A="
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "state-toggle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.0.tgz",
+      "integrity": "sha1-0g+aYWu08MO5i5GSLSW2QKorxCU="
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "requires": {
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "stringify-entities": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz",
+      "integrity": "sha1-sVDsLXKsTBtfMktR+2soyc3/BYw=",
+      "requires": {
+        "character-entities-html4": "1.1.1",
+        "character-entities-legacy": "1.1.1",
+        "is-alphanumerical": "1.0.1",
+        "is-hexadecimal": "1.0.1"
+      }
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+    },
+    "to-vfile": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/to-vfile/-/to-vfile-2.1.2.tgz",
+      "integrity": "sha512-o8o2CXU2LDxh4OsvG9bGRXkIhcvk+bWKqWQECLcjfMNy2b8rl4kuFAZeTcPM5obK1mrvQ4iS3AcdopFDluq1jQ==",
+      "requires": {
+        "is-buffer": "1.1.6",
+        "vfile": "2.2.0"
+      }
+    },
+    "trim": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
+      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0="
+    },
+    "trim-trailing-lines": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz",
+      "integrity": "sha1-eu+7eAjfnWafbaLkOMrIxGradoQ="
+    },
+    "trough": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz",
+      "integrity": "sha1-qf2LA5Swro//guBjOgo2zK1bX4Y="
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "unherit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz",
+      "integrity": "sha1-a5qu379z3xdWrZ4xbdmBiFhAzX0=",
+      "requires": {
+        "inherits": "2.0.3",
+        "xtend": "4.0.1"
+      }
+    },
+    "unified": {
+      "version": "6.1.5",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-6.1.5.tgz",
+      "integrity": "sha1-cWk3hyYhpjE15iztLzrGoGPG+4c=",
+      "requires": {
+        "bail": "1.0.2",
+        "extend": "3.0.1",
+        "is-plain-obj": "1.1.0",
+        "trough": "1.0.1",
+        "vfile": "2.2.0",
+        "x-is-function": "1.0.4",
+        "x-is-string": "0.1.0"
+      }
+    },
+    "unified-args": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/unified-args/-/unified-args-3.1.1.tgz",
+      "integrity": "sha1-bM7oFbXEtYNCfM8pQ6Xp/Lw4zFE=",
+      "requires": {
+        "camelcase": "4.1.0",
+        "chalk": "1.1.3",
+        "chokidar": "1.7.0",
+        "minimist": "1.2.0",
+        "text-table": "0.2.0",
+        "unified-engine": "3.1.1"
+      }
+    },
+    "unified-engine": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/unified-engine/-/unified-engine-3.1.1.tgz",
+      "integrity": "sha1-eSVBgm306XtkDM3ZDspiE1bkyec=",
+      "requires": {
+        "concat-stream": "1.6.0",
+        "debug": "2.6.9",
+        "fault": "1.0.1",
+        "fn-name": "2.0.1",
+        "glob": "7.1.2",
+        "has": "1.0.1",
+        "ignore": "3.3.7",
+        "is-empty": "1.2.0",
+        "is-hidden": "1.1.1",
+        "is-object": "1.0.1",
+        "js-yaml": "3.10.0",
+        "load-plugin": "2.2.1",
+        "parse-json": "2.2.0",
+        "to-vfile": "2.1.2",
+        "trough": "1.0.1",
+        "vfile-reporter": "3.1.0",
+        "vfile-statistics": "1.1.0",
+        "x-is-function": "1.0.4",
+        "x-is-string": "0.1.0",
+        "xtend": "4.0.1"
+      }
+    },
+    "unist-util-modify-children": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.1.tgz",
+      "integrity": "sha1-ZtfmpEnm9nIguXarPLi166w55R0=",
+      "requires": {
+        "array-iterate": "1.1.1"
+      }
+    },
+    "unist-util-remove-position": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz",
+      "integrity": "sha1-WoXBVV/BugwQG4ZwfRXlD6TIcbs=",
+      "requires": {
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "unist-util-stringify-position": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz",
+      "integrity": "sha1-PMvcU2ee7W7PN3fdf14yKcG2qjw="
+    },
+    "unist-util-visit": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.1.3.tgz",
+      "integrity": "sha1-7CaOcxudJ3p5pbWqBkOZDkBdYAs="
+    },
+    "untildify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz",
+      "integrity": "sha1-F+soB5h/dpUunASF/DEdBqgmouA=",
+      "requires": {
+        "os-homedir": "1.0.2"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "vfile": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.2.0.tgz",
+      "integrity": "sha1-zkek+zNZIrIz5TXbD32BIdj87U4=",
+      "requires": {
+        "is-buffer": "1.1.6",
+        "replace-ext": "1.0.0",
+        "unist-util-stringify-position": "1.1.1"
+      }
+    },
+    "vfile-location": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz",
+      "integrity": "sha1-02dcWch3SY5JK0dW/2Xkrxp1IlU="
+    },
+    "vfile-reporter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-3.1.0.tgz",
+      "integrity": "sha1-qbOYxebcvIqaCObPQl8JLoajcAA=",
+      "requires": {
+        "repeat-string": "1.6.1",
+        "string-width": "1.0.2",
+        "supports-color": "4.5.0",
+        "unist-util-stringify-position": "1.1.1",
+        "vfile-statistics": "1.1.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "requires": {
+            "has-flag": "2.0.0"
+          }
+        }
+      }
+    },
+    "vfile-statistics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.0.tgz",
+      "integrity": "sha1-AhBMYP3u0dEbH3OtZTMLdjSz2JU="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "x-is-function": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/x-is-function/-/x-is-function-1.0.4.tgz",
+      "integrity": "sha1-XSlNw9Joy90GJYDgxd93o5HR+h4="
+    },
+    "x-is-string": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
+      "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI="
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+    }
+  }
+}
diff --git a/tools/remark-preset-lint-node/package-lock.json b/tools/remark-preset-lint-node/package-lock.json
new file mode 100644
index 00000000000000..30008212f5520e
--- /dev/null
+++ b/tools/remark-preset-lint-node/package-lock.json
@@ -0,0 +1,448 @@
+{
+  "name": "remark-preset-lint-node",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "preserveSymlinks": "1",
+  "requires": true,
+  "dependencies": {
+    "co": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
+      "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g="
+    },
+    "irregular-plurals": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz",
+      "integrity": "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y="
+    },
+    "mdast-comment-marker": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.0.2.tgz",
+      "integrity": "sha1-Hd8O+BH7UkOQF8jSwLkiA18rp0o="
+    },
+    "mdast-util-heading-style": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/mdast-util-heading-style/-/mdast-util-heading-style-1.0.3.tgz",
+      "integrity": "sha1-77OQ28iqAWw89XegNJANsn7nJHw="
+    },
+    "mdast-util-to-string": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.0.4.tgz",
+      "integrity": "sha1-XEVch4yTVfDB5/PotxnPWDaRrPs="
+    },
+    "plur": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
+      "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
+      "requires": {
+        "irregular-plurals": "1.4.0"
+      }
+    },
+    "remark-lint": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint/-/remark-lint-6.0.1.tgz",
+      "integrity": "sha512-wvTTuB5O5pF8SxqahQjjrU3dtuhygYjaGcOZTw+4ACgSE4RBINDlNqN46HjcV3X0ib5GmObJUt5a2mmhtmuTqw==",
+      "requires": {
+        "remark-message-control": "4.0.1"
+      }
+    },
+    "remark-lint-blockquote-indentation": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-1.0.1.tgz",
+      "integrity": "sha512-YrP99MJ3+dQ5JXzq39fUOcYzwcumva/xEM1eFtD2TrQcSdlMLoqYa7gj+aEEhZCjlA5BssTiVoWWW0RjyPPGZw==",
+      "requires": {
+        "mdast-util-to-string": "1.0.4",
+        "plur": "2.1.2",
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-checkbox-character-style": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-checkbox-character-style/-/remark-lint-checkbox-character-style-1.0.1.tgz",
+      "integrity": "sha512-AF+1UrsVyrYYbK8Mg5TXr/IxaepgMspejPKuflK+TKOYKmMxOHUjdk2kIBBulj+hZCp+yz7lq3ifr8N2Vqg9BA==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3",
+        "vfile-location": "2.0.2"
+      }
+    },
+    "remark-lint-checkbox-content-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-checkbox-content-indent/-/remark-lint-checkbox-content-indent-1.0.1.tgz",
+      "integrity": "sha512-cCPzu1HSQUevFsfJ7mmwj/v76ZWYBSbBu/GmFJE57G10BCEv1pCHuxJYjGKbXPcQXU5NTvIH9fuHWRVdM3hwdA==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3",
+        "vfile-location": "2.0.2"
+      }
+    },
+    "remark-lint-code-block-style": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-code-block-style/-/remark-lint-code-block-style-1.0.1.tgz",
+      "integrity": "sha512-FRUMhhKwCruH4vkatdMhVO4WlYpysV1NmMILVoK/k+/7uFLSfgvlqo66nzhpMdWL8TQHqdo0LhiXuetGC2WjsQ==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-definition-spacing": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-definition-spacing/-/remark-lint-definition-spacing-1.0.1.tgz",
+      "integrity": "sha512-ewzdlFfpTSP11ZuiOln0yfz6Y03aWtgJmLVQNfF1spaT1gURaShjs8Hiilbo719bz96DgvXSZLP6UnkSiZL1vg==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-fenced-code-flag": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-1.0.1.tgz",
+      "integrity": "sha512-P24T9DRe/nnywPFRpE1UAXAVzN1CX6HmINr15UHbQZo1Cy8KYt7uV9YOR0/XzphtnO/AFenAqZyf7tchW5AUNQ==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-fenced-code-marker": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-1.0.1.tgz",
+      "integrity": "sha512-mX7xAMl5m7xGX+YtOtyXIyv+egD4IQAm6DPGdfunI734QwODwcoBydtpTD56jrY+48nVcQ/anFYT1Blg3Xk3sQ==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-file-extension": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-file-extension/-/remark-lint-file-extension-1.0.1.tgz",
+      "integrity": "sha512-K1Pf5oviaFyCs0FhZqaNZ2odgd5KoV6AlA4nNAMxyylB0Y6t0mYpzECoLSS5Bgxf6f8Op9YbuM2cbjBAsv0dIA==",
+      "requires": {
+        "unified-lint-rule": "1.0.2"
+      }
+    },
+    "remark-lint-final-definition": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-final-definition/-/remark-lint-final-definition-1.0.1.tgz",
+      "integrity": "sha512-DK6bphJdQ0xSOQAn+8wOyLIVc3SZW2+ZzCMCLkQnVtHiQ9GHMzFiCkeE3Cq+OClsMI5Yn8wFTHZHPUn58VhNEQ==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-final-newline": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-final-newline/-/remark-lint-final-newline-1.0.1.tgz",
+      "integrity": "sha512-neztZuEBw2ka9N35Ap0ZfBqPPA/TNSksGQNq0G9VWL370+s+6k+GUEaq7cjcQACYt310oWl4bx5ukbmo/7L5WA==",
+      "requires": {
+        "unified-lint-rule": "1.0.2"
+      }
+    },
+    "remark-lint-first-heading-level": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-first-heading-level/-/remark-lint-first-heading-level-1.1.1.tgz",
+      "integrity": "sha512-R11L8arXZy+uAZIioSRVWhp4f6Oere/Q071INTX8g4uvuZrC/uKDjxa3iZ6dlWCfLijC0z/s2JbeqwYbV5QrCA==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-hard-break-spaces": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-1.0.2.tgz",
+      "integrity": "sha512-uh7LqHgRPCphiCvRzBVA4D0Ml2IqPaw89lWJdQ6HvYiV8ChB/OFLBapHi6OKW7NVVVPPJsElPMB/UPUsKFaPTg==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-heading-style": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-heading-style/-/remark-lint-heading-style-1.0.1.tgz",
+      "integrity": "sha512-m9Gqr091YdxUtG69xdXYH8fSd3+nsrsMamB/qSWpVSZuWQKZ1mRotr1LO9NphJh6vhw8IfBtG07wgEDn6b40sQ==",
+      "requires": {
+        "mdast-util-heading-style": "1.0.3",
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-no-auto-link-without-protocol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-1.0.1.tgz",
+      "integrity": "sha512-MHl0hNtF8Rc0lg6iuVP7/0rnp4uZadm3S07/1TiFeqzU22KFxxzcC8980Q4+I8oPZE0d1x80h9DmkNAVFwhDjQ==",
+      "requires": {
+        "mdast-util-to-string": "1.0.4",
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-no-blockquote-without-caret": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-blockquote-without-caret/-/remark-lint-no-blockquote-without-caret-1.0.0.tgz",
+      "integrity": "sha1-gd0i3V8EVOupwqU3u6Jgh0ShrW8=",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3",
+        "vfile-location": "2.0.2"
+      }
+    },
+    "remark-lint-no-duplicate-definitions": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-duplicate-definitions/-/remark-lint-no-duplicate-definitions-1.0.1.tgz",
+      "integrity": "sha512-3I0V3UVJ0gkDKZahSZ0xdFmklecr5SMwXcWbVBzXvHR59LqgjMVHFI7G/QZ6k2imOl1X22YVRz+mpMjacu2Ipw==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-no-file-name-articles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.1.tgz",
+      "integrity": "sha512-SzebnFnilrsINA6QZP1YqPa3SrfSotrLkRWl5FUCoVshBvEFNKJFWXj6Xyt4NjWQ5tJWFtOMysAuHdGT+Odhjg==",
+      "requires": {
+        "unified-lint-rule": "1.0.2"
+      }
+    },
+    "remark-lint-no-file-name-consecutive-dashes": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.1.tgz",
+      "integrity": "sha512-YP2HBwA00yeD7phvxp4ftiqbfBPfYHPgPfcEcb8oNa1WlUh/58cs9DbSHWKsZG+XLkvEaheC6qUQG02jEKZHPA==",
+      "requires": {
+        "unified-lint-rule": "1.0.2"
+      }
+    },
+    "remark-lint-no-file-name-outer-dashes": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.2.tgz",
+      "integrity": "sha512-BVEwLrA4kipalgKrxhncpgtmh6eUmHBH1ggC+X3csYR4X5vXv4vHQqpov4I1vMyWxMLMBnq7lTL3Iqp0CS4vwg==",
+      "requires": {
+        "unified-lint-rule": "1.0.2"
+      }
+    },
+    "remark-lint-no-heading-content-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-heading-content-indent/-/remark-lint-no-heading-content-indent-1.0.1.tgz",
+      "integrity": "sha512-VHOqVx3Qb9tckHu/DkpQjBqlXQHcfabKaSuiXdeH+G0sfgWOxL0KCmA6fsUqUdj7xJ8Q7YpH/c3wb3nZ/85d+Q==",
+      "requires": {
+        "mdast-util-heading-style": "1.0.3",
+        "plur": "2.1.2",
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-no-heading-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-heading-indent/-/remark-lint-no-heading-indent-1.0.1.tgz",
+      "integrity": "sha512-NbNZQj+/S6v510FscCTjg/du3KzI0p2CHzqlHRw+4Evryo1O9G7cgSaTT8TC4Eb/h4gGFAPwXuaSKW8noWWBcQ==",
+      "requires": {
+        "plur": "2.1.2",
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-no-inline-padding": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-1.0.1.tgz",
+      "integrity": "sha512-nRl6vA45ZPdMz3/rVMZw7WRRqLFuMrzhdkrbrGLjwBovdIeD/IGCEbDA5NR60g2xT9V5dAmKogvHEH1bIr8SdQ==",
+      "requires": {
+        "mdast-util-to-string": "1.0.4",
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-no-multiple-toplevel-headings": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-1.0.1.tgz",
+      "integrity": "sha512-LFfgjF3NKFkt0tGNnJ8Exf8+DrVcMRwek5qu5mvh2KrZnmSpm5flYWzUy2UnnIyicDL3CZYC/r3Fjz6CeBYgZA==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-no-shell-dollars": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-1.0.1.tgz",
+      "integrity": "sha512-YryHem73PTxjCkuC4HONJWHsmrLyXmF7r+cCH36Ys3vuWsfAbwkbOwpyuPB4KXn+6fHaTUfz/B5BPp3iwzJwyA==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-no-shortcut-reference-image": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-1.0.1.tgz",
+      "integrity": "sha512-nUQ+4xB5hKZTCl9gvg7c+W1T3ddsnjgu4zwRza2Bn+21cKmUzx+z9dvlZ4aVuNGmxuWHbKI8/ZkKuB8Eu27vJw==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-no-table-indentation": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-1.0.1.tgz",
+      "integrity": "sha512-QrtT1GvJmAoNsWh+gmHFajFlM+ubm9rd3Cbz2OYPix8ZM6g907aIfG2NusJFXL9D8/CExQWYhlBvelFBbHgqbQ==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-no-tabs": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-tabs/-/remark-lint-no-tabs-1.0.1.tgz",
+      "integrity": "sha512-sFNCjz3MpX2TKo4vvo9s6iX8C0MsTmw10iC0F6mk3FKZ694bkHnEQOPhz5oyZIodV+QJ2wKqpZkuyXruIshjtA==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "vfile-location": "2.0.2"
+      }
+    },
+    "remark-lint-no-unused-definitions": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-no-unused-definitions/-/remark-lint-no-unused-definitions-1.0.1.tgz",
+      "integrity": "sha512-weNwWXvoSBmB3L2Yh8oxY0ylF6L5b/PjFbOhzBU4SlnpFOMfTn3rwNxOxbTrDS8MG2JTPVTaFn4ajXr/zkbH0Q==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-rule-style": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-rule-style/-/remark-lint-rule-style-1.0.1.tgz",
+      "integrity": "sha512-dzH+K6DcPIIMBq6LUQgE4dR9TiQGZrQOoULD7m0Y0lIb2EoR2FK5Zd4TgZg/LnvTs6fid37t0xFoaY4/lXV/5Q==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-strong-marker": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-strong-marker/-/remark-lint-strong-marker-1.0.1.tgz",
+      "integrity": "sha512-+bwWKWAqDwqd21Vw+ndqVFh5V27Dp4MKhk9AUlKmcvgJYHuvQ8UfWQdpZcP218ps/4EbwTfyi33TaPyXqOTlXA==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-table-cell-padding": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-1.0.1.tgz",
+      "integrity": "sha512-o3WwC9YysXbQKf0D5nvhhJPcLagqedLwGdifukdgyaKvuIQVbtWbNv1/UOdB3LL+D+2fUrwrCmnQ8J3E1r0lBw==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-lint-table-pipes": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remark-lint-table-pipes/-/remark-lint-table-pipes-1.0.1.tgz",
+      "integrity": "sha512-VHfDRvcovLBl/cvSjwDoA0xRizdZU33A6F2qFD9A5hu1sDWgGxMLg5m2MOvFlRkUVxSwUv47cuD0/yxB4THYXQ==",
+      "requires": {
+        "unified-lint-rule": "1.0.2",
+        "unist-util-generated": "1.1.1",
+        "unist-util-position": "3.0.0",
+        "unist-util-visit": "1.1.3"
+      }
+    },
+    "remark-message-control": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/remark-message-control/-/remark-message-control-4.0.1.tgz",
+      "integrity": "sha1-KRPNYLMW2fnzkKp/NGOdIM9VmW0=",
+      "requires": {
+        "mdast-comment-marker": "1.0.2",
+        "trim": "0.0.1",
+        "unist-util-visit": "1.1.3",
+        "vfile-location": "2.0.2"
+      }
+    },
+    "sliced": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
+      "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
+    },
+    "trim": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
+      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0="
+    },
+    "unified-lint-rule": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unified-lint-rule/-/unified-lint-rule-1.0.2.tgz",
+      "integrity": "sha512-WkqwMC1aijHE17W3Z1co7aTI+Dzo1jHdwhI66fTClU1yOTbzAsTqlOD6eeR/MI9235Y3nu2jMDcm8GCeq4gaLg==",
+      "requires": {
+        "wrapped": "1.0.1"
+      }
+    },
+    "unist-util-generated": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.1.tgz",
+      "integrity": "sha1-mfFseJWayFTe58YVwpGSTIv03n8="
+    },
+    "unist-util-position": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.0.tgz",
+      "integrity": "sha1-5uHgPu64HF4a/lU+jUrfvXwNj4I="
+    },
+    "unist-util-visit": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.1.3.tgz",
+      "integrity": "sha1-7CaOcxudJ3p5pbWqBkOZDkBdYAs="
+    },
+    "vfile-location": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz",
+      "integrity": "sha1-02dcWch3SY5JK0dW/2Xkrxp1IlU="
+    },
+    "wrapped": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wrapped/-/wrapped-1.0.1.tgz",
+      "integrity": "sha1-x4PZ2Aeyc+mwHoUWgKk4yHyQckI=",
+      "requires": {
+        "co": "3.1.0",
+        "sliced": "1.0.1"
+      }
+    }
+  }
+}