diff --git a/bench/data/static_pbjs.js b/bench/data/static_pbjs.js
index e10a538a0..cbfbc53a8 100644
--- a/bench/data/static_pbjs.js
+++ b/bench/data/static_pbjs.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/cli/pbjs.js b/cli/pbjs.js
index b1f63154a..ede8cb00a 100644
--- a/cli/pbjs.js
+++ b/cli/pbjs.js
@@ -20,7 +20,17 @@ var targets  = util.requireAll("./targets");
  * @returns {number|undefined} Exit code, if known
  */
 exports.main = function main(args, callback) {
-    var lintDefault = "eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins";
+    var lintDefault = "eslint-disable " + [
+        "block-scoped-var",
+        "id-length",
+        "no-control-regex",
+        "no-magic-numbers",
+        "no-prototype-builtins",
+        "no-redeclare",
+        "no-shadow",
+        "no-var",
+        "sort-vars"
+    ].join(", ");
     var argv = minimist(args, {
         alias: {
             target: "t",
diff --git a/cli/pbts.js b/cli/pbts.js
index ec62319d5..22e757c6e 100644
--- a/cli/pbts.js
+++ b/cli/pbts.js
@@ -139,8 +139,7 @@ exports.main = function(args, callback) {
         });
 
         function getImportName(importItem) {
-            var result = path.basename(importItem, ".js")
-            return result.replace(/([-_~.+]\w)/g, match => {
+            return path.basename(importItem, ".js").replace(/([-_~.+]\w)/g, function(match) {
                 return match[1].toUpperCase();
             });
         }
diff --git a/dist/light/protobuf.js b/dist/light/protobuf.js
index 560d1373c..94d69fb68 100644
--- a/dist/light/protobuf.js
+++ b/dist/light/protobuf.js
@@ -1,6 +1,6 @@
 /*!
  * protobuf.js v6.8.7 (c) 2016, daniel wirtz
- * compiled fri, 18 may 2018 08:55:41 utc
+ * compiled tue, 17 jul 2018 20:24:21 utc
  * licensed under the bsd-3-clause license
  * see: https://github.com/dcodeio/protobuf.js for details
  */
diff --git a/dist/light/protobuf.min.js b/dist/light/protobuf.min.js
index e7f29a72a..87435b227 100644
--- a/dist/light/protobuf.min.js
+++ b/dist/light/protobuf.min.js
@@ -1,6 +1,6 @@
 /*!
  * protobuf.js v6.8.7 (c) 2016, daniel wirtz
- * compiled fri, 18 may 2018 08:55:42 utc
+ * compiled tue, 17 jul 2018 20:24:22 utc
  * licensed under the bsd-3-clause license
  * see: https://github.com/dcodeio/protobuf.js for details
  */
diff --git a/dist/minimal/protobuf.js b/dist/minimal/protobuf.js
index 40e93b85a..4a3eef183 100644
--- a/dist/minimal/protobuf.js
+++ b/dist/minimal/protobuf.js
@@ -1,6 +1,6 @@
 /*!
  * protobuf.js v6.8.7 (c) 2016, daniel wirtz
- * compiled fri, 18 may 2018 08:55:41 utc
+ * compiled tue, 17 jul 2018 20:24:21 utc
  * licensed under the bsd-3-clause license
  * see: https://github.com/dcodeio/protobuf.js for details
  */
diff --git a/dist/minimal/protobuf.min.js b/dist/minimal/protobuf.min.js
index 6bc126256..857bdc936 100644
--- a/dist/minimal/protobuf.min.js
+++ b/dist/minimal/protobuf.min.js
@@ -1,6 +1,6 @@
 /*!
  * protobuf.js v6.8.7 (c) 2016, daniel wirtz
- * compiled fri, 18 may 2018 08:55:42 utc
+ * compiled tue, 17 jul 2018 20:24:22 utc
  * licensed under the bsd-3-clause license
  * see: https://github.com/dcodeio/protobuf.js for details
  */
diff --git a/dist/protobuf.js b/dist/protobuf.js
index 993a966db..885a4d803 100644
--- a/dist/protobuf.js
+++ b/dist/protobuf.js
@@ -1,6 +1,6 @@
 /*!
  * protobuf.js v6.8.7 (c) 2016, daniel wirtz
- * compiled fri, 18 may 2018 08:55:41 utc
+ * compiled tue, 17 jul 2018 20:24:21 utc
  * licensed under the bsd-3-clause license
  * see: https://github.com/dcodeio/protobuf.js for details
  */
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
index d94c0f885..43e0a817b 100644
--- a/dist/protobuf.min.js
+++ b/dist/protobuf.min.js
@@ -1,6 +1,6 @@
 /*!
  * protobuf.js v6.8.7 (c) 2016, daniel wirtz
- * compiled fri, 18 may 2018 08:55:42 utc
+ * compiled tue, 17 jul 2018 20:24:22 utc
  * licensed under the bsd-3-clause license
  * see: https://github.com/dcodeio/protobuf.js for details
  */
diff --git a/ext/descriptor/index.d.ts b/ext/descriptor/index.d.ts
index a93c981ab..1df2efcc1 100644
--- a/ext/descriptor/index.d.ts
+++ b/ext/descriptor/index.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export const FileDescriptorSet: $protobuf.Type;
 
 export const FileDescriptorProto: $protobuf.Type;
diff --git a/index.d.ts b/index.d.ts
index e781520c3..66d0e06b2 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -507,7 +507,7 @@ export interface IExtensionMapField extends IMapField {
 }
 
 /** Abstract runtime message. */
-export class Message<T extends object = object> {
+export class Message<T extends object> {
 
     /**
      * Constructs a new message instance.
diff --git a/tests/data/comments.d.ts b/tests/data/comments.d.ts
index 645ce0a0e..45ed81873 100644
--- a/tests/data/comments.d.ts
+++ b/tests/data/comments.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export interface ITest1 {
     field1?: (string|null);
     field2?: (number|null);
diff --git a/tests/data/comments.js b/tests/data/comments.js
index 9ea45617f..27d6c8dbe 100644
--- a/tests/data/comments.js
+++ b/tests/data/comments.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/tests/data/convert.d.ts b/tests/data/convert.d.ts
index fb847947c..5d5a59492 100644
--- a/tests/data/convert.d.ts
+++ b/tests/data/convert.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export interface IMessage {
     stringVal?: (string|null);
     stringRepeated?: (string[]|null);
diff --git a/tests/data/convert.js b/tests/data/convert.js
index 592ccf180..ddd8721f4 100644
--- a/tests/data/convert.js
+++ b/tests/data/convert.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/tests/data/mapbox/vector_tile.d.ts b/tests/data/mapbox/vector_tile.d.ts
index 671c36524..d1adc23e7 100644
--- a/tests/data/mapbox/vector_tile.d.ts
+++ b/tests/data/mapbox/vector_tile.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../../..";
-
 export namespace vector_tile {
 
     interface ITile {
diff --git a/tests/data/mapbox/vector_tile.js b/tests/data/mapbox/vector_tile.js
index 02d6cce54..148dfc4cc 100644
--- a/tests/data/mapbox/vector_tile.js
+++ b/tests/data/mapbox/vector_tile.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../../minimal");
diff --git a/tests/data/package.d.ts b/tests/data/package.d.ts
index c3946085b..3ad494702 100644
--- a/tests/data/package.d.ts
+++ b/tests/data/package.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export interface IPackage {
     name?: (string|null);
     version?: (string|null);
diff --git a/tests/data/package.js b/tests/data/package.js
index bf3c4a975..510a1d91c 100644
--- a/tests/data/package.js
+++ b/tests/data/package.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/tests/data/rpc-es6.d.ts b/tests/data/rpc-es6.d.ts
index dfd8b5502..47e4313b1 100644
--- a/tests/data/rpc-es6.d.ts
+++ b/tests/data/rpc-es6.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export class MyService extends $protobuf.rpc.Service {
     constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean);
     public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): MyService;
diff --git a/tests/data/rpc-es6.js b/tests/data/rpc-es6.js
index 36377302b..315b1e14e 100644
--- a/tests/data/rpc-es6.js
+++ b/tests/data/rpc-es6.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 import * as $protobuf from "../../minimal";
 
 // Common aliases
diff --git a/tests/data/rpc-reserved.d.ts b/tests/data/rpc-reserved.d.ts
index d08439125..770b92ccc 100644
--- a/tests/data/rpc-reserved.d.ts
+++ b/tests/data/rpc-reserved.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export class MyService extends $protobuf.rpc.Service {
     constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean);
     public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): MyService;
diff --git a/tests/data/rpc-reserved.js b/tests/data/rpc-reserved.js
index 3f04feb0b..713b149dc 100644
--- a/tests/data/rpc-reserved.js
+++ b/tests/data/rpc-reserved.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/tests/data/rpc.d.ts b/tests/data/rpc.d.ts
index dfd8b5502..47e4313b1 100644
--- a/tests/data/rpc.d.ts
+++ b/tests/data/rpc.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export class MyService extends $protobuf.rpc.Service {
     constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean);
     public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): MyService;
diff --git a/tests/data/rpc.js b/tests/data/rpc.js
index de99b6439..e75fec30c 100644
--- a/tests/data/rpc.js
+++ b/tests/data/rpc.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");
diff --git a/tests/data/test.d.ts b/tests/data/test.d.ts
index dcc48ad92..832e104ba 100644
--- a/tests/data/test.d.ts
+++ b/tests/data/test.d.ts
@@ -1,5 +1,4 @@
 import * as $protobuf from "../..";
-
 export namespace jspb {
 
     namespace test {
diff --git a/tests/data/test.js b/tests/data/test.js
index f3fc8243f..24ec2cfcc 100644
--- a/tests/data/test.js
+++ b/tests/data/test.js
@@ -1,4 +1,4 @@
-/*eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins*/
+/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 "use strict";
 
 var $protobuf = require("../../minimal");