diff --git a/ponyracer/package.json b/ponyracer/package.json
index fc431c2aa..d6280680c 100644
--- a/ponyracer/package.json
+++ b/ponyracer/package.json
@@ -26,7 +26,7 @@
     "zone.js": "^0.8.19"
   },
   "devDependencies": {
-    "@angular/cli": "1.7.0-beta.2",
+    "@angular/cli": "~1.7.0-beta.3",
     "@angular/compiler-cli": "^5.2.0",
     "@angular/language-service": "^5.2.0",
     "@types/jasmine": "~2.8.3",
diff --git a/ponyracer/src/polyfills.ts b/ponyracer/src/polyfills.ts
index d68672ffe..af8477078 100644
--- a/ponyracer/src/polyfills.ts
+++ b/ponyracer/src/polyfills.ts
@@ -52,7 +52,20 @@ import 'core-js/es7/reflect';
  **/
 // import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
+/**
+ * By default, zone.js will patch all possible macroTask and DomEvents
+ * user can disable parts of macroTask/DomEvents patch by setting following flags
+ */
 
+ // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+ // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+
+ /*
+ * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+ * with the following flag, it will bypass `zone.js` patch for IE/Edge
+ */
+// (window as any).__Zone_enable_cross_context_check = true;
 
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.