diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e14f5fc937d620..24b66f8b2f8b4d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,7 +13,9 @@ Contributors guide: https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
 - [ ] `make -j4 test` (UNIX), or `vcbuild test nosign` (Windows) passes
 - [ ] tests and/or benchmarks are included
 - [ ] documentation is changed or added
-- [ ] commit message follows commit guidelines
+- [ ] commit message follows [commit guidelines][]
 
 ##### Affected core subsystem(s)
 <!-- Provide affected core subsystem(s) (like doc, cluster, crypto, etc). -->
+
+[commit guidelines]: https://github.com/nodejs/node/blob/master/CONTRIBUTING.md#commit-guidelines
diff --git a/BUILDING.md b/BUILDING.md
index 75ef93f8c73a13..2dd5c142779ead 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -13,7 +13,7 @@ file a new issue.
 
 Prerequisites:
 
-* `gcc` and `g++` 4.8 or newer, or
+* `gcc` and `g++` 4.8.5 or newer, or
 * `clang` and `clang++` 3.4 or newer
 * Python 2.6 or 2.7
 * GNU Make 3.81 or newer
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 818d612bc78a05..22116f1960d480 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-    <b><a href="doc/changelogs/CHANGELOG_V7.md#7.7.3">7.7.3</a></b><br/>
+    <b><a href="doc/changelogs/CHANGELOG_V7.md#7.7.4">7.7.4</a></b><br/>
+    <a href="doc/changelogs/CHANGELOG_V7.md#7.7.3">7.7.3</a><br/>
     <a href="doc/changelogs/CHANGELOG_V7.md#7.7.2">7.7.2</a><br/>
     <a href="doc/changelogs/CHANGELOG_V7.md#7.7.1">7.7.1</a><br/>
     <a href="doc/changelogs/CHANGELOG_V7.md#7.7.0">7.7.0</a><br/>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 290cad8faaeb7a..4daf126bd16053 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -95,6 +95,8 @@ $ git add my/changed/files
 $ git commit
 ```
 
+### Commit guidelines
+
 Writing good commit logs is important. A commit log should describe what
 changed and why. Follow these guidelines when writing one:
 
@@ -176,8 +178,7 @@ Running `make test`/`vcbuild test` will run the linter as well unless one or
 more tests fail.
 
 If you want to run the linter without running tests, use
-`make lint`/`vcbuild jslint`. At this time, only JavaScript linting is
-available on Windows. `make lint` on POSIX will run both JavaScript linting and
+`make lint`/`vcbuild lint`. It will run both JavaScript linting and
 C++ linting.
 
 If you are updating tests and just want to run a single test to check it, you
diff --git a/README.md b/README.md
index 375119484b0770..5957e5e526c4cd 100644
--- a/README.md
+++ b/README.md
@@ -337,6 +337,8 @@ more information about the governance of the Node.js project, see
 **Mike Tunnicliffe** &lt;m.j.tunnicliffe@gmail.com&gt;
 * [vkurchatkin](https://github.com/vkurchatkin) -
 **Vladimir Kurchatkin** &lt;vladimir.kurchatkin@gmail.com&gt;
+* [vsemozhetbyt](https://github.com/vsemozhetbyt) -
+**Vse Mozhet Byt** &lt;vsemozhetbyt@gmail.com&gt; (he/him)
 * [watilde](https://github.com/watilde) -
 **Daijiro Wachi** &lt;daijiro.wachi@gmail.com&gt; (he/him)
 * [whitlockjc](https://github.com/whitlockjc) -
diff --git a/benchmark/README.md b/benchmark/README.md
index 6fd9a97bdfb3bb..17c733e6eb0b6c 100644
--- a/benchmark/README.md
+++ b/benchmark/README.md
@@ -235,12 +235,3 @@ it returns to accomplish what they need. This function reports timing
 data to the parent process (usually created by running `compare.js`, `run.js` or
 `scatter.js`).
 
-### v8ForceOptimization(method[, ...args])
-
-Force V8 to mark the `method` for optimization with the native function
-`%OptimizeFunctionOnNextCall()` and return the optimization status
-after that.
-
-It can be used to prevent the benchmark from getting disrupted by the optimizer
-kicking in halfway through. However, this could result in a less effective
-optimization. In general, only use it if you know what it actually does.
diff --git a/benchmark/buffers/buffer-compare-instance-method.js b/benchmark/buffers/buffer-compare-instance-method.js
index bb07326f3de218..ff3bc4c1abda98 100644
--- a/benchmark/buffers/buffer-compare-instance-method.js
+++ b/benchmark/buffers/buffer-compare-instance-method.js
@@ -1,6 +1,5 @@
 'use strict';
 const common = require('../common.js');
-const v8 = require('v8');
 
 const bench = common.createBenchmark(main, {
   size: [16, 512, 1024, 4096, 16386],
@@ -20,7 +19,6 @@ function main(conf) {
 
   b1[size - 1] = 'b'.charCodeAt(0);
 
-  // Force optimization before starting the benchmark
   switch (args) {
     case 2:
       b0.compare(b1, 0);
@@ -37,8 +35,6 @@ function main(conf) {
     default:
       b0.compare(b1);
   }
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(b0.compare)');
   switch (args) {
     case 2:
       b0.compare(b1, 0);
diff --git a/benchmark/buffers/buffer-compare-offset.js b/benchmark/buffers/buffer-compare-offset.js
index 17b36f82883426..fd8c96dbce0158 100644
--- a/benchmark/buffers/buffer-compare-offset.js
+++ b/benchmark/buffers/buffer-compare-offset.js
@@ -1,6 +1,5 @@
 'use strict';
 const common = require('../common.js');
-const v8 = require('v8');
 
 const bench = common.createBenchmark(main, {
   method: ['offset', 'slice'],
@@ -9,18 +8,6 @@ const bench = common.createBenchmark(main, {
 });
 
 function compareUsingSlice(b0, b1, len, iter) {
-
-  // Force optimization before starting the benchmark
-  Buffer.compare(b0.slice(1, len), b1.slice(1, len));
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(Buffer.compare)');
-  eval('%OptimizeFunctionOnNextCall(b0.slice)');
-  eval('%OptimizeFunctionOnNextCall(b1.slice)');
-  Buffer.compare(b0.slice(1, len), b1.slice(1, len));
-  doCompareUsingSlice(b0, b1, len, iter);
-}
-
-function doCompareUsingSlice(b0, b1, len, iter) {
   var i;
   bench.start();
   for (i = 0; i < iter; i++)
@@ -29,16 +16,6 @@ function doCompareUsingSlice(b0, b1, len, iter) {
 }
 
 function compareUsingOffset(b0, b1, len, iter) {
-  len = len + 1;
-  // Force optimization before starting the benchmark
-  b0.compare(b1, 1, len, 1, len);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(b0.compare)');
-  b0.compare(b1, 1, len, 1, len);
-  doCompareUsingOffset(b0, b1, len, iter);
-}
-
-function doCompareUsingOffset(b0, b1, len, iter) {
   var i;
   bench.start();
   for (i = 0; i < iter; i++)
diff --git a/benchmark/buffers/buffer-swap.js b/benchmark/buffers/buffer-swap.js
index c6d7db470bc69a..71e08890910843 100644
--- a/benchmark/buffers/buffer-swap.js
+++ b/benchmark/buffers/buffer-swap.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common.js');
-const v8 = require('v8');
 
 const bench = common.createBenchmark(main, {
   aligned: ['true', 'false'],
@@ -81,9 +80,7 @@ function main(conf) {
   const buf = createBuffer(len, aligned === 'true');
   const bufferSwap = genMethod(method);
 
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(bufferSwap)');
-
+  bufferSwap(n, buf);
   bench.start();
   bufferSwap(n, buf);
   bench.end(n);
diff --git a/benchmark/child_process/child-process-params.js b/benchmark/child_process/child-process-params.js
new file mode 100644
index 00000000000000..644b2136a0f03f
--- /dev/null
+++ b/benchmark/child_process/child-process-params.js
@@ -0,0 +1,146 @@
+'use strict';
+
+const common = require('../common.js');
+const cp = require('child_process');
+
+const command = 'echo';
+const args = ['hello'];
+const options = {};
+const cb = () => {};
+
+const configs = {
+  n: [1e3],
+  methodName: [
+    'exec', 'execSync',
+    'execFile', 'execFileSync',
+    'spawn', 'spawnSync',
+  ],
+  params: [1, 2, 3, 4],
+};
+
+const bench = common.createBenchmark(main, configs);
+
+function main(conf) {
+  const n = +conf.n;
+  const methodName = conf.methodName;
+  const params = +conf.params;
+
+  const method = cp[methodName];
+
+  switch (methodName) {
+    case 'exec':
+      switch (params) {
+        case 1:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command).kill();
+          bench.end(n);
+          break;
+        case 2:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, options).kill();
+          bench.end(n);
+          break;
+        case 3:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, options, cb).kill();
+          bench.end(n);
+          break;
+      }
+      break;
+    case 'execSync':
+      switch (params) {
+        case 1:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command);
+          bench.end(n);
+          break;
+        case 2:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, options);
+          bench.end(n);
+          break;
+      }
+      break;
+    case 'execFile':
+      switch (params) {
+        case 1:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command).kill();
+          bench.end(n);
+          break;
+        case 2:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, args).kill();
+          bench.end(n);
+          break;
+        case 3:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, args, options).kill();
+          bench.end(n);
+          break;
+        case 4:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, args, options, cb).kill();
+          bench.end(n);
+          break;
+      }
+      break;
+    case 'execFileSync':
+      switch (params) {
+        case 1:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command);
+          bench.end(n);
+          break;
+        case 2:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, args);
+          bench.end(n);
+          break;
+        case 3:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, args, options);
+          bench.end(n);
+          break;
+      }
+      break;
+    case 'spawn':
+      switch (params) {
+        case 1:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command).kill();
+          bench.end(n);
+          break;
+        case 2:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, args).kill();
+          bench.end(n);
+          break;
+        case 3:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, args, options).kill();
+          bench.end(n);
+          break;
+      }
+      break;
+    case 'spawnSync':
+      switch (params) {
+        case 1:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command);
+          bench.end(n);
+          break;
+        case 2:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, args);
+          bench.end(n);
+          break;
+        case 3:
+          bench.start();
+          for (let i = 0; i < n; i++) method(command, args, options);
+          bench.end(n);
+          break;
+      }
+      break;
+  }
+}
diff --git a/benchmark/common.js b/benchmark/common.js
index 6a9b2ba0f71681..7ce180fdb7ff0a 100644
--- a/benchmark/common.js
+++ b/benchmark/common.js
@@ -229,17 +229,3 @@ Benchmark.prototype.report = function(rate, elapsed) {
     type: 'report'
   });
 };
-
-exports.v8ForceOptimization = function(method) {
-  if (typeof method !== 'function')
-    return;
-
-  const v8 = require('v8');
-  v8.setFlagsFromString('--allow_natives_syntax');
-
-  const args = Array.prototype.slice.call(arguments, 1);
-  method.apply(null, args);
-  eval('%OptimizeFunctionOnNextCall(method)');
-  method.apply(null, args);
-  return eval('%GetOptimizationStatus(method)');
-};
diff --git a/benchmark/crypto/get-ciphers.js b/benchmark/crypto/get-ciphers.js
index 257c9af2fd531e..3f5ad17ad38716 100644
--- a/benchmark/crypto/get-ciphers.js
+++ b/benchmark/crypto/get-ciphers.js
@@ -12,9 +12,12 @@ function main(conf) {
   const v = conf.v;
   const method = require(v).getCiphers;
   var i = 0;
-
-  common.v8ForceOptimization(method);
+  // first call to getChipers will dominate the results
+  if (n > 1) {
+    for (; i < n; i++)
+      method();
+  }
   bench.start();
-  for (; i < n; i++) method();
+  for (i = 0; i < n; i++) method();
   bench.end(n);
 }
diff --git a/benchmark/es/defaultparams-bench.js b/benchmark/es/defaultparams-bench.js
index 1b962cfb39333f..56d04cd95bb454 100644
--- a/benchmark/es/defaultparams-bench.js
+++ b/benchmark/es/defaultparams-bench.js
@@ -22,8 +22,6 @@ function defaultParams(x = 1, y = 2) {
 
 function runOldStyleDefaults(n) {
 
-  common.v8ForceOptimization(oldStyleDefaults);
-
   var i = 0;
   bench.start();
   for (; i < n; i++)
@@ -33,8 +31,6 @@ function runOldStyleDefaults(n) {
 
 function runDefaultParams(n) {
 
-  common.v8ForceOptimization(defaultParams);
-
   var i = 0;
   bench.start();
   for (; i < n; i++)
diff --git a/benchmark/es/foreach-bench.js b/benchmark/es/foreach-bench.js
new file mode 100644
index 00000000000000..fea5318bc6669b
--- /dev/null
+++ b/benchmark/es/foreach-bench.js
@@ -0,0 +1,82 @@
+'use strict';
+
+const common = require('../common.js');
+
+const bench = common.createBenchmark(main, {
+  method: ['for', 'for-of', 'for-in', 'forEach'],
+  count: [5, 10, 20, 100],
+  millions: [5]
+});
+
+function useFor(n, items, count) {
+  var i, j;
+  bench.start();
+  for (i = 0; i < n; i++) {
+    for (j = 0; j < count; j++) {
+      /* eslint-disable no-unused-vars */
+      var item = items[j];
+      /* esline-enable no-unused-vars */
+    }
+  }
+  bench.end(n / 1e6);
+}
+
+function useForOf(n, items) {
+  var i, item;
+  bench.start();
+  for (i = 0; i < n; i++) {
+    for (item of items) {}
+  }
+  bench.end(n / 1e6);
+}
+
+function useForIn(n, items) {
+  var i, j, item;
+  bench.start();
+  for (i = 0; i < n; i++) {
+    for (j in items) {
+      /* eslint-disable no-unused-vars */
+      item = items[j];
+      /* esline-enable no-unused-vars */
+    }
+  }
+  bench.end(n / 1e6);
+}
+
+function useForEach(n, items) {
+  var i;
+  bench.start();
+  for (i = 0; i < n; i++) {
+    items.forEach((item) => {});
+  }
+  bench.end(n / 1e6);
+}
+
+function main(conf) {
+  const n = +conf.millions * 1e6;
+  const count = +conf.count;
+
+  const items = new Array(count);
+  var i;
+  var fn;
+  for (i = 0; i < count; i++)
+    items[i] = i;
+
+  switch (conf.method) {
+    case 'for':
+      fn = useFor;
+      break;
+    case 'for-of':
+      fn = useForOf;
+      break;
+    case 'for-in':
+      fn = useForIn;
+      break;
+    case 'forEach':
+      fn = useForEach;
+      break;
+    default:
+      throw new Error('Unexpected method');
+  }
+  fn(n, items, count);
+}
diff --git a/benchmark/es/restparams-bench.js b/benchmark/es/restparams-bench.js
index 0ff9c48dedc490..f5c49dd969b40a 100644
--- a/benchmark/es/restparams-bench.js
+++ b/benchmark/es/restparams-bench.js
@@ -35,8 +35,6 @@ function useArguments() {
 
 function runCopyArguments(n) {
 
-  common.v8ForceOptimization(copyArguments, 1, 2, 'a', 'b');
-
   var i = 0;
   bench.start();
   for (; i < n; i++)
@@ -46,8 +44,6 @@ function runCopyArguments(n) {
 
 function runRestArguments(n) {
 
-  common.v8ForceOptimization(restArguments, 1, 2, 'a', 'b');
-
   var i = 0;
   bench.start();
   for (; i < n; i++)
@@ -57,8 +53,6 @@ function runRestArguments(n) {
 
 function runUseArguments(n) {
 
-  common.v8ForceOptimization(useArguments, 1, 2, 'a', 'b');
-
   var i = 0;
   bench.start();
   for (; i < n; i++)
diff --git a/benchmark/misc/console.js b/benchmark/misc/console.js
index 9a08a411c51f82..9c5aec0eeeb5fa 100644
--- a/benchmark/misc/console.js
+++ b/benchmark/misc/console.js
@@ -4,9 +4,6 @@ const common = require('../common.js');
 const assert = require('assert');
 const Writable = require('stream').Writable;
 const util = require('util');
-const v8 = require('v8');
-
-v8.setFlagsFromString('--allow_natives_syntax');
 
 const methods = [
   'restAndSpread',
@@ -51,14 +48,7 @@ function usingArgumentsAndApplyC() {
   nullStream.write(util.format.apply(null, arguments) + '\n');
 }
 
-function optimize(method, ...args) {
-  method(...args);
-  eval(`%OptimizeFunctionOnNextCall(${method.name})`);
-  method(...args);
-}
-
 function runUsingRestAndConcat(n) {
-  optimize(usingRestAndConcat, 'a', 1);
 
   var i = 0;
   bench.start();
@@ -70,7 +60,6 @@ function runUsingRestAndConcat(n) {
 function runUsingRestAndSpread(n, concat) {
 
   const method = concat ? usingRestAndSpreadC : usingRestAndSpreadTS;
-  optimize(method, 'this is %s of %d', 'a', 1);
 
   var i = 0;
   bench.start();
@@ -82,7 +71,6 @@ function runUsingRestAndSpread(n, concat) {
 function runUsingRestAndApply(n, concat) {
 
   const method = concat ? usingRestAndApplyC : usingRestAndApplyTS;
-  optimize(method, 'this is %s of %d', 'a', 1);
 
   var i = 0;
   bench.start();
@@ -94,7 +82,6 @@ function runUsingRestAndApply(n, concat) {
 function runUsingArgumentsAndApply(n, concat) {
 
   const method = concat ? usingArgumentsAndApplyC : usingArgumentsAndApplyTS;
-  optimize(method, 'this is %s of %d', 'a', 1);
 
   var i = 0;
   bench.start();
diff --git a/benchmark/misc/punycode.js b/benchmark/misc/punycode.js
index f4d22557ac5d65..74ddadbb9daa6c 100644
--- a/benchmark/misc/punycode.js
+++ b/benchmark/misc/punycode.js
@@ -42,16 +42,16 @@ function usingICU(val) {
 }
 
 function runPunycode(n, val) {
-  common.v8ForceOptimization(usingPunycode, val);
   var i = 0;
-  bench.start();
   for (; i < n; i++)
     usingPunycode(val);
+  bench.start();
+  for (i = 0; i < n; i++)
+    usingPunycode(val);
   bench.end(n);
 }
 
 function runICU(n, val) {
-  common.v8ForceOptimization(usingICU, val);
   var i = 0;
   bench.start();
   for (; i < n; i++)
diff --git a/benchmark/misc/util-extend-vs-object-assign.js b/benchmark/misc/util-extend-vs-object-assign.js
index caea42ce914cf5..41c15d7d2caa0c 100644
--- a/benchmark/misc/util-extend-vs-object-assign.js
+++ b/benchmark/misc/util-extend-vs-object-assign.js
@@ -2,7 +2,6 @@
 
 const common = require('../common.js');
 const util = require('util');
-const v8 = require('v8');
 
 const bench = common.createBenchmark(main, {
   type: ['extend', 'assign'],
@@ -12,15 +11,11 @@ const bench = common.createBenchmark(main, {
 function main(conf) {
   let fn;
   const n = conf.n | 0;
-  let v8command;
 
   if (conf.type === 'extend') {
     fn = util._extend;
-    v8command = '%OptimizeFunctionOnNextCall(util._extend)';
   } else if (conf.type === 'assign') {
     fn = Object.assign;
-    // Object.assign is built-in, cannot be optimized
-    v8command = '';
   }
 
   // Force-optimize the method to test so that the benchmark doesn't
@@ -28,9 +23,6 @@ function main(conf) {
   for (var i = 0; i < conf.type.length * 10; i += 1)
     fn({}, process.env);
 
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval(v8command);
-
   var obj = new Proxy({}, { set: function(a, b, c) { return true; } });
 
   bench.start();
diff --git a/benchmark/path/basename-posix.js b/benchmark/path/basename-posix.js
index 64da9017793440..fc983c8074c940 100644
--- a/benchmark/path/basename-posix.js
+++ b/benchmark/path/basename-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   pathext: [
@@ -30,12 +29,6 @@ function main(conf) {
     input = input.slice(0, extIdx);
   }
 
-  // Force optimization before starting the benchmark
-  p.basename(input, ext);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.basename)');
-  p.basename(input, ext);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.basename(input, ext);
diff --git a/benchmark/path/basename-win32.js b/benchmark/path/basename-win32.js
index a6214598790033..b493beb87c9e94 100644
--- a/benchmark/path/basename-win32.js
+++ b/benchmark/path/basename-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   pathext: [
@@ -30,12 +29,6 @@ function main(conf) {
     input = input.slice(0, extIdx);
   }
 
-  // Force optimization before starting the benchmark
-  p.basename(input, ext);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.basename)');
-  p.basename(input, ext);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.basename(input, ext);
diff --git a/benchmark/path/dirname-posix.js b/benchmark/path/dirname-posix.js
index e7ea80ffa313c8..af77be5ac06559 100644
--- a/benchmark/path/dirname-posix.js
+++ b/benchmark/path/dirname-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -21,12 +20,6 @@ function main(conf) {
   var p = path.posix;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.dirname(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.dirname)');
-  p.dirname(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.dirname(input);
diff --git a/benchmark/path/dirname-win32.js b/benchmark/path/dirname-win32.js
index 5cb0829437c2ed..01d97d08e2ae05 100644
--- a/benchmark/path/dirname-win32.js
+++ b/benchmark/path/dirname-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -21,12 +20,6 @@ function main(conf) {
   var p = path.win32;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.dirname(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.dirname)');
-  p.dirname(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.dirname(input);
diff --git a/benchmark/path/extname-posix.js b/benchmark/path/extname-posix.js
index 61a1073158f8d3..50c4e8f7927ba6 100644
--- a/benchmark/path/extname-posix.js
+++ b/benchmark/path/extname-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -24,12 +23,6 @@ function main(conf) {
   var p = path.posix;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.extname(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.extname)');
-  p.extname(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.extname(input);
diff --git a/benchmark/path/extname-win32.js b/benchmark/path/extname-win32.js
index 67e53eab85817f..9c0df13ab46105 100644
--- a/benchmark/path/extname-win32.js
+++ b/benchmark/path/extname-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -24,12 +23,6 @@ function main(conf) {
   var p = path.win32;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.extname(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.extname)');
-  p.extname(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.extname(input);
diff --git a/benchmark/path/format-posix.js b/benchmark/path/format-posix.js
index b30b58be4118f0..ee78a6d5f30980 100644
--- a/benchmark/path/format-posix.js
+++ b/benchmark/path/format-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   props: [
@@ -22,12 +21,6 @@ function main(conf) {
     name: props[4] || '',
   };
 
-  // Force optimization before starting the benchmark
-  p.format(obj);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.format)');
-  p.format(obj);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.format(obj);
diff --git a/benchmark/path/format-win32.js b/benchmark/path/format-win32.js
index 7404f2e93e6868..9ec981d6310ed6 100644
--- a/benchmark/path/format-win32.js
+++ b/benchmark/path/format-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   props: [
@@ -22,12 +21,6 @@ function main(conf) {
     name: props[4] || '',
   };
 
-  // Force optimization before starting the benchmark
-  p.format(obj);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.format)');
-  p.format(obj);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.format(obj);
diff --git a/benchmark/path/isAbsolute-posix.js b/benchmark/path/isAbsolute-posix.js
index fb8956c073b9db..22db751100ceee 100644
--- a/benchmark/path/isAbsolute-posix.js
+++ b/benchmark/path/isAbsolute-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -19,12 +18,6 @@ function main(conf) {
   var p = path.posix;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.isAbsolute(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.isAbsolute)');
-  p.isAbsolute(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.isAbsolute(input);
diff --git a/benchmark/path/isAbsolute-win32.js b/benchmark/path/isAbsolute-win32.js
index 57fb8b8999e838..a565da8e566f8f 100644
--- a/benchmark/path/isAbsolute-win32.js
+++ b/benchmark/path/isAbsolute-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -20,12 +19,6 @@ function main(conf) {
   var p = path.win32;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.isAbsolute(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.isAbsolute)');
-  p.isAbsolute(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.isAbsolute(input);
diff --git a/benchmark/path/join-posix.js b/benchmark/path/join-posix.js
index 1222f4050aa6ab..a7cf3772522daa 100644
--- a/benchmark/path/join-posix.js
+++ b/benchmark/path/join-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   paths: [
@@ -15,12 +14,6 @@ function main(conf) {
   var p = path.posix;
   var args = ('' + conf.paths).split('|');
 
-  // Force optimization before starting the benchmark
-  p.join.apply(null, args);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.join)');
-  p.join.apply(null, args);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.join.apply(null, args);
diff --git a/benchmark/path/join-win32.js b/benchmark/path/join-win32.js
index 86801859d56c3b..18c1e802a6bff1 100644
--- a/benchmark/path/join-win32.js
+++ b/benchmark/path/join-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   paths: [
@@ -15,12 +14,6 @@ function main(conf) {
   var p = path.win32;
   var args = ('' + conf.paths).split('|');
 
-  // Force optimization before starting the benchmark
-  p.join.apply(null, args);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.join)');
-  p.join.apply(null, args);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.join.apply(null, args);
diff --git a/benchmark/path/makeLong-win32.js b/benchmark/path/makeLong-win32.js
index d4b29d7e709b3e..fe5da425a5cd73 100644
--- a/benchmark/path/makeLong-win32.js
+++ b/benchmark/path/makeLong-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -18,12 +17,6 @@ function main(conf) {
   var p = path.win32;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p._makeLong(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p._makeLong)');
-  p._makeLong(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p._makeLong(input);
diff --git a/benchmark/path/normalize-posix.js b/benchmark/path/normalize-posix.js
index 19d6461ca51dcf..aec703cbe21242 100644
--- a/benchmark/path/normalize-posix.js
+++ b/benchmark/path/normalize-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -20,12 +19,6 @@ function main(conf) {
   var p = path.posix;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.normalize(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.normalize)');
-  p.normalize(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.normalize(input);
diff --git a/benchmark/path/normalize-win32.js b/benchmark/path/normalize-win32.js
index 119f9797681113..356d399c3513ab 100644
--- a/benchmark/path/normalize-win32.js
+++ b/benchmark/path/normalize-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -20,12 +19,6 @@ function main(conf) {
   var p = path.win32;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.normalize(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.normalize)');
-  p.normalize(input);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.normalize(input);
diff --git a/benchmark/path/parse-posix.js b/benchmark/path/parse-posix.js
index ee4306fcd27496..997eec0452b74a 100644
--- a/benchmark/path/parse-posix.js
+++ b/benchmark/path/parse-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -21,15 +20,12 @@ function main(conf) {
   var p = path.posix;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.parse(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.parse)');
-  p.parse(input);
-
-  bench.start();
   for (var i = 0; i < n; i++) {
     p.parse(input);
   }
+  bench.start();
+  for (i = 0; i < n; i++) {
+    p.parse(input);
+  }
   bench.end(n);
 }
diff --git a/benchmark/path/parse-win32.js b/benchmark/path/parse-win32.js
index 5a7b80f0ddb3da..2a95f758665377 100644
--- a/benchmark/path/parse-win32.js
+++ b/benchmark/path/parse-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   path: [
@@ -22,15 +21,12 @@ function main(conf) {
   var p = path.win32;
   var input = '' + conf.path;
 
-  // Force optimization before starting the benchmark
-  p.parse(input);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.parse)');
-  p.parse(input);
-
-  bench.start();
   for (var i = 0; i < n; i++) {
     p.parse(input);
   }
+  bench.start();
+  for (i = 0; i < n; i++) {
+    p.parse(input);
+  }
   bench.end(n);
 }
diff --git a/benchmark/path/relative-posix.js b/benchmark/path/relative-posix.js
index 7544fb2dc67e7d..492b73c3e89f8a 100644
--- a/benchmark/path/relative-posix.js
+++ b/benchmark/path/relative-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   paths: [
@@ -26,15 +25,12 @@ function main(conf) {
     to = from.slice(delimIdx + 1);
     from = from.slice(0, delimIdx);
   }
-
-  // Force optimization before starting the benchmark
-  p.relative(from, to);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.relative)');
-  p.relative(from, to);
+  for (var i = 0; i < n; i++) {
+    p.relative(from, to);
+  }
 
   bench.start();
-  for (var i = 0; i < n; i++) {
+  for (i = 0; i < n; i++) {
     p.relative(from, to);
   }
   bench.end(n);
diff --git a/benchmark/path/relative-win32.js b/benchmark/path/relative-win32.js
index 92531959c1c3aa..7e7620299eb16c 100644
--- a/benchmark/path/relative-win32.js
+++ b/benchmark/path/relative-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   paths: [
@@ -25,14 +24,13 @@ function main(conf) {
     from = from.slice(0, delimIdx);
   }
 
-  // Force optimization before starting the benchmark
-  p.relative(from, to);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.relative)');
-  p.relative(from, to);
+  // Warmup
+  for (var i = 0; i < n; i++) {
+    p.relative(from, to);
+  }
 
   bench.start();
-  for (var i = 0; i < n; i++) {
+  for (i = 0; i < n; i++) {
     p.relative(from, to);
   }
   bench.end(n);
diff --git a/benchmark/path/resolve-posix.js b/benchmark/path/resolve-posix.js
index 93e5b82191a23a..d1364a8ac256c9 100644
--- a/benchmark/path/resolve-posix.js
+++ b/benchmark/path/resolve-posix.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   paths: [
@@ -18,12 +17,6 @@ function main(conf) {
   var p = path.posix;
   var args = ('' + conf.paths).split('|');
 
-  // Force optimization before starting the benchmark
-  p.resolve.apply(null, args);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.resolve)');
-  p.resolve.apply(null, args);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.resolve.apply(null, args);
diff --git a/benchmark/path/resolve-win32.js b/benchmark/path/resolve-win32.js
index dc0eb30e930049..6dfb38167c96bd 100644
--- a/benchmark/path/resolve-win32.js
+++ b/benchmark/path/resolve-win32.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var path = require('path');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   paths: [
@@ -18,12 +17,6 @@ function main(conf) {
   var p = path.win32;
   var args = ('' + conf.paths).split('|');
 
-  // Force optimization before starting the benchmark
-  p.resolve.apply(null, args);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(p.resolve)');
-  p.resolve.apply(null, args);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     p.resolve.apply(null, args);
diff --git a/benchmark/querystring/querystring-parse.js b/benchmark/querystring/querystring-parse.js
index 2e2ec1417bcd35..888ce6320a30d9 100644
--- a/benchmark/querystring/querystring-parse.js
+++ b/benchmark/querystring/querystring-parse.js
@@ -1,8 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var querystring = require('querystring');
-var v8 = require('v8');
-
 var inputs = require('../fixtures/url-inputs.js').searchParams;
 
 var bench = common.createBenchmark(main, {
@@ -14,21 +12,18 @@ function main(conf) {
   var type = conf.type;
   var n = conf.n | 0;
   var input = inputs[type];
+  var i;
 
-  // Force-optimize querystring.parse() so that the benchmark doesn't get
+  // Optimize querystring.parse() so that the benchmark doesn't get
   // disrupted by the optimizer kicking in halfway through.
-  v8.setFlagsFromString('--allow_natives_syntax');
   if (type !== 'multicharsep') {
-    querystring.parse(input);
-    eval('%OptimizeFunctionOnNextCall(querystring.parse)');
-    querystring.parse(input);
+    for (i = 0; i < n; i += 1)
+      querystring.parse(input);
   } else {
-    querystring.parse(input, '&&&&&&&&&&');
-    eval('%OptimizeFunctionOnNextCall(querystring.parse)');
-    querystring.parse(input, '&&&&&&&&&&');
+    for (i = 0; i < n; i += 1)
+      querystring.parse(input, '&&&&&&&&&&');
   }
 
-  var i;
   if (type !== 'multicharsep') {
     bench.start();
     for (i = 0; i < n; i += 1)
diff --git a/benchmark/querystring/querystring-stringify.js b/benchmark/querystring/querystring-stringify.js
index 5870a690555a0a..7e31a49e99e54c 100644
--- a/benchmark/querystring/querystring-stringify.js
+++ b/benchmark/querystring/querystring-stringify.js
@@ -1,7 +1,6 @@
 'use strict';
 var common = require('../common.js');
 var querystring = require('querystring');
-var v8 = require('v8');
 
 var bench = common.createBenchmark(main, {
   type: ['noencode', 'encodemany', 'encodelast'],
@@ -36,10 +35,6 @@ function main(conf) {
   for (var name in inputs)
     querystring.stringify(inputs[name]);
 
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(querystring.stringify)');
-  querystring.stringify(input);
-
   bench.start();
   for (var i = 0; i < n; i += 1)
     querystring.stringify(input);
diff --git a/benchmark/streams/readable-bigread.js b/benchmark/streams/readable-bigread.js
index 50f10c44119141..34d478fb478478 100644
--- a/benchmark/streams/readable-bigread.js
+++ b/benchmark/streams/readable-bigread.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common');
-const v8 = require('v8');
 const Readable = require('stream').Readable;
 
 const bench = common.createBenchmark(main, {
@@ -15,13 +14,6 @@ function main(conf) {
   function noop() {}
   s._read = noop;
 
-  // Force optimization before starting the benchmark
-  s.push(b);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(s.read)');
-  s.push(b);
-  while (s.read(128));
-
   bench.start();
   for (var k = 0; k < n; ++k) {
     for (var i = 0; i < 1e4; ++i)
diff --git a/benchmark/streams/readable-bigunevenread.js b/benchmark/streams/readable-bigunevenread.js
index ce6e41c5d30eac..d176166ae4f432 100644
--- a/benchmark/streams/readable-bigunevenread.js
+++ b/benchmark/streams/readable-bigunevenread.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common');
-const v8 = require('v8');
 const Readable = require('stream').Readable;
 
 const bench = common.createBenchmark(main, {
@@ -15,13 +14,6 @@ function main(conf) {
   function noop() {}
   s._read = noop;
 
-  // Force optimization before starting the benchmark
-  s.push(b);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(s.read)');
-  s.push(b);
-  while (s.read(106));
-
   bench.start();
   for (var k = 0; k < n; ++k) {
     for (var i = 0; i < 1e4; ++i)
diff --git a/benchmark/streams/readable-boundaryread.js b/benchmark/streams/readable-boundaryread.js
index 93a6616361ba18..1a0b7eb7ac9ddc 100644
--- a/benchmark/streams/readable-boundaryread.js
+++ b/benchmark/streams/readable-boundaryread.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common');
-const v8 = require('v8');
 const Readable = require('stream').Readable;
 
 const bench = common.createBenchmark(main, {
@@ -15,14 +14,6 @@ function main(conf) {
   function noop() {}
   s._read = noop;
 
-  // Force optimization before starting the benchmark
-  s.push(b);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(s.push)');
-  eval('%OptimizeFunctionOnNextCall(s.read)');
-  s.push(b);
-  while (s.read(32));
-
   bench.start();
   for (var k = 0; k < n; ++k) {
     for (var i = 0; i < 1e4; ++i)
diff --git a/benchmark/streams/readable-readall.js b/benchmark/streams/readable-readall.js
index 07626fd7978b9a..be34afbeabc090 100644
--- a/benchmark/streams/readable-readall.js
+++ b/benchmark/streams/readable-readall.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common');
-const v8 = require('v8');
 const Readable = require('stream').Readable;
 
 const bench = common.createBenchmark(main, {
@@ -15,13 +14,6 @@ function main(conf) {
   function noop() {}
   s._read = noop;
 
-  // Force optimization before starting the benchmark
-  s.push(b);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(s.read)');
-  s.push(b);
-  while (s.read());
-
   bench.start();
   for (var k = 0; k < n; ++k) {
     for (var i = 0; i < 1e4; ++i)
diff --git a/benchmark/streams/readable-unevenread.js b/benchmark/streams/readable-unevenread.js
index 4a69bd97a94bcf..ebbc727ad23ec3 100644
--- a/benchmark/streams/readable-unevenread.js
+++ b/benchmark/streams/readable-unevenread.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common');
-const v8 = require('v8');
 const Readable = require('stream').Readable;
 
 const bench = common.createBenchmark(main, {
@@ -15,13 +14,6 @@ function main(conf) {
   function noop() {}
   s._read = noop;
 
-  // Force optimization before starting the benchmark
-  s.push(b);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(s.read)');
-  s.push(b);
-  while (s.read(12));
-
   bench.start();
   for (var k = 0; k < n; ++k) {
     for (var i = 0; i < 1e4; ++i)
diff --git a/benchmark/tls/convertprotocols.js b/benchmark/tls/convertprotocols.js
index 32da0fe6fde271..5d561455051a0c 100644
--- a/benchmark/tls/convertprotocols.js
+++ b/benchmark/tls/convertprotocols.js
@@ -12,8 +12,11 @@ function main(conf) {
 
   var i = 0;
   var m = {};
-  common.v8ForceOptimization(
-    tls.convertNPNProtocols, ['ABC', 'XYZ123', 'FOO'], m);
+  // First call dominates results
+  if (n > 1) {
+    tls.convertNPNProtocols(['ABC', 'XYZ123', 'FOO'], m);
+    m = {};
+  }
   bench.start();
   for (; i < n; i++) tls.convertNPNProtocols(['ABC', 'XYZ123', 'FOO'], m);
   bench.end(n);
diff --git a/benchmark/url/url-format.js b/benchmark/url/url-format.js
index 886958406b91c5..771786d3350513 100644
--- a/benchmark/url/url-format.js
+++ b/benchmark/url/url-format.js
@@ -1,7 +1,6 @@
 'use strict';
 const common = require('../common.js');
 const url = require('url');
-const v8 = require('v8');
 
 const inputs = {
   slashes: {slashes: true, host: 'localhost'},
@@ -24,9 +23,6 @@ function main(conf) {
   for (const name in inputs)
     url.format(inputs[name]);
 
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(url.format)');
-
   bench.start();
   for (var i = 0; i < n; i += 1)
     url.format(input);
diff --git a/benchmark/url/url-resolve.js b/benchmark/url/url-resolve.js
index 4335511ca6d2df..421a70ef6d59f1 100644
--- a/benchmark/url/url-resolve.js
+++ b/benchmark/url/url-resolve.js
@@ -1,7 +1,6 @@
 'use strict';
 const common = require('../common.js');
 const url = require('url');
-const v8 = require('v8');
 const hrefs = require('../fixtures/url-inputs.js').urls;
 hrefs.noscheme = 'some.ran/dom/url.thing?oh=yes#whoo';
 
@@ -24,12 +23,6 @@ function main(conf) {
   const href = hrefs[conf.href];
   const path = paths[conf.path];
 
-  // Force-optimize url.resolve() so that the benchmark doesn't get
-  // disrupted by the optimizer kicking in halfway through.
-  url.resolve(href, path);
-  v8.setFlagsFromString('--allow_natives_syntax');
-  eval('%OptimizeFunctionOnNextCall(url.resolve)');
-
   bench.start();
   for (var i = 0; i < n; i += 1)
     url.resolve(href, path);
diff --git a/benchmark/util/format.js b/benchmark/util/format.js
index 8040554ba0861a..82e25b4c4c8127 100644
--- a/benchmark/util/format.js
+++ b/benchmark/util/format.js
@@ -2,7 +2,6 @@
 
 const util = require('util');
 const common = require('../common');
-const v8 = require('v8');
 const types = [
   'string',
   'number',
@@ -29,12 +28,6 @@ function main(conf) {
 
   const input = inputs[type];
 
-  v8.setFlagsFromString('--allow_natives_syntax');
-
-  util.format(input[0], input[1]);
-  eval('%OptimizeFunctionOnNextCall(util.format)');
-  util.format(input[0], input[1]);
-
   bench.start();
   for (var i = 0; i < n; i++) {
     util.format(input[0], input[1]);
diff --git a/common.gypi b/common.gypi
index 3aad8e7722d57b..147cc70fa5d5df 100644
--- a/common.gypi
+++ b/common.gypi
@@ -43,7 +43,7 @@
         'v8_postmortem_support%': 'true',
       }],
       ['OS== "mac"', {
-        'OBJ_DIR': '<(PRODUCT_DIR)/obj',
+        'OBJ_DIR': '<(PRODUCT_DIR)/obj.target',
         'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
       }, {
         'conditions': [
diff --git a/deps/node-inspect/CHANGELOG.md b/deps/node-inspect/CHANGELOG.md
index 0a7ba1be94fb50..dc217a5ba2d564 100644
--- a/deps/node-inspect/CHANGELOG.md
+++ b/deps/node-inspect/CHANGELOG.md
@@ -1,3 +1,30 @@
+### 1.10.6
+
+* chore: Fix usage text for embedded mode - **[@addaleax](https://github.com/addaleax)** [#20](https://github.com/nodejs/node-inspect/pull/20)
+  - [`b0779f5`](https://github.com/nodejs/node-inspect/commit/b0779f597104e9ada5681f64d7e714525b753511) **chore:** Fix usage text for embedded mode
+* print 'ok' after connection - **[@ofrobots](https://github.com/ofrobots)** [#25](https://github.com/nodejs/node-inspect/pull/25)
+  - [`2a47125`](https://github.com/nodejs/node-inspect/commit/2a4712577f6996fbb078dcfcd7320c397685d76a) **fix:** print 'ok' after connection
+* Make autocompletion in REPL work - **[@aqrln](https://github.com/aqrln)** [#28](https://github.com/nodejs/node-inspect/pull/28)
+  - [`ccab737`](https://github.com/nodejs/node-inspect/commit/ccab737399249a8c2230ed6adfec579c7d724364) **fix:** Make autocompletion in REPL work
+* Remove console.error() statement - **[@aqrln](https://github.com/aqrln)** [#30](https://github.com/nodejs/node-inspect/pull/30)
+  - [`032b045`](https://github.com/nodejs/node-inspect/commit/032b045d4d73622c77b7ebcc26781c6ad98200b3) **style:** Remove console.error() statement
+* Take --debug-port into account - **[@jkrems](https://github.com/jkrems)** [#26](https://github.com/nodejs/node-inspect/pull/26)
+  - [`054d4b1`](https://github.com/nodejs/node-inspect/commit/054d4b10e65f12a3a4b10b4c0ab2a4768cc5e893) **fix:** Take --debug-port into account
+* Delay run until breakpoints are restored - **[@jkrems](https://github.com/jkrems)** [#34](https://github.com/nodejs/node-inspect/pull/34)
+  - [`802b88c`](https://github.com/nodejs/node-inspect/commit/802b88c8ad0a57608cb9e0cb4bf46ed683bb6344) **fix:** Delay run until breakpoints are restored
+  - [`2b93173`](https://github.com/nodejs/node-inspect/commit/2b93173d95e7f8b30d85603613cb2ae3b3ec18db) **fix:** Use single string for paused notice
+  - [`b4d5ee2`](https://github.com/nodejs/node-inspect/commit/b4d5ee2a3d25613b35a2e8e10a0eb75582cc5654) **fix:** Work around inconsistent handling of strict directive
+  - [`f6ccfc7`](https://github.com/nodejs/node-inspect/commit/f6ccfc7f4d00ad4fdf3b581b677f8d7f1699c44c) **fix:** Only restart after port is free
+  - [`8b101bf`](https://github.com/nodejs/node-inspect/commit/8b101bf669ca102df4980bfad3e0436ef1c2f1a4) **test:** Skip exact match on AIX
+* [`a4e4b6f`](https://github.com/nodejs/node-inspect/commit/a4e4b6feeba4dedfd2c89ef32f39e813314d3bbd) **chore:** Fix repo info in package.json
+
+
+### 1.10.5
+
+* docs: minor edits to governance docs - **[@joshgav](https://github.com/joshgav)** [#17](https://github.com/buggerjs/node-inspect/pull/17)
+  - [`a70fe04`](https://github.com/buggerjs/node-inspect/commit/a70fe04bdde9b7c74588685066291f9b11183328) **docs:** minor edits to governance docs
+
+
 ### 1.10.4
 
 * [`1c31bf7`](https://github.com/buggerjs/node-inspect/commit/1c31bf7d1b3ea1b424ae0662526596670cb506c9) **chore:** Support embedded mode
diff --git a/deps/node-inspect/CONTRIBUTING.md b/deps/node-inspect/CONTRIBUTING.md
index 08d333cce8321f..012d29471462de 100644
--- a/deps/node-inspect/CONTRIBUTING.md
+++ b/deps/node-inspect/CONTRIBUTING.md
@@ -4,8 +4,7 @@
 
 This document outlines some of the practices we care about.
 If you have any questions or suggestions about the process,
-feel free to [open an issue](#reporting-issues)
-.
+feel free to [open an issue](#reporting-issues).
 
 ## Code of Conduct
 
@@ -13,11 +12,10 @@ The [Node.js Code of Conduct][] applies to this repo.
 
 [Node.js Code of Conduct]: https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md
 
-## Code Contributions
+## Governance
 
-The nodereport project falls under the governance of the diagnostics
-working group which is documented in:
-https://github.com/nodejs/diagnostics/blob/master/GOVERNANCE.md.
+This project falls under the governance of the Node.js Diagnostics WG as
+described at <https://github.com/nodejs/diagnostics/blob/master/GOVERNANCE.md>.
 
 ## Developer's Certificate of Origin 1.1
 
@@ -51,7 +49,7 @@ By making a contribution to this project, I certify that:
 
 If you find any mistakes in the docs or a bug in the code,
 please [open an issue in Github](https://github.com/nodejs/node-inspect/issues/new) so we can look into it.
-You can also [create a PR](#contributing-code) fixing it yourself, or course.
+You can also [create a PR](#contributing-code) fixing it yourself of course.
 
 If you report a bug, please follow these guidelines:
 
@@ -67,7 +65,7 @@ If you report a bug, please follow these guidelines:
 
 For small documentation changes, you can use [Github's editing feature](https://help.github.com/articles/editing-files-in-another-user-s-repository/).
 The only thing to keep in mind is to prefix the commit message with "docs: ".
-The detault commit message generated by Github will lead to a failing CI build.
+The default commit message generated by Github will lead to a failing CI build.
 
 For larger updates to the documentation
 it might be better to follow the [instructions for contributing code below](#contributing-code).
diff --git a/deps/node-inspect/GOVERNANCE.md b/deps/node-inspect/GOVERNANCE.md
index 238c1b825837ac..20e333a247cbfd 100644
--- a/deps/node-inspect/GOVERNANCE.md
+++ b/deps/node-inspect/GOVERNANCE.md
@@ -1,5 +1,4 @@
 # node-inspect Project Governance
 
-The node-inspect project falls under the governance of the diagnostics
-working group which is documented in:
-https://github.com/nodejs/diagnostics/blob/master/GOVERNANCE.md.
+The node-inspect project is governed by the Node.js Diagnostics WG as described
+at <https://github.com/nodejs/diagnostics/blob/master/GOVERNANCE.md>.
diff --git a/deps/node-inspect/examples/alive.js b/deps/node-inspect/examples/alive.js
index 3cf557b053981e..c8ad157b452d11 100644
--- a/deps/node-inspect/examples/alive.js
+++ b/deps/node-inspect/examples/alive.js
@@ -1,4 +1,3 @@
-'use strict';
 let x = 0;
 function heartbeat() {
   ++x;
diff --git a/deps/node-inspect/examples/backtrace.js b/deps/node-inspect/examples/backtrace.js
index f5d71a14f96f86..f18b33ea5584b2 100644
--- a/deps/node-inspect/examples/backtrace.js
+++ b/deps/node-inspect/examples/backtrace.js
@@ -1,4 +1,3 @@
-'use strict';
 const { exports: moduleScoped } = module;
 
 function topFn(a, b = false) {
diff --git a/deps/node-inspect/examples/cjs/index.js b/deps/node-inspect/examples/cjs/index.js
index d5815e865999f7..0ace6d9b78591c 100644
--- a/deps/node-inspect/examples/cjs/index.js
+++ b/deps/node-inspect/examples/cjs/index.js
@@ -1,5 +1,5 @@
-'use strict';
+const fourty = 40;
 const { add } = require('./other');
 
-const sum = add(40, 2);
+const sum = add(fourty, 2);
 module.exports = sum;
diff --git a/deps/node-inspect/examples/cjs/other.js b/deps/node-inspect/examples/cjs/other.js
index efadaa18d26e6d..44a9a439bab987 100644
--- a/deps/node-inspect/examples/cjs/other.js
+++ b/deps/node-inspect/examples/cjs/other.js
@@ -1,4 +1,3 @@
-'use strict';
 exports.add = function add(a, b) {
   return a + b;
 };
diff --git a/deps/node-inspect/examples/exceptions.js b/deps/node-inspect/examples/exceptions.js
index 00c48ed31b5113..f57d48a48dffc8 100644
--- a/deps/node-inspect/examples/exceptions.js
+++ b/deps/node-inspect/examples/exceptions.js
@@ -1,4 +1,3 @@
-'use strict';
 let error = null;
 try {
   throw new Error('Caught');
diff --git a/deps/node-inspect/examples/three-lines.js b/deps/node-inspect/examples/three-lines.js
index 4e1cb95d1130b8..c17c7c1ddcfe58 100644
--- a/deps/node-inspect/examples/three-lines.js
+++ b/deps/node-inspect/examples/three-lines.js
@@ -1,4 +1,3 @@
-'use strict';
 let x = 1;
 x = x + 1;
 module.exports = x;
diff --git a/deps/node-inspect/examples/use-strict.js b/deps/node-inspect/examples/use-strict.js
new file mode 100644
index 00000000000000..9fe4b8f3b42f57
--- /dev/null
+++ b/deps/node-inspect/examples/use-strict.js
@@ -0,0 +1,2 @@
+'use strict';
+console.log('first real line');
diff --git a/deps/node-inspect/lib/_inspect.js b/deps/node-inspect/lib/_inspect.js
index 5cd1cc2d685a90..ac32e0a6a432fa 100644
--- a/deps/node-inspect/lib/_inspect.js
+++ b/deps/node-inspect/lib/_inspect.js
@@ -22,10 +22,13 @@
 'use strict';
 const { spawn } = require('child_process');
 const { EventEmitter } = require('events');
+const net = require('net');
 const util = require('util');
 
+const runAsStandalone = typeof __dirname !== 'undefined';
+
 const [ InspectClient, createRepl ] =
-  (typeof __dirname !== 'undefined') ?
+  runAsStandalone ?
   // This copy of node-inspect is on-disk, relative paths make sense.
   [
     require('./internal/inspect_client'),
@@ -39,7 +42,16 @@ const [ InspectClient, createRepl ] =
 
 const debuglog = util.debuglog('inspect');
 
-exports.port = 9229;
+const DEBUG_PORT_PATTERN = /^--(?:debug|inspect)-port=(\d+)$/;
+function getDefaultPort() {
+  for (const arg of process.execArgv) {
+    const match = arg.match(DEBUG_PORT_PATTERN);
+    if (match) {
+      return +match[1];
+    }
+  }
+  return 9229;
+}
 
 function runScript(script, scriptArgs, inspectPort, childPrint) {
   return new Promise((resolve) => {
@@ -88,6 +100,45 @@ function createAgentProxy(domain, client) {
   });
 }
 
+function portIsFree(host, port, timeout = 2000) {
+  const retryDelay = 150;
+  let didTimeOut = false;
+
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      didTimeOut = true;
+      reject(new Error(
+        `Timeout (${timeout}) waiting for ${host}:${port} to be free`));
+    }, timeout);
+
+    function pingPort() {
+      if (didTimeOut) return;
+
+      const socket = net.connect(port, host);
+      let didRetry = false;
+      function retry() {
+        if (!didRetry && !didTimeOut) {
+          didRetry = true;
+          setTimeout(pingPort, retryDelay);
+        }
+      }
+
+      socket.on('error', (error) => {
+        if (error.code === 'ECONNREFUSED') {
+          resolve();
+        } else {
+          retry();
+        }
+      });
+      socket.on('connect', () => {
+        socket.destroy();
+        retry();
+      });
+    }
+    pingPort();
+  });
+}
+
 class NodeInspector {
   constructor(options, stdin, stdout) {
     this.options = options;
@@ -128,8 +179,9 @@ class NodeInspector {
     process.once('SIGHUP', process.exit.bind(process, 0));
 
     this.run()
-      .then(() => {
-        this.repl = startRepl();
+      .then(() => startRepl())
+      .then((repl) => {
+        this.repl = repl;
         this.repl.on('exit', () => {
           process.exit(0);
         });
@@ -139,15 +191,19 @@ class NodeInspector {
   }
 
   suspendReplWhile(fn) {
-    this.repl.rli.pause();
+    if (this.repl) {
+      this.repl.rli.pause();
+    }
     this.stdin.pause();
     this.paused = true;
     return new Promise((resolve) => {
       resolve(fn());
     }).then(() => {
       this.paused = false;
-      this.repl.rli.resume();
-      this.repl.displayPrompt();
+      if (this.repl) {
+        this.repl.rli.resume();
+        this.repl.displayPrompt();
+      }
       this.stdin.resume();
     }).then(null, (error) => process.nextTick(() => { throw error; }));
   }
@@ -162,7 +218,14 @@ class NodeInspector {
 
   run() {
     this.killChild();
-    return this._runScript().then((child) => {
+    const { host, port } = this.options;
+
+    const runOncePortIsFree = () => {
+      return portIsFree(host, port)
+        .then(() => this._runScript());
+    };
+
+    return runOncePortIsFree().then((child) => {
       this.child = child;
 
       let connectionAttempts = 0;
@@ -173,6 +236,7 @@ class NodeInspector {
         return this.client.connect()
           .then(() => {
             debuglog('connection established');
+            this.stdout.write(' ok');
           }, (error) => {
             debuglog('connect failed', error);
             // If it's failed to connect 10 times then print failed message
@@ -186,7 +250,6 @@ class NodeInspector {
           });
       };
 
-      const { host, port } = this.options;
       this.print(`connecting to ${host}:${port} ..`, true);
       return attemptConnect();
     });
@@ -225,7 +288,7 @@ class NodeInspector {
 
 function parseArgv([target, ...args]) {
   let host = '127.0.0.1';
-  let port = exports.port;
+  let port = getDefaultPort();
   let isRemote = false;
   let script = target;
   let scriptArgs = args;
@@ -258,8 +321,12 @@ function startInspect(argv = process.argv.slice(2),
                       stdout = process.stdout) {
   /* eslint-disable no-console */
   if (argv.length < 1) {
-    console.error('Usage: node-inspect script.js');
-    console.error('       node-inspect <host>:<port>');
+    const invokedAs = runAsStandalone ?
+      'node-inspect' :
+      `${process.argv0} ${process.argv[1]}`;
+
+    console.error(`Usage: ${invokedAs} script.js`);
+    console.error(`       ${invokedAs} <host>:<port>`);
     process.exit(1);
   }
 
diff --git a/deps/node-inspect/lib/internal/inspect_client.js b/deps/node-inspect/lib/internal/inspect_client.js
index d5ce46db05c37d..c247e2add87706 100644
--- a/deps/node-inspect/lib/internal/inspect_client.js
+++ b/deps/node-inspect/lib/internal/inspect_client.js
@@ -334,20 +334,7 @@ class Client extends EventEmitter {
         this.emit('close');
       });
 
-      Promise.all([
-        this.callMethod('Runtime.enable'),
-        this.callMethod('Debugger.enable'),
-        this.callMethod('Debugger.setPauseOnExceptions', { state: 'none' }),
-        this.callMethod('Debugger.setAsyncCallStackDepth', { maxDepth: 0 }),
-        this.callMethod('Profiler.enable'),
-        this.callMethod('Profiler.setSamplingInterval', { interval: 100 }),
-        this.callMethod('Debugger.setBlackboxPatterns', { patterns: [] }),
-        this.callMethod('Runtime.runIfWaitingForDebugger'),
-      ]).then(() => {
-        this.emit('ready');
-      }, (error) => {
-        this.emit('error', error);
-      });
+      this.emit('ready');
     };
 
     return new Promise((resolve, reject) => {
diff --git a/deps/node-inspect/lib/internal/inspect_repl.js b/deps/node-inspect/lib/internal/inspect_repl.js
index c61bbc9fb8e05a..2de86b247bb4b1 100644
--- a/deps/node-inspect/lib/internal/inspect_repl.js
+++ b/deps/node-inspect/lib/internal/inspect_repl.js
@@ -234,10 +234,10 @@ class ScopeSnapshot {
   constructor(scope, properties) {
     Object.assign(this, scope);
     this.properties = new Map(properties.map((prop) => {
-      // console.error(prop);
       const value = new RemoteObject(prop.value);
       return [prop.name, value];
     }));
+    this.completionGroup = properties.map((prop) => prop.name);
   }
 
   [util.inspect.custom](depth, opts) {
@@ -480,7 +480,9 @@ function createRepl(inspector) {
       if (!selectedFrame) {
         return Promise.reject(new Error('Requires execution to be paused'));
       }
-      return selectedFrame.loadScopes();
+      return selectedFrame.loadScopes().then((scopes) => {
+        return scopes.map((scope) => scope.completionGroup);
+      });
     }
 
     if (selectedFrame) {
@@ -746,8 +748,8 @@ function createRepl(inspector) {
       .filter(({ location }) => !!location.scriptUrl)
       .map(({ location }) =>
         setBreakpoint(location.scriptUrl, location.lineNumber + 1));
-    if (!newBreakpoints.length) return;
-    Promise.all(newBreakpoints).then((results) => {
+    if (!newBreakpoints.length) return Promise.resolve();
+    return Promise.all(newBreakpoints).then((results) => {
       print(`${results.length} breakpoints restored.`);
     });
   }
@@ -768,7 +770,8 @@ function createRepl(inspector) {
     const breakType = reason === 'other' ? 'break' : reason;
     const script = knownScripts[scriptId];
     const scriptUrl = script ? getRelativePath(script.url) : '[unknown]';
-    print(`${breakType} in ${scriptUrl}:${lineNumber + 1}`);
+
+    const header = `${breakType} in ${scriptUrl}:${lineNumber + 1}`;
 
     inspector.suspendReplWhile(() =>
       Promise.all([formatWatchers(true), selectedFrame.list(2)])
@@ -776,8 +779,10 @@ function createRepl(inspector) {
           if (watcherList) {
             return `${watcherList}\n${inspect(context)}`;
           }
-          return context;
-        }).then(print));
+          return inspect(context);
+        }).then((breakContext) => {
+          print(`${header}\n${breakContext}`);
+        }));
   });
 
   function handleResumed() {
@@ -1024,7 +1029,30 @@ function createRepl(inspector) {
     aliasProperties(context, SHORTCUTS);
   }
 
+  function initAfterStart() {
+    const setupTasks = [
+      Runtime.enable(),
+      Profiler.enable(),
+      Profiler.setSamplingInterval({ interval: 100 }),
+      Debugger.enable(),
+      Debugger.setPauseOnExceptions({ state: 'none' }),
+      Debugger.setAsyncCallStackDepth({ maxDepth: 0 }),
+      Debugger.setBlackboxPatterns({ patterns: [] }),
+      Debugger.setPauseOnExceptions({ state: pauseOnExceptionState }),
+      restoreBreakpoints(),
+      Runtime.runIfWaitingForDebugger(),
+    ];
+    return Promise.all(setupTasks);
+  }
+
   return function startRepl() {
+    inspector.client.on('close', () => {
+      resetOnStart();
+    });
+    inspector.client.on('ready', () => {
+      initAfterStart();
+    });
+
     const replOptions = {
       prompt: 'debug> ',
       input: inspector.stdin,
@@ -1033,6 +1061,7 @@ function createRepl(inspector) {
       useGlobal: false,
       ignoreUndefined: true,
     };
+
     repl = Repl.start(replOptions); // eslint-disable-line prefer-const
     initializeContext(repl.context);
     repl.on('reset', initializeContext);
@@ -1042,14 +1071,8 @@ function createRepl(inspector) {
       repl.rli.emit('SIGINT');
     });
 
-    inspector.client.on('close', () => {
-      resetOnStart();
-    });
-
-    inspector.client.on('ready', () => {
-      restoreBreakpoints();
-      Debugger.setPauseOnExceptions({ state: pauseOnExceptionState });
-    });
+    // Init once for the initial connection
+    initAfterStart();
 
     return repl;
   };
diff --git a/deps/node-inspect/package.json b/deps/node-inspect/package.json
index f4b3aec6d94d5d..536a525e5c9bf5 100644
--- a/deps/node-inspect/package.json
+++ b/deps/node-inspect/package.json
@@ -1,17 +1,17 @@
 {
   "name": "node-inspect",
-  "version": "1.10.4",
+  "version": "1.10.6",
   "description": "Node Inspect",
   "license": "MIT",
   "main": "lib/_inspect.js",
   "bin": "cli.js",
-  "homepage": "https://github.com/buggerjs/node-inspect",
+  "homepage": "https://github.com/nodejs/node-inspect",
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/buggerjs/node-inspect"
+    "url": "git+ssh://git@github.com/nodejs/node-inspect"
   },
   "bugs": {
-    "url": "https://github.com/buggerjs/node-inspect/issues"
+    "url": "https://github.com/nodejs/node-inspect/issues"
   },
   "scripts": {
     "pretest": "eslint --rulesdir=tools/eslint-rules lib test",
diff --git a/deps/node-inspect/test/cli/backtrace.test.js b/deps/node-inspect/test/cli/backtrace.test.js
index 2e2ba4a3423360..9cd8a82a33f043 100644
--- a/deps/node-inspect/test/cli/backtrace.test.js
+++ b/deps/node-inspect/test/cli/backtrace.test.js
@@ -19,11 +19,11 @@ test('display and navigate backtrace', (t) => {
     .then(() => cli.stepCommand('c'))
     .then(() => cli.command('bt'))
     .then(() => {
-      t.match(cli.output, `#0 topFn ${script}:8:2`);
+      t.match(cli.output, `#0 topFn ${script}:7:2`);
     })
     .then(() => cli.command('backtrace'))
     .then(() => {
-      t.match(cli.output, `#0 topFn ${script}:8:2`);
+      t.match(cli.output, `#0 topFn ${script}:7:2`);
     })
     .then(() => cli.quit())
     .then(null, onFatal);
diff --git a/deps/node-inspect/test/cli/exceptions.test.js b/deps/node-inspect/test/cli/exceptions.test.js
index 6d3ff68f057068..b66c09fc504424 100644
--- a/deps/node-inspect/test/cli/exceptions.test.js
+++ b/deps/node-inspect/test/cli/exceptions.test.js
@@ -31,11 +31,11 @@ test('break on (uncaught) exceptions', (t) => {
     .then(() => cli.command('breakOnException'))
     .then(() => cli.stepCommand('c'))
     .then(() => {
-      t.match(cli.output, `exception in ${script}:4`);
+      t.match(cli.output, `exception in ${script}:3`);
     })
     .then(() => cli.stepCommand('c'))
     .then(() => {
-      t.match(cli.output, `exception in ${script}:10`);
+      t.match(cli.output, `exception in ${script}:9`);
     })
 
     // Next run: With `breakOnUncaught` it only pauses on the 2nd exception
@@ -46,7 +46,7 @@ test('break on (uncaught) exceptions', (t) => {
     })
     .then(() => cli.stepCommand('c'))
     .then(() => {
-      t.match(cli.output, `exception in ${script}:10`);
+      t.match(cli.output, `exception in ${script}:9`);
     })
 
     // Next run: Back to the initial state! It should die again.
diff --git a/deps/node-inspect/test/cli/launch.test.js b/deps/node-inspect/test/cli/launch.test.js
index 962197e84f2295..99c6ce0aa2efa1 100644
--- a/deps/node-inspect/test/cli/launch.test.js
+++ b/deps/node-inspect/test/cli/launch.test.js
@@ -8,7 +8,9 @@ const startCLI = require('./start-cli');
 test('examples/empty.js', (t) => {
   const script = Path.join('examples', 'empty.js');
   const cli = startCLI([script]);
-  return cli.waitForPrompt()
+
+  return cli.waitFor(/break/)
+    .then(() => cli.waitForPrompt())
     .then(() => {
       t.match(cli.output, 'debug>', 'prints a prompt');
       t.match(
diff --git a/deps/node-inspect/test/cli/preserve-breaks.test.js b/deps/node-inspect/test/cli/preserve-breaks.test.js
index a248b3aa25605b..8de8227343626a 100644
--- a/deps/node-inspect/test/cli/preserve-breaks.test.js
+++ b/deps/node-inspect/test/cli/preserve-breaks.test.js
@@ -48,8 +48,17 @@ test('run after quit / restart', (t) => {
     })
     .then(() => cli.command('breakpoints'))
     .then(() => {
-      t.match(cli.output, `#0 ${script}:2`);
-      t.match(cli.output, `#1 ${script}:3`);
+      if (process.platform === 'aix') {
+        // TODO: There is a known issue on AIX where the breakpoints aren't
+        // properly resolved yet when we reach this point.
+        // Eventually that should be figured out but for now we don't want
+        // to fail builds because of it.
+        t.match(cli.output, /#0 [^\n]+three-lines\.js\$?:2/);
+        t.match(cli.output, /#1 [^\n]+three-lines\.js\$?:3/);
+      } else {
+        t.match(cli.output, `#0 ${script}:2`);
+        t.match(cli.output, `#1 ${script}:3`);
+      }
     })
     .then(() => cli.quit())
     .then(null, onFatal);
diff --git a/deps/node-inspect/test/cli/use-strict.test.js b/deps/node-inspect/test/cli/use-strict.test.js
new file mode 100644
index 00000000000000..81f4d91a6a5802
--- /dev/null
+++ b/deps/node-inspect/test/cli/use-strict.test.js
@@ -0,0 +1,27 @@
+'use strict';
+const Path = require('path');
+
+const { test } = require('tap');
+
+const startCLI = require('./start-cli');
+
+test('for whiles that starts with strict directive', (t) => {
+  const script = Path.join('examples', 'use-strict.js');
+  const cli = startCLI([script]);
+
+  function onFatal(error) {
+    cli.quit();
+    throw error;
+  }
+
+  return cli.waitFor(/break/)
+    .then(() => cli.waitForPrompt())
+    .then(() => {
+      t.match(
+        cli.output,
+        /break in [^:]+:(?:1|2)[^\d]/,
+        'pauses either on strict directive or first "real" line');
+    })
+    .then(() => cli.quit())
+    .then(null, onFatal);
+});
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
index f2c738770a43b4..2751bb168981ad 100644
--- a/deps/v8/include/v8-version.h
+++ b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 5
 #define V8_MINOR_VERSION 5
 #define V8_BUILD_NUMBER 372
-#define V8_PATCH_LEVEL 41
+#define V8_PATCH_LEVEL 42
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc
index c2c57b4e587fc5..b8354095c69497 100644
--- a/deps/v8/src/api.cc
+++ b/deps/v8/src/api.cc
@@ -7277,7 +7277,11 @@ Local<ArrayBuffer> v8::ArrayBuffer::New(Isolate* isolate, size_t byte_length) {
   ENTER_V8(i_isolate);
   i::Handle<i::JSArrayBuffer> obj =
       i_isolate->factory()->NewJSArrayBuffer(i::SharedFlag::kNotShared);
-  i::JSArrayBuffer::SetupAllocatingData(obj, i_isolate, byte_length);
+  // TODO(jbroman): It may be useful in the future to provide a MaybeLocal
+  // version that throws an exception or otherwise does not crash.
+  if (!i::JSArrayBuffer::SetupAllocatingData(obj, i_isolate, byte_length)) {
+    i::FatalProcessOutOfMemory("v8::ArrayBuffer::New");
+  }
   return Utils::ToLocal(obj);
 }
 
@@ -7467,8 +7471,12 @@ Local<SharedArrayBuffer> v8::SharedArrayBuffer::New(Isolate* isolate,
   ENTER_V8(i_isolate);
   i::Handle<i::JSArrayBuffer> obj =
       i_isolate->factory()->NewJSArrayBuffer(i::SharedFlag::kShared);
-  i::JSArrayBuffer::SetupAllocatingData(obj, i_isolate, byte_length, true,
-                                        i::SharedFlag::kShared);
+  // TODO(jborman): It may be useful in the future to provide a MaybeLocal
+  // version that throws an exception or otherwise does not crash.
+  if (!i::JSArrayBuffer::SetupAllocatingData(obj, i_isolate, byte_length, true,
+                                             i::SharedFlag::kShared)) {
+    i::FatalProcessOutOfMemory("v8::SharedArrayBuffer::New");
+  }
   return Utils::ToLocalShared(obj);
 }
 
diff --git a/doc/api/buffer.md b/doc/api/buffer.md
index 19a82a72c803dd..b5c1e9895d1fdc 100644
--- a/doc/api/buffer.md
+++ b/doc/api/buffer.md
@@ -747,6 +747,10 @@ in `list`. This however causes an additional loop to be executed in order to
 calculate the `totalLength`, so it is faster to provide the length explicitly if
 it is already known.
 
+If `totalLength` is provided, it is coerced to an unsigned integer. If the
+combined length of the `Buffer`s in `list` exceeds `totalLength`, the result is
+truncated to `totalLength`.
+
 Example: Create a single `Buffer` from a list of three `Buffer` instances
 
 ```js
diff --git a/doc/api/cli.md b/doc/api/cli.md
index 89879cdc532937..d5d4c4d6188c36 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -94,6 +94,26 @@ Follows `require()`'s module resolution
 rules. `module` may be either a path to a file, or a node module name.
 
 
+### `--inspect[=host:port]`
+<!-- YAML
+added: v6.3.0
+-->
+
+Activate inspector on host:port. Default is 127.0.0.1:9229.
+
+V8 inspector integration allows tools such as Chrome DevTools and IDEs to debug
+and profile Node.js instances. The tools attach to Node.js instances via a
+tcp port and communicate using the [Chrome Debugging Protocol][].
+
+
+### `--inspect-brk[=host:port]`
+<!-- YAML
+added: v7.6.0
+-->
+
+Activate inspector on host:port and break at start of user script.
+
+
 ### `--no-deprecation`
 <!-- YAML
 added: v0.8.0
@@ -425,6 +445,7 @@ OpenSSL, it may cause them to trust the same CAs as node.
 
 [emit_warning]: process.html#process_process_emitwarning_warning_name_ctor
 [Buffer]: buffer.html#buffer_buffer
+[Chrome Debugging Protocol]: https://chromedevtools.github.io/debugger-protocol-viewer
 [debugger]: debugger.html
 [REPL]: repl.html
 [SlowBuffer]: buffer.html#buffer_class_slowbuffer
diff --git a/doc/api/debugger.md b/doc/api/debugger.md
index b9503ca8d7b72a..86345ff4aaeaac 100644
--- a/doc/api/debugger.md
+++ b/doc/api/debugger.md
@@ -167,6 +167,10 @@ breakpoint)
 
 ## Advanced Usage
 
+### TCP-based protocol
+
+> Stability: 0 - Deprecated: Use [V8 Inspector Integration][] instead. The debug protocol used by the `--debug` flag was removed from V8.
+
 An alternative way of enabling and accessing the debugger is to start
 Node.js with the `--debug` command-line flag or by signaling an existing
 Node.js process with `SIGUSR1`.
@@ -179,12 +183,13 @@ process or via URI reference to the listening debugger:
 * `node debug <URI>` - Connects to the process via the URI such as
 localhost:5858
 
-## V8 Inspector Integration for Node.js
+### V8 Inspector Integration for Node.js
 
 **NOTE: This is an experimental feature.**
 
 V8 Inspector integration allows attaching Chrome DevTools to Node.js
 instances for debugging and profiling.
+It uses the [Chrome Debugging Protocol][].
 
 V8 Inspector can be enabled by passing the `--inspect` flag when starting a
 Node.js application. It is also possible to supply a custom port with that flag,
@@ -201,4 +206,6 @@ To start debugging, open the following URL in Chrome:
     chrome-devtools://devtools/remote/serve_file/@60cd6e859b9f557d2312f5bf532f6aec5f284980/inspector.html?experiments=true&v8only=true&ws=localhost:9229/node
 ```
 
-[TCP-based protocol]: https://github.com/v8/v8/wiki/Debugging-Protocol
\ No newline at end of file
+[Chrome Debugging Protocol]: https://chromedevtools.github.io/debugger-protocol-viewer/
+[TCP-based protocol]: #debugger_tcp_based_protocol
+[V8 Inspector Integration]: #debugger_v8_inspector_integration_for_node_js
diff --git a/doc/api/dns.md b/doc/api/dns.md
index 7f075be3114279..45d494eab3bcf2 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -70,33 +70,25 @@ changes:
     pr-url: https://github.com/nodejs/node/pull/744
     description: The `all` option is supported now.
 -->
+- `hostname` {string}
+- `options` {integer | Object}
+  - `family` {integer} The record family. Must be `4` or `6`. IPv4
+    and IPv6 addresses are both returned by default.
+  - `hints` {number} One or more [supported `getaddrinfo` flags][]. Multiple
+    flags may be passed by bitwise `OR`ing their values.
+  - `all` {boolean} When `true`, the callback returns all resolved addresses in
+    an array. Otherwise, returns a single address. Defaults to `false`.
+- `callback` {Function}
+  - `err` {Error}
+  - `address` {string} A string representation of an IPv4 or IPv6 address.
+  - `family` {integer} `4` or `6`, denoting the family of `address`.
 
 Resolves a hostname (e.g. `'nodejs.org'`) into the first found A (IPv4) or
-AAAA (IPv6) record. `options` can be an object or integer. If `options` is
-not provided, then IPv4 and IPv6 addresses are both valid. If `options` is
-an integer, then it must be `4` or `6`.
-
-Alternatively, `options` can be an object containing these properties:
-
-* `family` {number} - The record family. If present, must be the integer
-  `4` or `6`. If not provided, both IP v4 and v6 addresses are accepted.
-* `hints`: {number} - If present, it should be one or more of the supported
-  `getaddrinfo` flags. If `hints` is not provided, then no flags are passed to
-  `getaddrinfo`. Multiple flags can be passed through `hints` by bitwise
-  `OR`ing their values.
-  See [supported `getaddrinfo` flags][] for more information on supported
-  flags.
-* `all`: {boolean} - When `true`, the callback returns all resolved addresses
-  in an array, otherwise returns a single address. Defaults to `false`.
-
-All properties are optional.
-
-The `callback` function has arguments `(err, address, family)`. `address` is a
-string representation of an IPv4 or IPv6 address. `family` is either the
-integer `4` or `6` and denotes the family of `address` (not necessarily the
-value initially passed to `lookup`).
-
-With the `all` option set to `true`, the arguments change to
+AAAA (IPv6) record. All `option` properties are optional. If `options` is an
+integer, then it must be `4` or `6` – if `options` is not provided, then IPv4
+and IPv6 addresses are both returned if found.
+
+With the `all` option set to `true`, the arguments for `callback` change to
 `(err, addresses)`, with `addresses` being an array of objects with the
 properties `address` and `family`.
 
@@ -147,6 +139,12 @@ on some operating systems (e.g FreeBSD 10.1).
 <!-- YAML
 added: v0.11.14
 -->
+- `address` {string}
+- `port` {number}
+- `callback` {Function}
+  - `err` {Error}
+  - `hostname` {string} e.g. `example.com`
+  - `service` {string} e.g. `http`
 
 Resolves the given `address` and `port` into a hostname and service using
 the operating system's underlying `getnameinfo` implementation.
@@ -155,10 +153,7 @@ If `address` is not a valid IP address, a `TypeError` will be thrown.
 The `port` will be coerced to a number. If it is not a legal port, a `TypeError`
 will be thrown.
 
-The callback has arguments `(err, hostname, service)`. The `hostname` and
-`service` arguments are strings (e.g. `'localhost'` and `'http'` respectively).
-
-On error, `err` is an [`Error`][] object, where `err.code` is the error code.
+On an error, `err` is an [`Error`][] object, where `err.code` is the error code.
 
 ```js
 const dns = require('dns');
@@ -172,6 +167,11 @@ dns.lookupService('127.0.0.1', 22, (err, hostname, service) => {
 <!-- YAML
 added: v0.1.27
 -->
+- `hostname` {string}
+- `rrtype` {string}
+- `callback` {Function}
+  - `err` {Error}
+  - `addresses` {string[] | Object[] | string[][] | Object}
 
 Uses the DNS protocol to resolve a hostname (e.g. `'nodejs.org'`) into an
 array of the record types specified by `rrtype`.
@@ -208,18 +208,21 @@ changes:
     description: This method now supports passing `options`,
                  specifically `options.ttl`.
 -->
+- `hostname` {string} Hostname to resolve.
+- `options` {Object}
+  - `ttl` {boolean} Retrieve the Time-To-Live value (TTL) of each record.
+    When `true`, the callback receives an array of
+    `{ address: '1.2.3.4', ttl: 60 }` objects rather than an array of strings,
+    with the TTL expressed in seconds.
+- `callback` {Function}
+  - `err` {Error}
+  - `addresses` {string[] | Object[]}
 
 Uses the DNS protocol to resolve a IPv4 addresses (`A` records) for the
 `hostname`. The `addresses` argument passed to the `callback` function
 will contain an array of IPv4 addresses (e.g.
 `['74.125.79.104', '74.125.79.105', '74.125.79.106']`).
 
-* `hostname` {string} Hostname to resolve.
-* `options` {Object}
-  * `ttl` {boolean} Retrieve the Time-To-Live value (TTL) of each record.
-    The callback receives an array of `{ address: '1.2.3.4', ttl: 60 }` objects
-    rather than an array of strings.  The TTL is expressed in seconds.
-* `callback` {Function} An `(err, result)` callback function.
 
 ## dns.resolve6(hostname[, options], callback)
 <!-- YAML
@@ -230,22 +233,29 @@ changes:
     description: This method now supports passing `options`,
                  specifically `options.ttl`.
 -->
+- `hostname` {string} Hostname to resolve.
+- `options` {Object}
+  - `ttl` {boolean} Retrieve the Time-To-Live value (TTL) of each record.
+    When `true`, the callback receives an array of
+    `{ address: '0:1:2:3:4:5:6:7', ttl: 60 }` objects rather than an array of
+    strings, with the TTL expressed in seconds.
+- `callback` {Function}
+  - `err` {Error}
+  - `addresses` {string[] | Object[]}
 
 Uses the DNS protocol to resolve a IPv6 addresses (`AAAA` records) for the
 `hostname`. The `addresses` argument passed to the `callback` function
 will contain an array of IPv6 addresses.
 
-* `hostname` {string} Hostname to resolve.
-* `options` {Object}
-  * `ttl` {boolean} Retrieve the Time-To-Live value (TTL) of each record.
-    The callback receives an array of `{ address: '0:1:2:3:4:5:6:7', ttl: 60 }`
-    objects rather than an array of strings.  The TTL is expressed in seconds.
-* `callback` {Function} An `(err, result)` callback function.
 
 ## dns.resolveCname(hostname, callback)
 <!-- YAML
 added: v0.3.2
 -->
+- `hostname` {string}
+- `callback` {Function}
+  - `err` {Error}
+  - `addresses` {string[]}
 
 Uses the DNS protocol to resolve `CNAME` records for the `hostname`. The
 `addresses` argument passed to the `callback` function
@@ -256,6 +266,10 @@ will contain an array of canonical name records available for the `hostname`
 <!-- YAML
 added: v0.1.27
 -->
+- `hostname` {string}
+- `callback` {Function}
+  - `err` {Error}
+  - `addresses` {Object[]}
 
 Uses the DNS protocol to resolve mail exchange records (`MX` records) for the
 `hostname`. The `addresses` argument passed to the `callback` function will
@@ -266,11 +280,14 @@ property (e.g. `[{priority: 10, exchange: 'mx.example.com'}, ...]`).
 <!-- YAML
 added: v0.9.12
 -->
+- `hostname` {string}
+- `callback` {Function}
+  - `err` {Error}
+  - `addresses` {Object[]}
 
 Uses the DNS protocol to resolve regular expression based records (`NAPTR`
-records) for the `hostname`. The `callback` function has arguments
-`(err, addresses)`.  The `addresses` argument passed to the `callback` function
-will contain an array of objects with the following properties:
+records) for the `hostname`. The `addresses` argument passed to the `callback`
+function will contain an array of objects with the following properties:
 
 * `flags`
 * `service`
@@ -296,16 +313,24 @@ For example:
 <!-- YAML
 added: v0.1.90
 -->
+- `hostname` {string}
+- `callback` {Function}
+  - `err` {Error}
+  - `addresses` {string[]}
 
 Uses the DNS protocol to resolve name server records (`NS` records) for the
 `hostname`. The `addresses` argument passed to the `callback` function will
 contain an array of name server records available for `hostname`
 (e.g. `['ns1.example.com', 'ns2.example.com']`).
 
-## dns.resolvePtr(hostname, callback)
+## dns.resolvePtr(hostname)
 <!-- YAML
 added: v6.0.0
 -->
+- `hostname` {string}
+- `callback` {Function}
+  - `err` {Error}
+  - `addresses` {string[]}
 
 Uses the DNS protocol to resolve pointer records (`PTR` records) for the
 `hostname`. The `addresses` argument passed to the `callback` function will
@@ -315,9 +340,13 @@ be an array of strings containing the reply records.
 <!-- YAML
 added: v0.11.10
 -->
+- `hostname` {string}
+- `callback` {Function}
+  - `err` {Error}
+  - `address` {Object}
 
 Uses the DNS protocol to resolve a start of authority record (`SOA` record) for
-the `hostname`. The `addresses` argument passed to the `callback` function will
+the `hostname`. The `address` argument passed to the `callback` function will
 be an object with the following properties:
 
 * `nsname`
@@ -344,6 +373,10 @@ be an object with the following properties:
 <!-- YAML
 added: v0.1.27
 -->
+- `hostname` {string}
+- `callback` {Function}
+  - `err` {Error}
+  - `addresses` {Object[]}
 
 Uses the DNS protocol to resolve service records (`SRV` records) for the
 `hostname`. The `addresses` argument passed to the `callback` function will
@@ -367,6 +400,10 @@ be an array of objects with the following properties:
 <!-- YAML
 added: v0.1.27
 -->
+- `hostname` {string}
+- `callback` {Function}
+  - `err` {Error}
+  - `addresses` {string[][]}
 
 Uses the DNS protocol to resolve text queries (`TXT` records) for the
 `hostname`. The `addresses` argument passed to the `callback` function is
@@ -379,13 +416,14 @@ treated separately.
 <!-- YAML
 added: v0.1.16
 -->
+- `ip` {string}
+- `callback` {Function}
+  - `err` {Error}
+  - `hostnames` {string[]}
 
 Performs a reverse DNS query that resolves an IPv4 or IPv6 address to an
 array of hostnames.
 
-The `callback` function has arguments `(err, hostnames)`, where `hostnames`
-is an array of resolved hostnames for the given `ip`.
-
 On error, `err` is an [`Error`][] object, where `err.code` is
 one of the [DNS error codes][].
 
@@ -393,11 +431,12 @@ one of the [DNS error codes][].
 <!-- YAML
 added: v0.11.3
 -->
+- `servers` {string[]}
 
 Sets the IP addresses of the servers to be used when resolving. The `servers`
 argument is an array of IPv4 or IPv6 addresses.
 
-If a port specified on the address it will be removed.
+If a port is specified on the address, it will be removed.
 
 An error will be thrown if an invalid address is provided.
 
diff --git a/doc/api/events.md b/doc/api/events.md
index 5f12cfe3191837..5c0614b68bf2df 100644
--- a/doc/api/events.md
+++ b/doc/api/events.md
@@ -98,7 +98,7 @@ listener will be invoked _every time_ the named event is emitted.
 
 ```js
 const myEmitter = new MyEmitter();
-var m = 0;
+let m = 0;
 myEmitter.on('event', () => {
   console.log(++m);
 });
@@ -114,7 +114,7 @@ the listener is unregistered and *then* called.
 
 ```js
 const myEmitter = new MyEmitter();
-var m = 0;
+let m = 0;
 myEmitter.once('event', () => {
   console.log(++m);
 });
@@ -148,7 +148,7 @@ can be used. (_Note, however, that the `domain` module has been deprecated_)
 const myEmitter = new MyEmitter();
 
 process.on('uncaughtException', (err) => {
-  console.log('whoops! there was an error');
+  console.error('whoops! there was an error');
 });
 
 myEmitter.emit('error', new Error('whoops!'));
@@ -160,7 +160,7 @@ As a best practice, listeners should always be added for the `'error'` events.
 ```js
 const myEmitter = new MyEmitter();
 myEmitter.on('error', (err) => {
-  console.log('whoops! there was an error');
+  console.error('whoops! there was an error');
 });
 myEmitter.emit('error', new Error('whoops!'));
 // Prints: whoops! there was an error
@@ -185,7 +185,7 @@ added and `'removeListener'` when existing listeners are removed.
 added: v0.1.26
 -->
 
-* `eventName` {string|symbol} The name of the event being listened for
+* `eventName` {any} The name of the event being listened for
 * `listener` {Function} The event handler function
 
 The `EventEmitter` instance will emit its own `'newListener'` event *before*
@@ -229,7 +229,7 @@ changes:
                  now yields the original listener function.
 -->
 
-* `eventName` {string|symbol} The event name
+* `eventName` {any} The event name
 * `listener` {Function} The event handler function
 
 The `'removeListener'` event is emitted *after* the `listener` is removed.
@@ -296,6 +296,8 @@ Its `name` property is set to `'MaxListenersExceededWarning'`.
 <!-- YAML
 added: v0.1.26
 -->
+- `eventName` {any}
+- `listener` {Function}
 
 Alias for `emitter.on(eventName, listener)`.
 
@@ -303,6 +305,8 @@ Alias for `emitter.on(eventName, listener)`.
 <!-- YAML
 added: v0.1.26
 -->
+- `eventName` {any}
+- `...args` {any}
 
 Synchronously calls each of the listeners registered for the event named
 `eventName`, in the order they were registered, passing the supplied arguments
@@ -345,7 +349,7 @@ set by [`emitter.setMaxListeners(n)`][] or defaults to
 added: v3.2.0
 -->
 
-* `eventName` {string|symbol} The name of the event being listened for
+* `eventName` {any} The name of the event being listened for
 
 Returns the number of listeners listening to the event named `eventName`.
 
@@ -358,6 +362,7 @@ changes:
     description: For listeners attached using `.once()` this returns the
                  original listeners instead of wrapper functions now.
 -->
+- `eventName` {any}
 
 Returns a copy of the array of listeners for the event named `eventName`.
 
@@ -374,7 +379,7 @@ console.log(util.inspect(server.listeners('connection')));
 added: v0.1.101
 -->
 
-* `eventName` {string|symbol} The name of the event.
+* `eventName` {any} The name of the event.
 * `listener` {Function} The callback function
 
 Adds the `listener` function to the end of the listeners array for the
@@ -410,7 +415,7 @@ myEE.emit('foo');
 added: v0.3.0
 -->
 
-* `eventName` {string|symbol} The name of the event.
+* `eventName` {any} The name of the event.
 * `listener` {Function} The callback function
 
 Adds a **one time** `listener` function for the event named `eventName`. The
@@ -443,7 +448,7 @@ myEE.emit('foo');
 added: v6.0.0
 -->
 
-* `eventName` {string|symbol} The name of the event.
+* `eventName` {any} The name of the event.
 * `listener` {Function} The callback function
 
 Adds the `listener` function to the *beginning* of the listeners array for the
@@ -465,7 +470,7 @@ Returns a reference to the `EventEmitter`, so that calls can be chained.
 added: v6.0.0
 -->
 
-* `eventName` {string|symbol} The name of the event.
+* `eventName` {any} The name of the event.
 * `listener` {Function} The callback function
 
 Adds a **one time** `listener` function for the event named `eventName` to the
@@ -484,6 +489,7 @@ Returns a reference to the `EventEmitter`, so that calls can be chained.
 <!-- YAML
 added: v0.1.26
 -->
+- `eventName` {any}
 
 Removes all listeners, or those of the specified `eventName`.
 
@@ -497,12 +503,14 @@ Returns a reference to the `EventEmitter`, so that calls can be chained.
 <!-- YAML
 added: v0.1.26
 -->
+- `eventName` {any}
+- `listener` {Function}
 
 Removes the specified `listener` from the listener array for the event named
 `eventName`.
 
 ```js
-var callback = (stream) => {
+const callback = (stream) => {
   console.log('someone connected!');
 };
 server.on('connection', callback);
@@ -524,12 +532,12 @@ events will behave as expected.
 ```js
 const myEmitter = new MyEmitter();
 
-var callbackA = () => {
+const callbackA = () => {
   console.log('A');
   myEmitter.removeListener('event', callbackB);
 };
 
-var callbackB = () => {
+const callbackB = () => {
   console.log('B');
 };
 
@@ -564,6 +572,7 @@ Returns a reference to the `EventEmitter`, so that calls can be chained.
 <!-- YAML
 added: v0.3.5
 -->
+- `n` {integer}
 
 By default EventEmitters will print a warning if more than `10` listeners are
 added for a particular event. This is a useful default that helps finding
diff --git a/doc/api/process.md b/doc/api/process.md
index ff70f81244afc7..f158a1bc8efa14 100644
--- a/doc/api/process.md
+++ b/doc/api/process.md
@@ -298,7 +298,7 @@ too many listeners have been added to an event
 
 ```txt
 $ node
-> event.defaultMaxListeners = 1;
+> events.defaultMaxListeners = 1;
 > process.on('foo', () => {});
 > process.on('foo', () => {});
 > (node:38638) Warning: Possible EventEmitter memory leak detected. 2 foo
@@ -311,7 +311,7 @@ adds a custom handler to the `'warning'` event:
 ```txt
 $ node --no-warnings
 > var p = process.on('warning', (warning) => console.warn('Do not do that!'));
-> event.defaultMaxListeners = 1;
+> events.defaultMaxListeners = 1;
 > process.on('foo', () => {});
 > process.on('foo', () => {});
 > Do not do that!
diff --git a/doc/api/stream.md b/doc/api/stream.md
index c48dfe050808ee..289250c638ff15 100644
--- a/doc/api/stream.md
+++ b/doc/api/stream.md
@@ -981,7 +981,7 @@ setTimeout(() => {
 added: v0.9.11
 -->
 
-* `chunk` {Buffer|string} Chunk of data to unshift onto the read queue
+* `chunk` {Buffer|string|any} Chunk of data to unshift onto the read queue
 
 The `readable.unshift()` method pushes a chunk of data back into the internal
 buffer. This is useful in certain situations where a stream is being consumed by
@@ -1016,7 +1016,7 @@ function parseHeader(stream, callback) {
         const remaining = split.join('\n\n');
         const buf = Buffer.from(remaining, 'utf8');
         stream.removeListener('error', callback);
-        // set the readable listener before unshifting
+        // remove the readable listener before unshifting
         stream.removeListener('readable', onReadable);
         if (buf.length)
           stream.unshift(buf);
@@ -1295,8 +1295,9 @@ const myWritable = new Writable({
 
 #### writable.\_write(chunk, encoding, callback)
 
-* `chunk` {Buffer|string} The chunk to be written. Will **always**
-  be a buffer unless the `decodeStrings` option was set to `false`.
+* `chunk` {Buffer|string|any} The chunk to be written. Will **always**
+  be a buffer unless the `decodeStrings` option was set to `false`
+  or the stream is operating in object mode.
 * `encoding` {string} If the chunk is a string, then `encoding` is the
   character encoding of that string. If chunk is a `Buffer`, or if the
   stream is operating in object mode, `encoding` may be ignored.
@@ -1500,13 +1501,13 @@ user programs.
 
 #### readable.push(chunk[, encoding])
 
-* `chunk` {Buffer|null|string} Chunk of data to push into the read queue
+* `chunk` {Buffer|null|string|any} Chunk of data to push into the read queue
 * `encoding` {string} Encoding of String chunks.  Must be a valid
   Buffer encoding, such as `'utf8'` or `'ascii'`
 * Returns {boolean} `true` if additional chunks of data may continued to be
   pushed; `false` otherwise.
 
-When `chunk` is a `Buffer` or `string`, the `chunk` of data will be added to the
+When `chunk` is not `null`, the `chunk` of data will be added to the
 internal queue for users of the stream to consume. Passing `chunk` as `null`
 signals the end of the stream (EOF), after which no more data can be written.
 
@@ -1873,8 +1874,9 @@ user programs.
 
 #### transform.\_transform(chunk, encoding, callback)
 
-* `chunk` {Buffer|string} The chunk to be transformed. Will **always**
-  be a buffer unless the `decodeStrings` option was set to `false`.
+* `chunk` {Buffer|string|any} The chunk to be transformed. Will **always**
+  be a buffer unless the `decodeStrings` option was set to `false`
+  or the stream is operating in object mode.
 * `encoding` {string} If the chunk is a string, then this is the
   encoding type. If chunk is a buffer, then this is the special
   value - 'buffer', ignore it in this case.
diff --git a/doc/api/vm.md b/doc/api/vm.md
index 025e9725a94e66..b6fb90440a1993 100644
--- a/doc/api/vm.md
+++ b/doc/api/vm.md
@@ -14,6 +14,9 @@ const vm = require('vm');
 JavaScript code can be compiled and run immediately or compiled, saved, and run
 later.
 
+*Note*: The vm module is not a security mechanism.
+**Do not use it to run untrusted code**.
+
 ## Class: vm.Script
 <!-- YAML
 added: v0.3.1
diff --git a/doc/changelogs/CHANGELOG_V7.md b/doc/changelogs/CHANGELOG_V7.md
index 45dda5d2edd22e..b0edcc826381e6 100644
--- a/doc/changelogs/CHANGELOG_V7.md
+++ b/doc/changelogs/CHANGELOG_V7.md
@@ -6,6 +6,7 @@
 </tr>
 <tr>
 <td>
+<a href="#7.7.4">7.7.4</a><br/>
 <a href="#7.7.3">7.7.3</a><br/>
 <a href="#7.7.2">7.7.2</a><br/>
 <a href="#7.7.1">7.7.1</a><br/>
@@ -31,6 +32,66 @@
   * [io.js](CHANGELOG_IOJS.md)
   * [Archive](CHANGELOG_ARCHIVE.md)
 
+<a id="7.7.4"></a>
+## 2017-03-21, Version 7.7.4 (Current), @cjihrig
+
+### Notable changes
+
+Thank you to @italoacasas for preparing the majority of this release.
+
+* **deps**: Add node-inspect 1.10.6 (Jan Krems) [#11869](https://github.com/nodejs/node/pull/11869)
+* **inspector**: proper WS URLs when bound to 0.0.0.0 (Eugene Ostroukhov) [#11850](https://github.com/nodejs/node/pull/11850)
+* **tls**: fix segfault on destroy after partial read. (Ben Noordhuis) [#11898](https://github.com/nodejs/node/pull/11898)
+
+### Commits
+
+* [[`f48763c5b9`](https://github.com/nodejs/node/commit/f48763c5b9)] - **benchmark**: remove benchmarks forced optimizations (Bartosz Sosnowski)
+* [[`dcac2d8f04`](https://github.com/nodejs/node/commit/dcac2d8f04)] - **benchmark**: benchmark comparing forEach with for (James M Snell) [#11582](https://github.com/nodejs/node/pull/11582)
+* [[`80949f3d88`](https://github.com/nodejs/node/commit/80949f3d88)] - **build**: add cpp linting to windows build (liusi) [#11856](https://github.com/nodejs/node/pull/11856)
+* [[`5244ee346b`](https://github.com/nodejs/node/commit/5244ee346b)] - **build**: mac OBJ_DIR should point to obj.target (Daniel Bevenius) [#11857](https://github.com/nodejs/node/pull/11857)
+* [[`5b1d61ce09`](https://github.com/nodejs/node/commit/5b1d61ce09)] - **child_process**: fix deoptimizing use of arguments (Vse Mozhet Byt) [#11748](https://github.com/nodejs/node/pull/11748)
+* [[`ca319862fd`](https://github.com/nodejs/node/commit/ca319862fd)] - **deps**: cherry-pick ca0f9573 from V8 upstream (Ali Ijaz Sheikh)
+* [[`a7e4b029da`](https://github.com/nodejs/node/commit/a7e4b029da)] - **deps**: Add node-inspect 1.10.6 (Jan Krems) [#11869](https://github.com/nodejs/node/pull/11869)
+* [[`0c00b655d8`](https://github.com/nodejs/node/commit/0c00b655d8)] - **doc**: Fix #7065: cli help documentation for --inspect (Noj Vek) [#11660](https://github.com/nodejs/node/pull/11660)
+* [[`60ad7af65e`](https://github.com/nodejs/node/commit/60ad7af65e)] - **doc**: deprecate debug protocol (Jan Krems) [#10320](https://github.com/nodejs/node/pull/10320)
+* [[`a5f7393541`](https://github.com/nodejs/node/commit/a5f7393541)] - **doc**: add vsemozhetbyt to collaborators (Vse Mozhet Byt) [#11932](https://github.com/nodejs/node/pull/11932)
+* [[`0c091262bd`](https://github.com/nodejs/node/commit/0c091262bd)] - **doc**: add note that vm module is not a security mechanism (Ruslan Bekenev) [#11557](https://github.com/nodejs/node/pull/11557)
+* [[`6d6a65e2ad`](https://github.com/nodejs/node/commit/6d6a65e2ad)] - **doc**: linkable commit message guidelines (Sam Roberts) [#11792](https://github.com/nodejs/node/pull/11792)
+* [[`7c7228ed4b`](https://github.com/nodejs/node/commit/7c7228ed4b)] - **doc**: gcc version is at least 4.8.5 in BUILDING.md (detailyang) [#11840](https://github.com/nodejs/node/pull/11840)
+* [[`9861ec93d4`](https://github.com/nodejs/node/commit/9861ec93d4)] - **doc**: increase Buffer.concat() documentation (cjihrig) [#11845](https://github.com/nodejs/node/pull/11845)
+* [[`54879ab7d1`](https://github.com/nodejs/node/commit/54879ab7d1)] - **doc**: fix mistakes in stream doc (object mode) (Christian d'Heureuse) [#11807](https://github.com/nodejs/node/pull/11807)
+* [[`78ca15dd78`](https://github.com/nodejs/node/commit/78ca15dd78)] - **doc**: argument types for dns methods (Amelia Clarke) [#11764](https://github.com/nodejs/node/pull/11764)
+* [[`e84e33c87c`](https://github.com/nodejs/node/commit/e84e33c87c)] - **doc**: fix a typo in api/process.md (Gaara) [#11780](https://github.com/nodejs/node/pull/11780)
+* [[`75fcf53173`](https://github.com/nodejs/node/commit/75fcf53173)] - **doc**: missing argument types for events methods (Amelia Clarke) [#11802](https://github.com/nodejs/node/pull/11802)
+* [[`ae52b63df2`](https://github.com/nodejs/node/commit/ae52b63df2)] - **doc**: correct comment error in stream.md (Alexander) [#11804](https://github.com/nodejs/node/pull/11804)
+* [[`e6f113d3d5`](https://github.com/nodejs/node/commit/e6f113d3d5)] - **doc**: console.log() -> console.error() in events.md (Vse Mozhet Byt) [#11810](https://github.com/nodejs/node/pull/11810)
+* [[`cde5d71db1`](https://github.com/nodejs/node/commit/cde5d71db1)] - **doc**: var -> let / const in events.md (Vse Mozhet Byt) [#11810](https://github.com/nodejs/node/pull/11810)
+* [[`d0fb578d64`](https://github.com/nodejs/node/commit/d0fb578d64)] - **fs**: avoid using forEach (James M Snell) [#11582](https://github.com/nodejs/node/pull/11582)
+* [[`14e3ad0c5e`](https://github.com/nodejs/node/commit/14e3ad0c5e)] - **inspector**: proper WS URLs when bound to 0.0.0.0 (Eugene Ostroukhov) [#11850](https://github.com/nodejs/node/pull/11850)
+* [[`fbbcd1aa89`](https://github.com/nodejs/node/commit/fbbcd1aa89)] - **lib**: Fix swallowed events in inspect integration (Jan Krems) [#11869](https://github.com/nodejs/node/pull/11869)
+* [[`9cc712ca18`](https://github.com/nodejs/node/commit/9cc712ca18)] - **lib**: remove unused msg parameter in debug_agent (mr-spd) [#11833](https://github.com/nodejs/node/pull/11833)
+* [[`77c69f7ace`](https://github.com/nodejs/node/commit/77c69f7ace)] - **lib, test**: add duplicate symbol checking in E() (DavidCai) [#11829](https://github.com/nodejs/node/pull/11829)
+* [[`7e230727fc`](https://github.com/nodejs/node/commit/7e230727fc)] - **module**: avoid using forEach (James M Snell) [#11582](https://github.com/nodejs/node/pull/11582)
+* [[`c0a2e02f51`](https://github.com/nodejs/node/commit/c0a2e02f51)] - **net**: avoid using forEach (James M Snell) [#11582](https://github.com/nodejs/node/pull/11582)
+* [[`a0b1aa1161`](https://github.com/nodejs/node/commit/a0b1aa1161)] - **readline**: avoid using forEach (James M Snell) [#11582](https://github.com/nodejs/node/pull/11582)
+* [[`e19ca8ba11`](https://github.com/nodejs/node/commit/e19ca8ba11)] - **readline**: remove unneeded eslint-disable comment (Rich Trott) [#11836](https://github.com/nodejs/node/pull/11836)
+* [[`62e726109a`](https://github.com/nodejs/node/commit/62e726109a)] - **repl**: avoid using forEach (James M Snell) [#11582](https://github.com/nodejs/node/pull/11582)
+* [[`90be5a1f19`](https://github.com/nodejs/node/commit/90be5a1f19)] - **stream**: avoid using forEach (James M Snell) [#11582](https://github.com/nodejs/node/pull/11582)
+* [[`2cab00aec0`](https://github.com/nodejs/node/commit/2cab00aec0)] - **test**: fix assertion in vm test (AnnaMag) [#11862](https://github.com/nodejs/node/pull/11862)
+* [[`8bda7b8d39`](https://github.com/nodejs/node/commit/8bda7b8d39)] - **test**: add coverage for child_process bounds check (Rich Trott) [#11800](https://github.com/nodejs/node/pull/11800)
+* [[`3ae58acd29`](https://github.com/nodejs/node/commit/3ae58acd29)] - **test**: failing behaviour on sandboxed Proxy (AnnaMag) [#11671](https://github.com/nodejs/node/pull/11671)
+* [[`560d8eed9a`](https://github.com/nodejs/node/commit/560d8eed9a)] - **test**: delay child exit in AIX for pseudo-tty tests (Gireesh Punathil) [#11715](https://github.com/nodejs/node/pull/11715)
+* [[`f9c831f4b1`](https://github.com/nodejs/node/commit/f9c831f4b1)] - **test**: fix flaky test-domain-abort-on-uncaught (Rich Trott) [#11817](https://github.com/nodejs/node/pull/11817)
+* [[`2649dab274`](https://github.com/nodejs/node/commit/2649dab274)] - **test**: added test for indexed properties (AnnaMag) [#11769](https://github.com/nodejs/node/pull/11769)
+* [[`2df662c95a`](https://github.com/nodejs/node/commit/2df662c95a)] - **test**: test resolveObject with an empty path (Daijiro Wachi) [#11811](https://github.com/nodejs/node/pull/11811)
+* [[`d2c9111614`](https://github.com/nodejs/node/commit/d2c9111614)] - **test**: fix repl-function-redefinition-edge-case (Alexey Orlenko) [#11772](https://github.com/nodejs/node/pull/11772)
+* [[`c9cf922248`](https://github.com/nodejs/node/commit/c9cf922248)] - **test**: add regex to assert.throws (Matej Krajčovič) [#11815](https://github.com/nodejs/node/pull/11815)
+* [[`5f6025ba68`](https://github.com/nodejs/node/commit/5f6025ba68)] - **test**: fail when child dies in fork-net (Joyee Cheung) [#11684](https://github.com/nodejs/node/pull/11684)
+* [[`c626734409`](https://github.com/nodejs/node/commit/c626734409)] - **tls**: fix segfault on destroy after partial read (Ben Noordhuis) [#11898](https://github.com/nodejs/node/pull/11898)
+* [[`646ee559df`](https://github.com/nodejs/node/commit/646ee559df)] - **tls**: avoid using forEach (James M Snell) [#11582](https://github.com/nodejs/node/pull/11582)
+* [[`540830116b`](https://github.com/nodejs/node/commit/540830116b)] - **tls**: keep track of stream that is closed (jBarz) [#11776](https://github.com/nodejs/node/pull/11776)
+* [[`9a59913039`](https://github.com/nodejs/node/commit/9a59913039)] - **util**: avoid using forEach (James M Snell) [#11582](https://github.com/nodejs/node/pull/11582)
+
 <a id="7.7.3"></a>
 ## 2017-03-14, Version 7.7.3 (Current), @italoacasas
 
diff --git a/doc/node.1 b/doc/node.1
index 026485d3920923..5f79a0c809a3a4 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -92,6 +92,17 @@ Open the REPL even if stdin does not appear to be a terminal.
 Preload the specified module at startup. Follows `require()`'s module resolution
 rules. \fImodule\fR may be either a path to a file, or a node module name.
 
+.TP
+.BR \-\-inspect \fI[=host:port]\fR
+Activate inspector on host:port. Default is 127.0.0.1:9229.
+
+V8 Inspector integration allows attaching Chrome DevTools and IDEs to Node.js
+instances for debugging and profiling. It uses the Chrome Debugging Protocol.
+
+.TP
+.BR \-\-inspect-brk \fI[=host:port]\fR
+Activate inspector on host:port and break at start of user script.
+
 .TP
 .BR \-\-no\-deprecation
 Silence deprecation warnings.
diff --git a/lib/_debug_agent.js b/lib/_debug_agent.js
index c731ca374b5e87..a820b21615a2d7 100644
--- a/lib/_debug_agent.js
+++ b/lib/_debug_agent.js
@@ -107,7 +107,7 @@ function Client(agent, socket) {
 }
 util.inherits(Client, Transform);
 
-Client.prototype.destroy = function destroy(msg) {
+Client.prototype.destroy = function destroy() {
   this.socket.destroy();
 
   this.emit('close');
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index d6af8589f3bc85..e33441971fe746 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -13,6 +13,8 @@ var StringDecoder;
 
 util.inherits(Readable, Stream);
 
+const kProxyEvents = ['error', 'close', 'destroy', 'pause', 'resume'];
+
 function prependListener(emitter, event, fn) {
   // Sadly this is not cacheable as some libraries bundle their own
   // event emitter implementation with them.
@@ -811,10 +813,9 @@ Readable.prototype.wrap = function(stream) {
   }
 
   // proxy certain important events.
-  const events = ['error', 'close', 'destroy', 'pause', 'resume'];
-  events.forEach(function(ev) {
-    stream.on(ev, self.emit.bind(self, ev));
-  });
+  for (var n = 0; n < kProxyEvents.length; n++) {
+    stream.on(kProxyEvents[n], self.emit.bind(self, kProxyEvents[n]));
+  }
 
   // when we try to consume some more bytes, simply unpause the
   // underlying stream.
diff --git a/lib/_stream_wrap.js b/lib/_stream_wrap.js
index fbc32965980e96..2ddf15069e5361 100644
--- a/lib/_stream_wrap.js
+++ b/lib/_stream_wrap.js
@@ -118,9 +118,8 @@ StreamWrap.prototype.doWrite = function doWrite(req, bufs) {
   const item = self._enqueue('write', req);
 
   self.stream.cork();
-  bufs.forEach(function(buf) {
-    self.stream.write(buf, done);
-  });
+  for (var n = 0; n < bufs.length; n++)
+    self.stream.write(bufs[n], done);
   self.stream.uncork();
 
   function done(err) {
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index ebd36519cf1525..4ad79cf7a28d15 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -300,12 +300,16 @@ var proxiedMethods = [
 ];
 
 // Proxy HandleWrap, PipeWrap and TCPWrap methods
-proxiedMethods.forEach(function(name) {
-  tls_wrap.TLSWrap.prototype[name] = function methodProxy(...args) {
+function makeMethodProxy(name) {
+  return function methodProxy(...args) {
     if (this._parent[name])
       return this._parent[name].apply(this._parent, args);
   };
-});
+}
+for (var n = 0; n < proxiedMethods.length; n++) {
+  tls_wrap.TLSWrap.prototype[proxiedMethods[n]] =
+    makeMethodProxy(proxiedMethods[n]);
+}
 
 tls_wrap.TLSWrap.prototype.close = function close(cb) {
   let ssl;
@@ -374,6 +378,12 @@ TLSSocket.prototype._wrapHandle = function(wrap) {
     res = null;
   });
 
+  if (wrap) {
+    wrap.on('close', function() {
+      res.onStreamClose();
+    });
+  }
+
   return res;
 };
 
diff --git a/lib/child_process.js b/lib/child_process.js
index 2ae9e3671d23e9..b7fdb5ce8bb53f 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -79,16 +79,10 @@ exports._forkChild = function(fd) {
 };
 
 
-function normalizeExecArgs(command /*, options, callback*/) {
-  let options;
-  let callback;
-
-  if (typeof arguments[1] === 'function') {
+function normalizeExecArgs(command, options, callback) {
+  if (typeof options === 'function') {
+    callback = options;
     options = undefined;
-    callback = arguments[1];
-  } else {
-    options = arguments[1];
-    callback = arguments[2];
   }
 
   // Make a shallow copy so we don't clobber the user's options object.
@@ -142,7 +136,7 @@ exports.execFile = function(file /*, args, options, callback*/) {
     callback = arguments[pos++];
   }
 
-  if (!callback && arguments[pos] != null) {
+  if (!callback && pos < arguments.length && arguments[pos] != null) {
     throw new TypeError('Incorrect value of args option');
   }
 
@@ -175,6 +169,8 @@ exports.execFile = function(file /*, args, options, callback*/) {
 
   var ex = null;
 
+  var cmd = file;
+
   function exithandler(code, signal) {
     if (exited) return;
     exited = true;
@@ -202,7 +198,6 @@ exports.execFile = function(file /*, args, options, callback*/) {
       return;
     }
 
-    var cmd = file;
     if (args.length !== 0)
       cmd += ' ' + args.join(' ');
 
@@ -311,18 +306,15 @@ function _convertCustomFds(options) {
   }
 }
 
-function normalizeSpawnArguments(file /*, args, options*/) {
-  var args, options;
-
-  if (Array.isArray(arguments[1])) {
-    args = arguments[1].slice(0);
-    options = arguments[2];
-  } else if (arguments[1] !== undefined &&
-             (arguments[1] === null || typeof arguments[1] !== 'object')) {
+function normalizeSpawnArguments(file, args, options) {
+  if (Array.isArray(args)) {
+    args = args.slice(0);
+  } else if (args !== undefined &&
+             (args === null || typeof args !== 'object')) {
     throw new TypeError('Incorrect value of args option');
   } else {
+    options = args;
     args = [];
-    options = arguments[1];
   }
 
   if (options === undefined)
diff --git a/lib/fs.js b/lib/fs.js
index c30de937c2afed..c1d8db9f8cb6ee 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -200,10 +200,11 @@ fs.Stats.prototype.isSocket = function() {
 };
 
 // Don't allow mode to accidentally be overwritten.
-['F_OK', 'R_OK', 'W_OK', 'X_OK'].forEach(function(key) {
-  Object.defineProperty(fs, key, {
-    enumerable: true, value: constants[key] || 0, writable: false
-  });
+Object.defineProperties(fs, {
+  F_OK: {enumerable: true, value: constants.F_OK || 0},
+  R_OK: {enumerable: true, value: constants.R_OK || 0},
+  W_OK: {enumerable: true, value: constants.W_OK || 0},
+  X_OK: {enumerable: true, value: constants.X_OK || 0},
 });
 
 function handleError(val, callback) {
diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js
index 12faa6bf00afb1..1dd51c01ff7a96 100644
--- a/lib/internal/bootstrap_node.js
+++ b/lib/internal/bootstrap_node.js
@@ -81,7 +81,9 @@
 
     } else if (process.argv[1] === 'inspect') {
       // Start the debugger agent
-      NativeModule.require('node-inspect/lib/_inspect').start();
+      process.nextTick(function() {
+        NativeModule.require('node-inspect/lib/_inspect').start();
+      });
 
     } else if (process.argv[1] === '--remote_debugging_server') {
       // Start the debugging server
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index f2376f70371c60..3cab1409422d6f 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -60,6 +60,8 @@ function message(key, args) {
 // Utility function for registering the error codes. Only used here. Exported
 // *only* to allow for testing.
 function E(sym, val) {
+  const assert = lazyAssert();
+  assert(messages.has(sym) === false, `Error symbol: ${sym} was already used.`);
   messages.set(sym, typeof val === 'function' ? val : String(val));
 }
 
diff --git a/lib/internal/readline.js b/lib/internal/readline.js
index 60fe946560aaaa..9f1884ad0ea9e1 100644
--- a/lib/internal/readline.js
+++ b/lib/internal/readline.js
@@ -1,7 +1,6 @@
 'use strict';
 
 // Regex used for ansi escape code splitting
-// eslint-disable-next-line no-control-regex
 // Adopted from https://github.com/chalk/ansi-regex/blob/master/index.js
 // License: MIT, authors: @sindresorhus, Qix-, and arjunmehta
 // Matches all ansi escape code sequences in a string
diff --git a/lib/module.js b/lib/module.js
index 0c66d3390d222c..d485c7c9a804a3 100644
--- a/lib/module.js
+++ b/lib/module.js
@@ -661,9 +661,8 @@ Module._preloadModules = function(requests) {
       throw e;
     }
   }
-  requests.forEach(function(request) {
-    parent.require(request);
-  });
+  for (var n = 0; n < requests.length; n++)
+    parent.require(requests[n]);
 };
 
 Module._initPaths();
diff --git a/lib/net.js b/lib/net.js
index 3c009a00fb77c0..309f38c360736b 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -1502,9 +1502,9 @@ Server.prototype.getConnections = function(cb) {
     if (--left === 0) return end(null, total);
   }
 
-  this._slaves.forEach(function(slave) {
-    slave.getConnections(oncount);
-  });
+  for (var n = 0; n < this._slaves.length; n++) {
+    this._slaves[n].getConnections(oncount);
+  }
 };
 
 
@@ -1540,9 +1540,8 @@ Server.prototype.close = function(cb) {
     this._connections++;
 
     // Poll slaves
-    this._slaves.forEach(function(slave) {
-      slave.close(onSlaveClose);
-    });
+    for (var n = 0; n < this._slaves.length; n++)
+      this._slaves[n].close(onSlaveClose);
   } else {
     this._emitCloseIfDrained();
   }
diff --git a/lib/readline.js b/lib/readline.js
index a571657a726d2a..52bdd976155439 100644
--- a/lib/readline.js
+++ b/lib/readline.js
@@ -371,9 +371,8 @@ Interface.prototype._normalWrite = function(b) {
     // either '' or (conceivably) the unfinished portion of the next line
     string = lines.pop();
     this._line_buffer = string;
-    lines.forEach(function(line) {
-      this._onLine(line);
-    }, this);
+    for (var n = 0; n < lines.length; n++)
+      this._onLine(lines[n]);
   } else if (string) {
     // no newlines this time, save what we have for next time
     this._line_buffer = string;
diff --git a/lib/repl.js b/lib/repl.js
index 72fd37e0a4a08f..c73a5069bbe181 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -47,7 +47,10 @@ const GLOBAL_OBJECT_PROPERTIES = [
   'ReferenceError', 'SyntaxError', 'TypeError', 'URIError', 'Math', 'JSON'
 ];
 const GLOBAL_OBJECT_PROPERTY_MAP = {};
-GLOBAL_OBJECT_PROPERTIES.forEach((p) => GLOBAL_OBJECT_PROPERTY_MAP[p] = p);
+for (var n = 0; n < GLOBAL_OBJECT_PROPERTIES.length; n++) {
+  GLOBAL_OBJECT_PROPERTY_MAP[GLOBAL_OBJECT_PROPERTIES[n]] =
+    GLOBAL_OBJECT_PROPERTIES[n];
+}
 
 try {
   // hack for require.resolve("./relative") to work properly.
@@ -692,13 +695,17 @@ REPLServer.prototype.createContext = function() {
       enumerable: true,
       get: () => _console
     });
-    Object.getOwnPropertyNames(global).filter((name) => {
-      if (name === 'console' || name === 'global') return false;
-      return GLOBAL_OBJECT_PROPERTY_MAP[name] === undefined;
-    }).forEach((name) => {
-      Object.defineProperty(context, name,
-                            Object.getOwnPropertyDescriptor(global, name));
-    });
+
+    var names = Object.getOwnPropertyNames(global);
+    for (var n = 0; n < names.length; n++) {
+      var name = names[n];
+      if (name === 'console' || name === 'global')
+        continue;
+      if (GLOBAL_OBJECT_PROPERTY_MAP[name] === undefined) {
+        Object.defineProperty(context, name,
+                              Object.getOwnPropertyDescriptor(global, name));
+      }
+    }
   }
 
   const module = new Module('<repl>');
@@ -769,10 +776,8 @@ function ArrayStream() {
   Stream.call(this);
 
   this.run = function(data) {
-    var self = this;
-    data.forEach(function(line) {
-      self.emit('data', line + '\n');
-    });
+    for (var n = 0; n < data.length; n++)
+      this.emit('data', `${data[n]}\n`);
   };
 }
 util.inherits(ArrayStream, Stream);
@@ -816,11 +821,11 @@ function complete(line, callback) {
     var tmp = this.lines.slice();
     // Kill off all function declarations to push all local variables into
     // global scope
-    this.lines.level.forEach(function(kill) {
-      if (kill.isFunction) {
+    for (var n = 0; n < this.lines.level.length; n++) {
+      var kill = this.lines.level[n];
+      if (kill.isFunction)
         tmp[kill.line] = '';
-      }
-    });
+    }
     var flat = new ArrayStream();         // make a new "input" stream
     var magic = new REPLServer('', flat); // make a nested REPL
     replMap.set(magic, replMap.get(this));
@@ -954,9 +959,8 @@ function complete(line, callback) {
               addStandardGlobals(completionGroups, filter);
             } else if (Array.isArray(globals[0])) {
               // Add grouped globals
-              globals.forEach(function(group) {
-                completionGroups.push(group);
-              });
+              for (var n = 0; n < globals.length; n++)
+                completionGroups.push(globals[n]);
             } else {
               completionGroups.push(globals);
               addStandardGlobals(completionGroups, filter);
@@ -1264,12 +1268,13 @@ function defineDefaultCommands(repl) {
         (max, name) => Math.max(max, name.length),
         0
       );
-      names.forEach((name) => {
-        const cmd = this.commands[name];
-        const spaces = ' '.repeat(longestNameLength - name.length + 3);
-        const line = '.' + name + (cmd.help ? spaces + cmd.help : '') + '\n';
+      for (var n = 0; n < names.length; n++) {
+        var name = names[n];
+        var cmd = this.commands[name];
+        var spaces = ' '.repeat(longestNameLength - name.length + 3);
+        var line = `.${name}${cmd.help ? spaces + cmd.help : ''}\n`;
         this.outputStream.write(line);
-      });
+      }
       this.displayPrompt();
     }
   });
@@ -1293,15 +1298,13 @@ function defineDefaultCommands(repl) {
       try {
         var stats = fs.statSync(file);
         if (stats && stats.isFile()) {
-          var self = this;
           var data = fs.readFileSync(file, 'utf8');
           var lines = data.split('\n');
           this.displayPrompt();
-          lines.forEach(function(line) {
-            if (line) {
-              self.write(line + '\n');
-            }
-          });
+          for (var n = 0; n < lines.length; n++) {
+            if (lines[n])
+              this.write(`${lines[n]}\n`);
+          }
         } else {
           this.outputStream.write('Failed to load:' + file +
                                   ' is not a valid file\n');
diff --git a/lib/util.js b/lib/util.js
index 8c880c674b5ad3..3378109b6126ed 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -682,12 +682,13 @@ function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
   if (remaining > 0) {
     output.push(`... ${remaining} more item${remaining > 1 ? 's' : ''}`);
   }
-  keys.forEach(function(key) {
+  for (var n = 0; n < keys.length; n++) {
+    var key = keys[n];
     if (typeof key === 'symbol' || !key.match(/^\d+$/)) {
       output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
                                  key, true));
     }
-  });
+  }
   return output;
 }
 
@@ -718,10 +719,10 @@ function formatSet(ctx, value, recurseTimes, visibleKeys, keys) {
     var str = formatValue(ctx, v, nextRecurseTimes);
     output.push(str);
   });
-  keys.forEach(function(key) {
+  for (var n = 0; n < keys.length; n++) {
     output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
-                               key, false));
-  });
+                               keys[n], false));
+  }
   return output;
 }
 
@@ -735,10 +736,10 @@ function formatMap(ctx, value, recurseTimes, visibleKeys, keys) {
     str += formatValue(ctx, v, nextRecurseTimes);
     output.push(str);
   });
-  keys.forEach(function(key) {
+  for (var n = 0; n < keys.length; n++) {
     output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
-                               key, false));
-  });
+                               keys[n], false));
+  }
   return output;
 }
 
@@ -768,10 +769,10 @@ function formatPromise(ctx, value, recurseTimes, visibleKeys, keys) {
       output.push(str);
     }
   }
-  keys.forEach(function(key) {
+  for (var n = 0; n < keys.length; n++) {
     output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
-                               key, false));
-  });
+                               keys[n], false));
+  }
   return output;
 }
 
diff --git a/src/inspector_socket_server.cc b/src/inspector_socket_server.cc
index ee44a69a683690..1c8fa70b65a3b3 100644
--- a/src/inspector_socket_server.cc
+++ b/src/inspector_socket_server.cc
@@ -139,6 +139,28 @@ void SendProtocolJson(InspectorSocket* socket) {
   SendHttpResponse(socket, data);
 }
 
+int GetSocketHost(uv_tcp_t* socket, std::string* out_host) {
+  char ip[INET6_ADDRSTRLEN];
+  sockaddr_storage addr;
+  int len = sizeof(addr);
+  int err = uv_tcp_getsockname(socket,
+                               reinterpret_cast<struct sockaddr*>(&addr),
+                               &len);
+  if (err != 0)
+    return err;
+  if (addr.ss_family == AF_INET6) {
+    const sockaddr_in6* v6 = reinterpret_cast<const sockaddr_in6*>(&addr);
+    err = uv_ip6_name(v6, ip, sizeof(ip));
+  } else {
+    const sockaddr_in* v4 = reinterpret_cast<const sockaddr_in*>(&addr);
+    err = uv_ip4_name(v4, ip, sizeof(ip));
+  }
+  if (err != 0)
+    return err;
+  *out_host = ip;
+  return err;
+}
+
 int GetPort(uv_tcp_t* socket, int* out_port) {
   sockaddr_storage addr;
   int len = sizeof(addr);
@@ -341,7 +363,9 @@ void InspectorSocketServer::SendListResponse(InspectorSocket* socket) {
       }
     }
     if (!connected) {
-      std::string address = GetWsUrl(host_, port_, id);
+      std::string host;
+      GetSocketHost(&socket->client, &host);
+      std::string address = GetWsUrl(host, port_, id);
       std::ostringstream frontend_url;
       frontend_url << "chrome-devtools://devtools/bundled";
       frontend_url << "/inspector.html?experiments=true&v8only=true&ws=";
diff --git a/src/node_version.h b/src/node_version.h
index 93d39b7b5ab5d8..80706f8caa992b 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -3,7 +3,7 @@
 
 #define NODE_MAJOR_VERSION 7
 #define NODE_MINOR_VERSION 7
-#define NODE_PATCH_VERSION 4
+#define NODE_PATCH_VERSION 5
 
 #define NODE_VERSION_IS_RELEASE 0
 
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index 581e017ef85016..e2bf06d5fb8429 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -425,6 +425,12 @@ void TLSWrap::ClearOut() {
       memcpy(buf.base, current, avail);
       OnRead(avail, &buf);
 
+      // Caveat emptor: OnRead() calls into JS land which can result in
+      // the SSL context object being destroyed.  We have to carefully
+      // check that ssl_ != nullptr afterwards.
+      if (ssl_ == nullptr)
+        return;
+
       read -= avail;
       current += avail;
     }
@@ -522,7 +528,7 @@ int TLSWrap::GetFD() {
 
 
 bool TLSWrap::IsAlive() {
-  return ssl_ != nullptr && stream_->IsAlive();
+  return ssl_ != nullptr && stream_ != nullptr && stream_->IsAlive();
 }
 
 
@@ -781,6 +787,14 @@ void TLSWrap::EnableSessionCallbacks(
 }
 
 
+void TLSWrap::OnStreamClose(const FunctionCallbackInfo<Value>& args) {
+  TLSWrap* wrap;
+  ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
+
+  wrap->stream_ = nullptr;
+}
+
+
 void TLSWrap::DestroySSL(const FunctionCallbackInfo<Value>& args) {
   TLSWrap* wrap;
   ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder());
@@ -911,6 +925,7 @@ void TLSWrap::Initialize(Local<Object> target,
   env->SetProtoMethod(t, "enableSessionCallbacks", EnableSessionCallbacks);
   env->SetProtoMethod(t, "destroySSL", DestroySSL);
   env->SetProtoMethod(t, "enableCertCb", EnableCertCb);
+  env->SetProtoMethod(t, "onStreamClose", OnStreamClose);
 
   StreamBase::AddMethods<TLSWrap>(env, t, StreamBase::kFlagHasWritev);
   SSLWrap<TLSWrap>::AddMethods(env, t);
diff --git a/src/tls_wrap.h b/src/tls_wrap.h
index f390c9fe9281f7..0efdbf0e3991d3 100644
--- a/src/tls_wrap.h
+++ b/src/tls_wrap.h
@@ -137,6 +137,7 @@ class TLSWrap : public AsyncWrap,
   static void EnableCertCb(
       const v8::FunctionCallbackInfo<v8::Value>& args);
   static void DestroySSL(const v8::FunctionCallbackInfo<v8::Value>& args);
+  static void OnStreamClose(const v8::FunctionCallbackInfo<v8::Value>& args);
 
 #ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
   static void GetServername(const v8::FunctionCallbackInfo<v8::Value>& args);
diff --git a/test/inspector/inspector-helper.js b/test/inspector/inspector-helper.js
index beaf1a8aa1a3fd..004f4f93e4c309 100644
--- a/test/inspector/inspector-helper.js
+++ b/test/inspector/inspector-helper.js
@@ -80,8 +80,8 @@ function tearDown(child, err) {
   }
 }
 
-function checkHttpResponse(port, path, callback) {
-  http.get({port, path}, function(res) {
+function checkHttpResponse(host, port, path, callback, errorcb) {
+  const req = http.get({host, port, path}, function(res) {
     let response = '';
     res.setEncoding('utf8');
     res
@@ -98,6 +98,8 @@ function checkHttpResponse(port, path, callback) {
         callback(err, json);
       });
   });
+  if (errorcb)
+    req.on('error', errorcb);
 }
 
 function makeBufferingDataCallback(dataCallback) {
@@ -295,7 +297,7 @@ TestSession.prototype.disconnect = function(childDone) {
 
 TestSession.prototype.testHttpResponse = function(path, check) {
   return this.enqueue((callback) =>
-      checkHttpResponse(this.harness_.port, path, (err, response) => {
+      checkHttpResponse(null, this.harness_.port, path, (err, response) => {
         check.call(this, err, response);
         callback();
       }));
@@ -361,12 +363,17 @@ Harness.prototype.enqueue_ = function(task) {
   return this;
 };
 
-Harness.prototype.testHttpResponse = function(path, check) {
+Harness.prototype.testHttpResponse = function(host, path, check, errorcb) {
   return this.enqueue_((doneCallback) => {
-    checkHttpResponse(this.port, path, (err, response) => {
-      check.call(this, err, response);
-      doneCallback();
-    });
+    function wrap(callback) {
+      if (callback) {
+        return function() {
+          callback(...arguments);
+          doneCallback();
+        };
+      }
+    }
+    checkHttpResponse(host, this.port, path, wrap(check), wrap(errorcb));
   });
 };
 
@@ -404,7 +411,7 @@ Harness.prototype.wsHandshake = function(devtoolsUrl, tests, readyCallback) {
 
 Harness.prototype.runFrontendSession = function(tests) {
   return this.enqueue_((callback) => {
-    checkHttpResponse(this.port, '/json/list', (err, response) => {
+    checkHttpResponse(null, this.port, '/json/list', (err, response) => {
       assert.ifError(err);
       this.wsHandshake(response[0]['webSocketDebuggerUrl'], tests, callback);
     });
diff --git a/test/inspector/test-inspector-ip-detection.js b/test/inspector/test-inspector-ip-detection.js
new file mode 100644
index 00000000000000..4d138d03177d9b
--- /dev/null
+++ b/test/inspector/test-inspector-ip-detection.js
@@ -0,0 +1,52 @@
+'use strict';
+const common = require('../common');
+common.skipIfInspectorDisabled && common.skipIfInspectorDisabled();
+
+const assert = require('assert');
+const helper = require('./inspector-helper.js');
+const os = require('os');
+
+const ip = pickIPv4Address();
+
+if (!ip) {
+  common.skip('No IP address found');
+  return;
+}
+
+function checkListResponse(instance, err, response) {
+  assert.ifError(err);
+  const res = response[0];
+  const wsUrl = res['webSocketDebuggerUrl'];
+  assert.ok(wsUrl);
+  const match = wsUrl.match(/^ws:\/\/(.*):9229\/(.*)/);
+  assert.strictEqual(ip, match[1]);
+  assert.strictEqual(res['id'], match[2]);
+  assert.strictEqual(ip, res['devtoolsFrontendUrl'].match(/.*ws=(.*):9229/)[1]);
+  instance.childInstanceDone = true;
+}
+
+function checkError(instance, error) {
+  // Some OSes will not allow us to connect
+  if (error.code === 'EHOSTUNREACH') {
+    common.skip('Unable to connect to self');
+  } else {
+    throw error;
+  }
+  instance.childInstanceDone = true;
+}
+
+function runTests(instance) {
+  instance
+    .testHttpResponse(ip, '/json/list', checkListResponse.bind(null, instance),
+                      checkError.bind(null, instance))
+    .kill();
+}
+
+function pickIPv4Address() {
+  for (const i of [].concat(...Object.values(os.networkInterfaces()))) {
+    if (i.family === 'IPv4' && i.address !== '127.0.0.1')
+      return i.address;
+  }
+}
+
+helper.startNodeForInspectorTest(runTests, '--inspect-brk=0.0.0.0');
diff --git a/test/inspector/test-inspector.js b/test/inspector/test-inspector.js
index a1c69cb6fbb2fe..23dfa98ff62603 100644
--- a/test/inspector/test-inspector.js
+++ b/test/inspector/test-inspector.js
@@ -208,12 +208,12 @@ function testWaitsForFrontendDisconnect(session, harness) {
 
 function runTests(harness) {
   harness
-    .testHttpResponse('/json', checkListResponse)
-    .testHttpResponse('/json/list', checkListResponse)
-    .testHttpResponse('/json/version', checkVersion)
-    .testHttpResponse('/json/activate', checkBadPath)
-    .testHttpResponse('/json/activate/boom', checkBadPath)
-    .testHttpResponse('/json/badpath', checkBadPath)
+    .testHttpResponse(null, '/json', checkListResponse)
+    .testHttpResponse(null, '/json/list', checkListResponse)
+    .testHttpResponse(null, '/json/version', checkVersion)
+    .testHttpResponse(null, '/json/activate', checkBadPath)
+    .testHttpResponse(null, '/json/activate/boom', checkBadPath)
+    .testHttpResponse(null, '/json/badpath', checkBadPath)
     .runFrontendSession([
       testNoUrlsWhenConnected,
       testBreakpointOnStart,
diff --git a/test/known_issues/test-vm-getters.js b/test/known_issues/test-vm-getters.js
index f815e6d658351d..af27eeee644032 100644
--- a/test/known_issues/test-vm-getters.js
+++ b/test/known_issues/test-vm-getters.js
@@ -16,4 +16,9 @@ const context = vm.createContext(sandbox);
 const code = 'Object.getOwnPropertyDescriptor(this, "prop");';
 const result = vm.runInContext(code, context);
 
-assert.strictEqual(result, descriptor);
+// Ref: https://github.com/nodejs/node/issues/11803
+
+assert.deepStrictEqual(Object.keys(result), Object.keys(descriptor));
+for (const prop of Object.keys(result)) {
+  assert.strictEqual(result[prop], descriptor[prop]);
+}
diff --git a/test/known_issues/test-vm-proxy-failure-CP.js b/test/known_issues/test-vm-proxy-failure-CP.js
new file mode 100644
index 00000000000000..de644599b233b8
--- /dev/null
+++ b/test/known_issues/test-vm-proxy-failure-CP.js
@@ -0,0 +1,20 @@
+'use strict';
+
+// Sandbox throws in CopyProperties() despite no code being run
+// Issue: https://github.com/nodejs/node/issues/11902
+
+
+require('../common');
+const assert = require('assert');
+const vm = require('vm');
+
+const handler = {
+    getOwnPropertyDescriptor: (target, prop) => {
+      throw new Error('whoops');
+    }
+};
+const sandbox = new Proxy({foo: 'bar'}, handler);
+const context = vm.createContext(sandbox);
+
+
+assert.doesNotThrow(() => vm.runInContext('', context));
diff --git a/test/parallel/test-child-process-fork-net.js b/test/parallel/test-child-process-fork-net.js
index 157704a9ccf9c9..8b8cc44bd418d8 100644
--- a/test/parallel/test-child-process-fork-net.js
+++ b/test/parallel/test-child-process-fork-net.js
@@ -1,5 +1,5 @@
 'use strict';
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 const fork = require('child_process').fork;
 const net = require('net');
@@ -60,9 +60,10 @@ if (process.argv[2] === 'child') {
 
   const child = fork(process.argv[1], ['child']);
 
-  child.on('exit', function() {
-    console.log('CHILD: died');
-  });
+  child.on('exit', common.mustCall(function(code, signal) {
+    const message = `CHILD: died with ${code}, ${signal}`;
+    assert.strictEqual(code, 0, message);
+  }));
 
   // send net.Server to child and test by connecting
   const testServer = function(callback) {
@@ -171,7 +172,6 @@ if (process.argv[2] === 'child') {
 
       testSocket(function() {
         socketSuccess = true;
-        child.kill();
       });
     });
 
diff --git a/test/parallel/test-cli-eval.js b/test/parallel/test-cli-eval.js
index 260acdb0d6f90a..9f781642a9724e 100644
--- a/test/parallel/test-cli-eval.js
+++ b/test/parallel/test-cli-eval.js
@@ -122,6 +122,17 @@ child.exec(`${nodejs} --use-strict -p process.execArgv`,
                assert.strictEqual(stdout, '');
                assert.strictEqual(stderr, '');
              }));
+
+  // Make sure that monkey-patching process.execArgv doesn't cause child_process
+  // to incorrectly munge execArgv.
+  child.exec(
+    `${nodejs} -e "process.execArgv = ['-e', 'console.log(42)', 'thirdArg'];` +
+                  `require('child_process').fork('${emptyFile}')"`,
+    common.mustCall((err, stdout, stderr) => {
+      assert.ifError(err);
+      assert.strictEqual(stdout, '42\n');
+      assert.strictEqual(stderr, '');
+    }));
 }
 
 // Regression test for https://github.com/nodejs/node/issues/8534.
diff --git a/test/parallel/test-internal-errors.js b/test/parallel/test-internal-errors.js
index 354209fbadaade..014a0a7a038c6e 100644
--- a/test/parallel/test-internal-errors.js
+++ b/test/parallel/test-internal-errors.js
@@ -12,6 +12,7 @@ const err1 = new errors.Error('TEST_ERROR_1', 'test');
 const err2 = new errors.TypeError('TEST_ERROR_1', 'test');
 const err3 = new errors.RangeError('TEST_ERROR_1', 'test');
 const err4 = new errors.Error('TEST_ERROR_2', 'abc', 'xyz');
+const err5 = new errors.Error('TEST_ERROR_1');
 
 assert(err1 instanceof Error);
 assert.strictEqual(err1.name, 'Error[TEST_ERROR_1]');
@@ -33,6 +34,11 @@ assert.strictEqual(err4.name, 'Error[TEST_ERROR_2]');
 assert.strictEqual(err4.message, 'abc xyz');
 assert.strictEqual(err4.code, 'TEST_ERROR_2');
 
+assert(err5 instanceof Error);
+assert.strictEqual(err5.name, 'Error[TEST_ERROR_1]');
+assert.strictEqual(err5.message, 'Error for testing purposes: %s');
+assert.strictEqual(err5.code, 'TEST_ERROR_1');
+
 assert.throws(
   () => new errors.Error('TEST_FOO_KEY'),
   /^AssertionError: An invalid error message key was used: TEST_FOO_KEY.$/);
@@ -118,3 +124,9 @@ assert.throws(() => {
                            type: TypeError,
                            message: /^Error for testing 2/ }));
 }, /AssertionError: .+ does not match \S/);
+
+assert.doesNotThrow(() => errors.E('TEST_ERROR_USED_SYMBOL'));
+assert.throws(
+  () => errors.E('TEST_ERROR_USED_SYMBOL'),
+  /^AssertionError: Error symbol: TEST_ERROR_USED_SYMBOL was already used\.$/
+);
diff --git a/test/known_issues/test-repl-function-redefinition-edge-case.js b/test/parallel/test-repl-function-definition-edge-case.js
similarity index 95%
rename from test/known_issues/test-repl-function-redefinition-edge-case.js
rename to test/parallel/test-repl-function-definition-edge-case.js
index 03b721fba7e7d5..1e3063e3db53ff 100644
--- a/test/known_issues/test-repl-function-redefinition-edge-case.js
+++ b/test/parallel/test-repl-function-definition-edge-case.js
@@ -13,7 +13,7 @@ r.input.emit('data', 'function a() { return 42; } (1)\n');
 r.input.emit('data', 'a\n');
 r.input.emit('data', '.exit');
 
-const expected = '1\n[Function a]\n';
+const expected = '1\n[Function: a]\n';
 const got = r.output.accumulator.join('');
 assert.strictEqual(got, expected);
 
diff --git a/test/parallel/test-tls-socket-close.js b/test/parallel/test-tls-socket-close.js
new file mode 100644
index 00000000000000..440c0c4ff7cde7
--- /dev/null
+++ b/test/parallel/test-tls-socket-close.js
@@ -0,0 +1,43 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+
+const tls = require('tls');
+const fs = require('fs');
+const net = require('net');
+
+const key = fs.readFileSync(common.fixturesDir + '/keys/agent2-key.pem');
+const cert = fs.readFileSync(common.fixturesDir + '/keys/agent2-cert.pem');
+
+const T = 100;
+
+// tls server
+const tlsServer = tls.createServer({ cert, key }, (socket) => {
+  setTimeout(() => {
+    socket.on('error', (error) => {
+      assert.strictEqual(error.code, 'EINVAL');
+      tlsServer.close();
+      netServer.close();
+    });
+    socket.write('bar');
+  }, T * 2);
+});
+
+// plain tcp server
+const netServer = net.createServer((socket) => {
+    // if client wants to use tls
+  tlsServer.emit('connection', socket);
+
+  socket.setTimeout(T, () => {
+    // this breaks if TLSSocket is already managing the socket:
+    socket.destroy();
+  });
+}).listen(0, common.mustCall(function() {
+
+  // connect client
+  tls.connect({
+    host: 'localhost',
+    port: this.address().port,
+    rejectUnauthorized: false
+  }).write('foo');
+}));
diff --git a/test/parallel/test-tls-socket-destroy.js b/test/parallel/test-tls-socket-destroy.js
new file mode 100644
index 00000000000000..27651f8ec7206a
--- /dev/null
+++ b/test/parallel/test-tls-socket-destroy.js
@@ -0,0 +1,36 @@
+'use strict';
+
+const common = require('../common');
+
+if (!common.hasCrypto) {
+  common.skip('missing crypto');
+  return;
+}
+
+const fs = require('fs');
+const net = require('net');
+const tls = require('tls');
+
+const key = fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem');
+const cert = fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem');
+const secureContext = tls.createSecureContext({ key, cert });
+
+const server = net.createServer(common.mustCall((conn) => {
+  const options = { isServer: true, secureContext, server };
+  const socket = new tls.TLSSocket(conn, options);
+  socket.once('data', common.mustCall(() => {
+    socket._destroySSL();  // Should not crash.
+    server.close();
+  }));
+}));
+
+server.listen(0, function() {
+  const options = {
+    port: this.address().port,
+    rejectUnauthorized: false,
+  };
+  tls.connect(options, function() {
+    this.write('*'.repeat(1 << 20));  // Write more data than fits in a frame.
+    this.on('error', this.destroy);  // Server closes connection on us.
+  });
+});
diff --git a/test/parallel/test-url-relative.js b/test/parallel/test-url-relative.js
new file mode 100644
index 00000000000000..cf379e591d6088
--- /dev/null
+++ b/test/parallel/test-url-relative.js
@@ -0,0 +1,432 @@
+'use strict';
+require('../common');
+const assert = require('assert');
+const inspect = require('util').inspect;
+const url = require('url');
+
+/*
+ [from, path, expected]
+*/
+const relativeTests = [
+  ['/foo/bar/baz', 'quux', '/foo/bar/quux'],
+  ['/foo/bar/baz', 'quux/asdf', '/foo/bar/quux/asdf'],
+  ['/foo/bar/baz', 'quux/baz', '/foo/bar/quux/baz'],
+  ['/foo/bar/baz', '../quux/baz', '/foo/quux/baz'],
+  ['/foo/bar/baz', '/bar', '/bar'],
+  ['/foo/bar/baz/', 'quux', '/foo/bar/baz/quux'],
+  ['/foo/bar/baz/', 'quux/baz', '/foo/bar/baz/quux/baz'],
+  ['/foo/bar/baz', '../../../../../../../../quux/baz', '/quux/baz'],
+  ['/foo/bar/baz', '../../../../../../../quux/baz', '/quux/baz'],
+  ['/foo', '.', '/'],
+  ['/foo', '..', '/'],
+  ['/foo/', '.', '/foo/'],
+  ['/foo/', '..', '/'],
+  ['/foo/bar', '.', '/foo/'],
+  ['/foo/bar', '..', '/'],
+  ['/foo/bar/', '.', '/foo/bar/'],
+  ['/foo/bar/', '..', '/foo/'],
+  ['foo/bar', '../../../baz', '../../baz'],
+  ['foo/bar/', '../../../baz', '../baz'],
+  ['http://example.com/b//c//d;p?q#blarg', 'https:#hash2', 'https:///#hash2'],
+  ['http://example.com/b//c//d;p?q#blarg',
+   'https:/p/a/t/h?s#hash2',
+   'https://p/a/t/h?s#hash2'],
+  ['http://example.com/b//c//d;p?q#blarg',
+   'https://u:p@h.com/p/a/t/h?s#hash2',
+   'https://u:p@h.com/p/a/t/h?s#hash2'],
+  ['http://example.com/b//c//d;p?q#blarg',
+   'https:/a/b/c/d',
+   'https://a/b/c/d'],
+  ['http://example.com/b//c//d;p?q#blarg',
+   'http:#hash2',
+   'http://example.com/b//c//d;p?q#hash2'],
+  ['http://example.com/b//c//d;p?q#blarg',
+   'http:/p/a/t/h?s#hash2',
+   'http://example.com/p/a/t/h?s#hash2'],
+  ['http://example.com/b//c//d;p?q#blarg',
+   'http://u:p@h.com/p/a/t/h?s#hash2',
+   'http://u:p@h.com/p/a/t/h?s#hash2'],
+  ['http://example.com/b//c//d;p?q#blarg',
+   'http:/a/b/c/d',
+   'http://example.com/a/b/c/d'],
+  ['/foo/bar/baz', '/../etc/passwd', '/etc/passwd'],
+  ['http://localhost', 'file:///Users/foo', 'file:///Users/foo'],
+  ['http://localhost', 'file://foo/Users', 'file://foo/Users']
+];
+relativeTests.forEach(function(relativeTest) {
+  const a = url.resolve(relativeTest[0], relativeTest[1]);
+  const e = relativeTest[2];
+  assert.strictEqual(a, e,
+                     `resolve(${relativeTest[0]}, ${relativeTest[1]})` +
+                     ` == ${e}\n  actual=${a}`);
+});
+
+//
+// Tests below taken from Chiron
+// http://code.google.com/p/chironjs/source/browse/trunk/src/test/http/url.js
+//
+// Copyright (c) 2002-2008 Kris Kowal <http://cixar.com/~kris.kowal>
+// used with permission under MIT License
+//
+// Changes marked with @isaacs
+
+const bases = [
+  'http://a/b/c/d;p?q',
+  'http://a/b/c/d;p?q=1/2',
+  'http://a/b/c/d;p=1/2?q',
+  'fred:///s//a/b/c',
+  'http:///s//a/b/c'
+];
+
+//[to, from, result]
+const relativeTests2 = [
+  // http://lists.w3.org/Archives/Public/uri/2004Feb/0114.html
+  ['../c', 'foo:a/b', 'foo:c'],
+  ['foo:.', 'foo:a', 'foo:'],
+  ['/foo/../../../bar', 'zz:abc', 'zz:/bar'],
+  ['/foo/../bar', 'zz:abc', 'zz:/bar'],
+  // @isaacs Disagree. Not how web browsers resolve this.
+  ['foo/../../../bar', 'zz:abc', 'zz:bar'],
+  // ['foo/../../../bar',  'zz:abc', 'zz:../../bar'], // @isaacs Added
+  ['foo/../bar', 'zz:abc', 'zz:bar'],
+  ['zz:.', 'zz:abc', 'zz:'],
+  ['/.', bases[0], 'http://a/'],
+  ['/.foo', bases[0], 'http://a/.foo'],
+  ['.foo', bases[0], 'http://a/b/c/.foo'],
+
+  // http://gbiv.com/protocols/uri/test/rel_examples1.html
+  // examples from RFC 2396
+  ['g:h', bases[0], 'g:h'],
+  ['g', bases[0], 'http://a/b/c/g'],
+  ['./g', bases[0], 'http://a/b/c/g'],
+  ['g/', bases[0], 'http://a/b/c/g/'],
+  ['/g', bases[0], 'http://a/g'],
+  ['//g', bases[0], 'http://g/'],
+  // changed with RFC 2396bis
+  //('?y', bases[0], 'http://a/b/c/d;p?y'],
+  ['?y', bases[0], 'http://a/b/c/d;p?y'],
+  ['g?y', bases[0], 'http://a/b/c/g?y'],
+  // changed with RFC 2396bis
+  //('#s', bases[0], CURRENT_DOC_URI + '#s'],
+  ['#s', bases[0], 'http://a/b/c/d;p?q#s'],
+  ['g#s', bases[0], 'http://a/b/c/g#s'],
+  ['g?y#s', bases[0], 'http://a/b/c/g?y#s'],
+  [';x', bases[0], 'http://a/b/c/;x'],
+  ['g;x', bases[0], 'http://a/b/c/g;x'],
+  ['g;x?y#s', bases[0], 'http://a/b/c/g;x?y#s'],
+  // changed with RFC 2396bis
+  //('', bases[0], CURRENT_DOC_URI],
+  ['', bases[0], 'http://a/b/c/d;p?q'],
+  ['.', bases[0], 'http://a/b/c/'],
+  ['./', bases[0], 'http://a/b/c/'],
+  ['..', bases[0], 'http://a/b/'],
+  ['../', bases[0], 'http://a/b/'],
+  ['../g', bases[0], 'http://a/b/g'],
+  ['../..', bases[0], 'http://a/'],
+  ['../../', bases[0], 'http://a/'],
+  ['../../g', bases[0], 'http://a/g'],
+  ['../../../g', bases[0], ('http://a/../g', 'http://a/g')],
+  ['../../../../g', bases[0], ('http://a/../../g', 'http://a/g')],
+  // changed with RFC 2396bis
+  //('/./g', bases[0], 'http://a/./g'],
+  ['/./g', bases[0], 'http://a/g'],
+  // changed with RFC 2396bis
+  //('/../g', bases[0], 'http://a/../g'],
+  ['/../g', bases[0], 'http://a/g'],
+  ['g.', bases[0], 'http://a/b/c/g.'],
+  ['.g', bases[0], 'http://a/b/c/.g'],
+  ['g..', bases[0], 'http://a/b/c/g..'],
+  ['..g', bases[0], 'http://a/b/c/..g'],
+  ['./../g', bases[0], 'http://a/b/g'],
+  ['./g/.', bases[0], 'http://a/b/c/g/'],
+  ['g/./h', bases[0], 'http://a/b/c/g/h'],
+  ['g/../h', bases[0], 'http://a/b/c/h'],
+  ['g;x=1/./y', bases[0], 'http://a/b/c/g;x=1/y'],
+  ['g;x=1/../y', bases[0], 'http://a/b/c/y'],
+  ['g?y/./x', bases[0], 'http://a/b/c/g?y/./x'],
+  ['g?y/../x', bases[0], 'http://a/b/c/g?y/../x'],
+  ['g#s/./x', bases[0], 'http://a/b/c/g#s/./x'],
+  ['g#s/../x', bases[0], 'http://a/b/c/g#s/../x'],
+  ['http:g', bases[0], ('http:g', 'http://a/b/c/g')],
+  ['http:', bases[0], ('http:', bases[0])],
+  // not sure where this one originated
+  ['/a/b/c/./../../g', bases[0], 'http://a/a/g'],
+
+  // http://gbiv.com/protocols/uri/test/rel_examples2.html
+  // slashes in base URI's query args
+  ['g', bases[1], 'http://a/b/c/g'],
+  ['./g', bases[1], 'http://a/b/c/g'],
+  ['g/', bases[1], 'http://a/b/c/g/'],
+  ['/g', bases[1], 'http://a/g'],
+  ['//g', bases[1], 'http://g/'],
+  // changed in RFC 2396bis
+  //('?y', bases[1], 'http://a/b/c/?y'],
+  ['?y', bases[1], 'http://a/b/c/d;p?y'],
+  ['g?y', bases[1], 'http://a/b/c/g?y'],
+  ['g?y/./x', bases[1], 'http://a/b/c/g?y/./x'],
+  ['g?y/../x', bases[1], 'http://a/b/c/g?y/../x'],
+  ['g#s', bases[1], 'http://a/b/c/g#s'],
+  ['g#s/./x', bases[1], 'http://a/b/c/g#s/./x'],
+  ['g#s/../x', bases[1], 'http://a/b/c/g#s/../x'],
+  ['./', bases[1], 'http://a/b/c/'],
+  ['../', bases[1], 'http://a/b/'],
+  ['../g', bases[1], 'http://a/b/g'],
+  ['../../', bases[1], 'http://a/'],
+  ['../../g', bases[1], 'http://a/g'],
+
+  // http://gbiv.com/protocols/uri/test/rel_examples3.html
+  // slashes in path params
+  // all of these changed in RFC 2396bis
+  ['g', bases[2], 'http://a/b/c/d;p=1/g'],
+  ['./g', bases[2], 'http://a/b/c/d;p=1/g'],
+  ['g/', bases[2], 'http://a/b/c/d;p=1/g/'],
+  ['g?y', bases[2], 'http://a/b/c/d;p=1/g?y'],
+  [';x', bases[2], 'http://a/b/c/d;p=1/;x'],
+  ['g;x', bases[2], 'http://a/b/c/d;p=1/g;x'],
+  ['g;x=1/./y', bases[2], 'http://a/b/c/d;p=1/g;x=1/y'],
+  ['g;x=1/../y', bases[2], 'http://a/b/c/d;p=1/y'],
+  ['./', bases[2], 'http://a/b/c/d;p=1/'],
+  ['../', bases[2], 'http://a/b/c/'],
+  ['../g', bases[2], 'http://a/b/c/g'],
+  ['../../', bases[2], 'http://a/b/'],
+  ['../../g', bases[2], 'http://a/b/g'],
+
+  // http://gbiv.com/protocols/uri/test/rel_examples4.html
+  // double and triple slash, unknown scheme
+  ['g:h', bases[3], 'g:h'],
+  ['g', bases[3], 'fred:///s//a/b/g'],
+  ['./g', bases[3], 'fred:///s//a/b/g'],
+  ['g/', bases[3], 'fred:///s//a/b/g/'],
+  ['/g', bases[3], 'fred:///g'],  // may change to fred:///s//a/g
+  ['//g', bases[3], 'fred://g'],   // may change to fred:///s//g
+  ['//g/x', bases[3], 'fred://g/x'], // may change to fred:///s//g/x
+  ['///g', bases[3], 'fred:///g'],
+  ['./', bases[3], 'fred:///s//a/b/'],
+  ['../', bases[3], 'fred:///s//a/'],
+  ['../g', bases[3], 'fred:///s//a/g'],
+
+  ['../../', bases[3], 'fred:///s//'],
+  ['../../g', bases[3], 'fred:///s//g'],
+  ['../../../g', bases[3], 'fred:///s/g'],
+  // may change to fred:///s//a/../../../g
+  ['../../../../g', bases[3], 'fred:///g'],
+
+  // http://gbiv.com/protocols/uri/test/rel_examples5.html
+  // double and triple slash, well-known scheme
+  ['g:h', bases[4], 'g:h'],
+  ['g', bases[4], 'http:///s//a/b/g'],
+  ['./g', bases[4], 'http:///s//a/b/g'],
+  ['g/', bases[4], 'http:///s//a/b/g/'],
+  ['/g', bases[4], 'http:///g'],  // may change to http:///s//a/g
+  ['//g', bases[4], 'http://g/'],   // may change to http:///s//g
+  ['//g/x', bases[4], 'http://g/x'], // may change to http:///s//g/x
+  ['///g', bases[4], 'http:///g'],
+  ['./', bases[4], 'http:///s//a/b/'],
+  ['../', bases[4], 'http:///s//a/'],
+  ['../g', bases[4], 'http:///s//a/g'],
+  ['../../', bases[4], 'http:///s//'],
+  ['../../g', bases[4], 'http:///s//g'],
+  // may change to http:///s//a/../../g
+  ['../../../g', bases[4], 'http:///s/g'],
+  // may change to http:///s//a/../../../g
+  ['../../../../g', bases[4], 'http:///g'],
+
+  // from Dan Connelly's tests in http://www.w3.org/2000/10/swap/uripath.py
+  ['bar:abc', 'foo:xyz', 'bar:abc'],
+  ['../abc', 'http://example/x/y/z', 'http://example/x/abc'],
+  ['http://example/x/abc', 'http://example2/x/y/z', 'http://example/x/abc'],
+  ['../r', 'http://ex/x/y/z', 'http://ex/x/r'],
+  ['q/r', 'http://ex/x/y', 'http://ex/x/q/r'],
+  ['q/r#s', 'http://ex/x/y', 'http://ex/x/q/r#s'],
+  ['q/r#s/t', 'http://ex/x/y', 'http://ex/x/q/r#s/t'],
+  ['ftp://ex/x/q/r', 'http://ex/x/y', 'ftp://ex/x/q/r'],
+  ['', 'http://ex/x/y', 'http://ex/x/y'],
+  ['', 'http://ex/x/y/', 'http://ex/x/y/'],
+  ['', 'http://ex/x/y/pdq', 'http://ex/x/y/pdq'],
+  ['z/', 'http://ex/x/y/', 'http://ex/x/y/z/'],
+  ['#Animal',
+   'file:/swap/test/animal.rdf',
+   'file:/swap/test/animal.rdf#Animal'],
+  ['../abc', 'file:/e/x/y/z', 'file:/e/x/abc'],
+  ['/example/x/abc', 'file:/example2/x/y/z', 'file:/example/x/abc'],
+  ['../r', 'file:/ex/x/y/z', 'file:/ex/x/r'],
+  ['/r', 'file:/ex/x/y/z', 'file:/r'],
+  ['q/r', 'file:/ex/x/y', 'file:/ex/x/q/r'],
+  ['q/r#s', 'file:/ex/x/y', 'file:/ex/x/q/r#s'],
+  ['q/r#', 'file:/ex/x/y', 'file:/ex/x/q/r#'],
+  ['q/r#s/t', 'file:/ex/x/y', 'file:/ex/x/q/r#s/t'],
+  ['ftp://ex/x/q/r', 'file:/ex/x/y', 'ftp://ex/x/q/r'],
+  ['', 'file:/ex/x/y', 'file:/ex/x/y'],
+  ['', 'file:/ex/x/y/', 'file:/ex/x/y/'],
+  ['', 'file:/ex/x/y/pdq', 'file:/ex/x/y/pdq'],
+  ['z/', 'file:/ex/x/y/', 'file:/ex/x/y/z/'],
+  ['file://meetings.example.com/cal#m1',
+   'file:/devel/WWW/2000/10/swap/test/reluri-1.n3',
+   'file://meetings.example.com/cal#m1'],
+  ['file://meetings.example.com/cal#m1',
+   'file:/home/connolly/w3ccvs/WWW/2000/10/swap/test/reluri-1.n3',
+   'file://meetings.example.com/cal#m1'],
+  ['./#blort', 'file:/some/dir/foo', 'file:/some/dir/#blort'],
+  ['./#', 'file:/some/dir/foo', 'file:/some/dir/#'],
+  // Ryan Lee
+  ['./', 'http://example/x/abc.efg', 'http://example/x/'],
+
+
+  // Graham Klyne's tests
+  // http://www.ninebynine.org/Software/HaskellUtils/Network/UriTest.xls
+  // 01-31 are from Connelly's cases
+
+  // 32-49
+  ['./q:r', 'http://ex/x/y', 'http://ex/x/q:r'],
+  ['./p=q:r', 'http://ex/x/y', 'http://ex/x/p=q:r'],
+  ['?pp/rr', 'http://ex/x/y?pp/qq', 'http://ex/x/y?pp/rr'],
+  ['y/z', 'http://ex/x/y?pp/qq', 'http://ex/x/y/z'],
+  ['local/qual@domain.org#frag',
+   'mailto:local',
+   'mailto:local/qual@domain.org#frag'],
+  ['more/qual2@domain2.org#frag',
+   'mailto:local/qual1@domain1.org',
+   'mailto:local/more/qual2@domain2.org#frag'],
+  ['y?q', 'http://ex/x/y?q', 'http://ex/x/y?q'],
+  ['/x/y?q', 'http://ex?p', 'http://ex/x/y?q'],
+  ['c/d', 'foo:a/b', 'foo:a/c/d'],
+  ['/c/d', 'foo:a/b', 'foo:/c/d'],
+  ['', 'foo:a/b?c#d', 'foo:a/b?c'],
+  ['b/c', 'foo:a', 'foo:b/c'],
+  ['../b/c', 'foo:/a/y/z', 'foo:/a/b/c'],
+  ['./b/c', 'foo:a', 'foo:b/c'],
+  ['/./b/c', 'foo:a', 'foo:/b/c'],
+  ['../../d', 'foo://a//b/c', 'foo://a/d'],
+  ['.', 'foo:a', 'foo:'],
+  ['..', 'foo:a', 'foo:'],
+
+  // 50-57[cf. TimBL comments --
+  //  http://lists.w3.org/Archives/Public/uri/2003Feb/0028.html,
+  //  http://lists.w3.org/Archives/Public/uri/2003Jan/0008.html)
+  ['abc', 'http://example/x/y%2Fz', 'http://example/x/abc'],
+  ['../../x%2Fabc', 'http://example/a/x/y/z', 'http://example/a/x%2Fabc'],
+  ['../x%2Fabc', 'http://example/a/x/y%2Fz', 'http://example/a/x%2Fabc'],
+  ['abc', 'http://example/x%2Fy/z', 'http://example/x%2Fy/abc'],
+  ['q%3Ar', 'http://ex/x/y', 'http://ex/x/q%3Ar'],
+  ['/x%2Fabc', 'http://example/x/y%2Fz', 'http://example/x%2Fabc'],
+  ['/x%2Fabc', 'http://example/x/y/z', 'http://example/x%2Fabc'],
+  ['/x%2Fabc', 'http://example/x/y%2Fz', 'http://example/x%2Fabc'],
+
+  // 70-77
+  ['local2@domain2', 'mailto:local1@domain1?query1', 'mailto:local2@domain2'],
+  ['local2@domain2?query2',
+   'mailto:local1@domain1',
+   'mailto:local2@domain2?query2'],
+  ['local2@domain2?query2',
+   'mailto:local1@domain1?query1',
+   'mailto:local2@domain2?query2'],
+  ['?query2', 'mailto:local@domain?query1', 'mailto:local@domain?query2'],
+  ['local@domain?query2', 'mailto:?query1', 'mailto:local@domain?query2'],
+  ['?query2', 'mailto:local@domain?query1', 'mailto:local@domain?query2'],
+  ['http://example/a/b?c/../d', 'foo:bar', 'http://example/a/b?c/../d'],
+  ['http://example/a/b#c/../d', 'foo:bar', 'http://example/a/b#c/../d'],
+
+  // 82-88
+  // @isaacs Disagree. Not how browsers do it.
+  // ['http:this', 'http://example.org/base/uri', 'http:this'],
+  // @isaacs Added
+  ['http:this', 'http://example.org/base/uri', 'http://example.org/base/this'],
+  ['http:this', 'http:base', 'http:this'],
+  ['.//g', 'f:/a', 'f://g'],
+  ['b/c//d/e', 'f://example.org/base/a', 'f://example.org/base/b/c//d/e'],
+  ['m2@example.ord/c2@example.org',
+   'mid:m@example.ord/c@example.org',
+   'mid:m@example.ord/m2@example.ord/c2@example.org'],
+  ['mini1.xml',
+   'file:///C:/DEV/Haskell/lib/HXmlToolbox-3.01/examples/',
+   'file:///C:/DEV/Haskell/lib/HXmlToolbox-3.01/examples/mini1.xml'],
+  ['../b/c', 'foo:a/y/z', 'foo:a/b/c'],
+
+  //changeing auth
+  ['http://diff:auth@www.example.com',
+   'http://asdf:qwer@www.example.com',
+   'http://diff:auth@www.example.com/'],
+
+  // changing port
+  ['https://example.com:81/',
+   'https://example.com:82/',
+   'https://example.com:81/'],
+
+  // https://github.com/nodejs/node/issues/1435
+  ['https://another.host.com/',
+   'https://user:password@example.org/',
+   'https://another.host.com/'],
+  ['//another.host.com/',
+   'https://user:password@example.org/',
+   'https://another.host.com/'],
+  ['http://another.host.com/',
+   'https://user:password@example.org/',
+   'http://another.host.com/'],
+  ['mailto:another.host.com',
+   'mailto:user@example.org',
+   'mailto:another.host.com'],
+  ['https://example.com/foo',
+   'https://user:password@example.com',
+   'https://user:password@example.com/foo'],
+
+   // No path at all
+   ['#hash1', '#hash2', '#hash1']
+];
+relativeTests2.forEach(function(relativeTest) {
+  const a = url.resolve(relativeTest[1], relativeTest[0]);
+  const e = url.format(relativeTest[2]);
+  assert.strictEqual(a, e,
+                     `resolve(${relativeTest[0]}, ${relativeTest[1]})` +
+                     ` == ${e}\n  actual=${a}`);
+});
+
+//if format and parse are inverse operations then
+//resolveObject(parse(x), y) == parse(resolve(x, y))
+
+//format: [from, path, expected]
+relativeTests.forEach(function(relativeTest) {
+  let actual = url.resolveObject(url.parse(relativeTest[0]), relativeTest[1]);
+  let expected = url.parse(relativeTest[2]);
+
+
+  assert.deepStrictEqual(actual, expected);
+
+  expected = relativeTest[2];
+  actual = url.format(actual);
+
+  assert.strictEqual(actual, expected,
+                     `format(${actual}) == ${expected}\n` +
+                     `actual: ${actual}`);
+});
+
+//format: [to, from, result]
+// the test: ['.//g', 'f:/a', 'f://g'] is a fundamental problem
+// url.parse('f:/a') does not have a host
+// url.resolve('f:/a', './/g') does not have a host because you have moved
+// down to the g directory.  i.e. f:     //g, however when this url is parsed
+// f:// will indicate that the host is g which is not the case.
+// it is unclear to me how to keep this information from being lost
+// it may be that a pathname of ////g should collapse to /g but this seems
+// to be a lot of work for an edge case.  Right now I remove the test
+if (relativeTests2[181][0] === './/g' &&
+    relativeTests2[181][1] === 'f:/a' &&
+    relativeTests2[181][2] === 'f://g') {
+  relativeTests2.splice(181, 1);
+}
+relativeTests2.forEach(function(relativeTest) {
+  let actual = url.resolveObject(url.parse(relativeTest[1]), relativeTest[0]);
+  let expected = url.parse(relativeTest[2]);
+
+  assert.deepStrictEqual(
+    actual,
+    expected,
+    `expected ${inspect(expected)} but got ${inspect(actual)}`
+  );
+
+  expected = url.format(relativeTest[2]);
+  actual = url.format(actual);
+
+  assert.strictEqual(actual, expected,
+                     `format(${relativeTest[1]}) == ${expected}\n` +
+                     `actual: ${actual}`);
+});
diff --git a/test/parallel/test-vm-indexed-properties.js b/test/parallel/test-vm-indexed-properties.js
new file mode 100644
index 00000000000000..34ef8d020b2181
--- /dev/null
+++ b/test/parallel/test-vm-indexed-properties.js
@@ -0,0 +1,17 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+const vm = require('vm');
+
+const code = `Object.defineProperty(this, 99, {
+      value: 20,
+      enumerable: true
+ });`;
+
+
+const sandbox = {};
+const ctx = vm.createContext(sandbox);
+vm.runInContext(code, ctx);
+
+assert.strictEqual(sandbox[99], 20);
diff --git a/test/parallel/test-vm-proxies.js b/test/parallel/test-vm-proxies.js
index 25e16e8f5ccc55..266b212fb827b8 100644
--- a/test/parallel/test-vm-proxies.js
+++ b/test/parallel/test-vm-proxies.js
@@ -16,16 +16,3 @@ sandbox = { Proxy: Proxy };
 vm.runInNewContext('this.Proxy = Proxy', sandbox);
 assert.strictEqual(typeof sandbox.Proxy, 'function');
 assert.strictEqual(sandbox.Proxy, Proxy);
-
-// Handle a sandbox that throws while copying properties
-assert.throws(() => {
-  const handler = {
-    getOwnPropertyDescriptor: (target, prop) => {
-      throw new Error('whoops');
-    }
-  };
-  const sandbox = new Proxy({foo: 'bar'}, handler);
-  const context = vm.createContext(sandbox);
-
-  vm.runInContext('', context);
-}, /whoops/);
diff --git a/test/parallel/test-vm-run-in-new-context.js b/test/parallel/test-vm-run-in-new-context.js
index 7b096ffc3fdc5f..3f8c632859db0f 100644
--- a/test/parallel/test-vm-run-in-new-context.js
+++ b/test/parallel/test-vm-run-in-new-context.js
@@ -17,7 +17,7 @@ assert.strictEqual('passed', result);
 console.error('thrown error');
 assert.throws(function() {
   vm.runInNewContext('throw new Error(\'test\');');
-});
+}, /^Error: test$/);
 
 global.hello = 5;
 vm.runInNewContext('hello = 2');
diff --git a/test/pseudo-tty/no_dropped_stdio.js b/test/pseudo-tty/no_dropped_stdio.js
index b24d234a38b2b7..f7d9625c62b0c7 100644
--- a/test/pseudo-tty/no_dropped_stdio.js
+++ b/test/pseudo-tty/no_dropped_stdio.js
@@ -1,7 +1,7 @@
 // https://github.com/nodejs/node/issues/6456#issuecomment-219320599
 // https://gist.github.com/isaacs/1495b91ec66b21d30b10572d72ad2cdd
 'use strict';
-require('../common');
+const common = require('../common');
 
 // 1000 bytes wrapped at 50 columns
 // \n turns into a double-byte character
@@ -11,5 +11,9 @@ let out = ('o'.repeat(48) + '\n').repeat(20);
 // This results in 1025 bytes, just enough to overflow the 1kb OS X TTY buffer.
 out += 'o'.repeat(24) + 'O';
 
-process.stdout.write(out);
-process.exit(0);
+// In AIX, the child exits even before the python parent
+// can setup the readloop. Provide a reasonable delay.
+setTimeout(function() {
+  process.stdout.write(out);
+  process.exit(0);
+}, common.isAix ? 200 : 0);
diff --git a/test/pseudo-tty/no_interleaved_stdio.js b/test/pseudo-tty/no_interleaved_stdio.js
index ff3ed8594a0baa..ba3989f93878bc 100644
--- a/test/pseudo-tty/no_interleaved_stdio.js
+++ b/test/pseudo-tty/no_interleaved_stdio.js
@@ -1,7 +1,7 @@
 // https://github.com/nodejs/node/issues/6456#issuecomment-219320599
 // https://gist.github.com/isaacs/1495b91ec66b21d30b10572d72ad2cdd
 'use strict';
-require('../common');
+const common = require('../common');
 
 // 1000 bytes wrapped at 50 columns
 // \n turns into a double-byte character
@@ -13,5 +13,9 @@ out += 'o'.repeat(24) + 'O';
 
 const err = '__This is some stderr__';
 
-process.stdout.write(out);
-process.stderr.write(err);
+// In AIX, the child exits even before the python parent
+// can setup the readloop. Provide a reasonable delay.
+setTimeout(function() {
+  process.stdout.write(out);
+  process.stderr.write(err);
+}, common.isAix ? 200 : 0);
diff --git a/test/pseudo-tty/pseudo-tty.status b/test/pseudo-tty/pseudo-tty.status
index 50f54de029d874..13279019b6bd72 100644
--- a/test/pseudo-tty/pseudo-tty.status
+++ b/test/pseudo-tty/pseudo-tty.status
@@ -1,8 +1,5 @@
 prefix pseudo-tty
 
 [$system==aix]
-# test issue only, covered under https://github.com/nodejs/node/issues/7973
-no_dropped_stdio           : SKIP
-no_interleaved_stdio       : SKIP
 # being investigated under https://github.com/nodejs/node/issues/9728
 test-tty-wrap              : FAIL, PASS
diff --git a/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js b/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js
index f828e92afbe71c..4d87e15d342c36 100644
--- a/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js
+++ b/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js
@@ -27,4 +27,8 @@ process.stdout._refreshSize = wrap(originalRefreshSizeStdout,
                                    process.stdout,
                                    'calling stdout._refreshSize');
 
-process.emit('SIGWINCH');
+// In AIX, the child exits even before the python parent
+// can setup the readloop. Provide a reasonable delay.
+setTimeout(function() {
+  process.emit('SIGWINCH');
+}, common.isAix ? 200 : 0);
diff --git a/test/parallel/test-domain-abort-on-uncaught.js b/test/sequential/test-domain-abort-on-uncaught.js
similarity index 100%
rename from test/parallel/test-domain-abort-on-uncaught.js
rename to test/sequential/test-domain-abort-on-uncaught.js
diff --git a/tools/cpplint.py b/tools/cpplint.py
index b5a05f0af39ba7..305220060c5cdb 100644
--- a/tools/cpplint.py
+++ b/tools/cpplint.py
@@ -1074,7 +1074,8 @@ def RepositoryName(self):
     """
     fullname = self.FullName()
     # XXX(bnoordhuis) Expects that cpplint.py lives in the tools/ directory.
-    toplevel = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+    toplevel = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..')).replace('\\', '/')
     prefix = os.path.commonprefix([fullname, toplevel])
     return fullname[len(prefix) + 1:]
 
diff --git a/vcbuild.bat b/vcbuild.bat
index 375901ba6276de..6a9d1d728b1529 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -27,6 +27,7 @@ set msi=
 set upload=
 set licensertf=
 set jslint=
+set cpplint=
 set build_testgc_addon=
 set noetw=
 set noetw_msi_arg=
@@ -57,7 +58,7 @@ if /i "%1"=="nosnapshot"    set nosnapshot=1&goto arg-ok
 if /i "%1"=="noetw"         set noetw=1&goto arg-ok
 if /i "%1"=="noperfctr"     set noperfctr=1&goto arg-ok
 if /i "%1"=="licensertf"    set licensertf=1&goto arg-ok
-if /i "%1"=="test"          set test_args=%test_args% addons doctool known_issues message parallel sequential -J&set jslint=1&set build_addons=1&goto arg-ok
+if /i "%1"=="test"          set test_args=%test_args% addons doctool known_issues message parallel sequential -J&set cpplint=1&set jslint=1&set build_addons=1&goto arg-ok
 if /i "%1"=="test-ci"       set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap addons doctool inspector known_issues message sequential parallel&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&goto arg-ok
 if /i "%1"=="test-addons"   set test_args=%test_args% addons&set build_addons=1&goto arg-ok
 if /i "%1"=="test-simple"   set test_args=%test_args% sequential parallel -J&goto arg-ok
@@ -67,11 +68,13 @@ if /i "%1"=="test-inspector" set test_args=%test_args% inspector&goto arg-ok
 if /i "%1"=="test-tick-processor" set test_args=%test_args% tick-processor&goto arg-ok
 if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok
 if /i "%1"=="test-pummel"   set test_args=%test_args% pummel&goto arg-ok
-if /i "%1"=="test-all"      set test_args=%test_args% sequential parallel message gc inspector internet pummel&set build_testgc_addon=1&set jslint=1&goto arg-ok
+if /i "%1"=="test-all"      set test_args=%test_args% sequential parallel message gc inspector internet pummel&set build_testgc_addon=1&set cpplint=1&set jslint=1&goto arg-ok
 if /i "%1"=="test-known-issues" set test_args=%test_args% known_issues&goto arg-ok
 if /i "%1"=="test-node-inspect" set test_node_inspect=1&goto arg-ok
 if /i "%1"=="jslint"        set jslint=1&goto arg-ok
 if /i "%1"=="jslint-ci"     set jslint_ci=1&goto arg-ok
+if /i "%1"=="lint"          set cpplint=1&set jslint=1&goto arg-ok
+if /i "%1"=="lint-ci"       set cpplint=1&set jslint_ci=1&goto arg-ok
 if /i "%1"=="package"       set package=1&goto arg-ok
 if /i "%1"=="msi"           set msi=1&set licensertf=1&set download_arg="--download=all"&set i18n_arg=small-icu&goto arg-ok
 if /i "%1"=="build-release" set build_release=1&goto arg-ok
@@ -322,14 +325,14 @@ for /d %%F in (test\addons\??_*) do (
 "%node_exe%" tools\doc\addon-verify.js
 if %errorlevel% neq 0 exit /b %errorlevel%
 :: building addons
-SetLocal EnableDelayedExpansion
+setlocal EnableDelayedExpansion
 for /d %%F in (test\addons\*) do (
   "%node_exe%" deps\npm\node_modules\node-gyp\bin\node-gyp rebuild ^
     --directory="%%F" ^
     --nodedir="%cd%"
   if !errorlevel! neq 0 exit /b !errorlevel!
 )
-EndLocal
+endlocal
 goto run-tests
 
 :run-tests
@@ -339,15 +342,57 @@ set USE_EMBEDDED_NODE_INSPECT=1
 goto node-tests
 
 :node-tests
-if "%test_args%"=="" goto jslint
+if "%test_args%"=="" goto cpplint
 if "%config%"=="Debug" set test_args=--mode=debug %test_args%
 if "%config%"=="Release" set test_args=--mode=release %test_args%
 echo running 'cctest %cctest_args%'
 "%config%\cctest" %cctest_args%
 echo running 'python tools\test.py %test_args%'
 python tools\test.py %test_args%
+goto cpplint
+
+:cpplint
+if not defined cpplint goto jslint
+echo running cpplint
+set cppfilelist=
+setlocal enabledelayedexpansion
+for /f "tokens=*" %%G in ('dir /b /s /a src\*.c src\*.cc src\*.h ^
+test\addons\*.cc test\addons\*.h test\cctest\*.cc test\cctest\*.h ^
+test\gc\binding.cc tools\icu\*.cc tools\icu\*.h') do (
+  set relpath=%%G
+  set relpath=!relpath:*%~dp0=!
+  call :add-to-list !relpath!
+)
+( endlocal
+  set cppfilelist=%localcppfilelist%
+)
+python tools/cpplint.py %cppfilelist%
+python tools/check-imports.py
 goto jslint
 
+:add-to-list
+echo %1 | findstr /c:"src\node_root_certs.h"
+if %errorlevel% equ 0 goto exit
+
+echo %1 | findstr /c:"src\queue.h"
+if %errorlevel% equ 0 goto exit
+
+echo %1 | findstr /c:"src\tree.h"
+if %errorlevel% equ 0 goto exit
+
+@rem skip subfolders under /src
+echo %1 | findstr /r /c:"src\\.*\\.*"
+if %errorlevel% equ 0 goto exit
+
+echo %1 | findstr /r /c:"test\\addons\\[0-9].*_.*\.h"
+if %errorlevel% equ 0 goto exit
+
+echo %1 | findstr /r /c:"test\\addons\\[0-9].*_.*\.cc"
+if %errorlevel% equ 0 goto exit
+
+set "localcppfilelist=%localcppfilelist% %1"
+goto exit
+
 :jslint
 if defined jslint_ci goto jslint-ci
 if not defined jslint goto exit