diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1869ed0ca..2b8bd0278 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="0.8.22"></a>
+## [0.8.22](https://github.com/angular/zone.js/compare/v0.8.21...0.8.22) (2018-03-31)
+
+
+### Bug Fixes
+
+* **fakeAsync:** fix [#1050](https://github.com/angular/zone.js/issues/1050), should only reset patched Date.now until fakeAsync exit  ([#1051](https://github.com/angular/zone.js/issues/1051)) ([e15d735](https://github.com/angular/zone.js/commit/e15d735))
+* **fakeAsyncTest:** fix [#1061](https://github.com/angular/zone.js/issues/1061), fakeAsync should support setImmediate ([#1062](https://github.com/angular/zone.js/issues/1062)) ([66c6f97](https://github.com/angular/zone.js/commit/66c6f97))
+
+
+
 <a name="0.8.21"></a>
 ## [0.8.21](https://github.com/angular/zone.js/compare/v0.8.20...0.8.21) (2018-03-30)
 
diff --git a/dist/async-test.js b/dist/async-test.js
index 952c5f77a..35c77f4ef 100644
--- a/dist/async-test.js
+++ b/dist/async-test.js
@@ -29,13 +29,11 @@ var AsyncTestZoneSpec = /** @class */ (function () {
         this.runZone = Zone.current;
         this.unresolvedChainedPromiseCount = 0;
         this.name = 'asyncTestZone for ' + namePrefix;
-        this.properties = {
-            'AsyncTestZoneSpec': this
-        };
+        this.properties = { 'AsyncTestZoneSpec': this };
     }
     AsyncTestZoneSpec.prototype._finishCallbackIfDone = function () {
         var _this = this;
-        if (!(this._pendingMicroTasks || this._pendingMacroTasks || this.unresolvedChainedPromiseCount !== 0)) {
+        if (!(this._pendingMicroTasks || this._pendingMacroTasks)) {
             // We do this because we would like to catch unhandled rejected promises.
             this.runZone.run(function () {
                 setTimeout(function () {
@@ -63,7 +61,7 @@ var AsyncTestZoneSpec = /** @class */ (function () {
             this._isSync = false;
         }
         if (task.type === 'microTask' && task.data && task.data instanceof Promise) {
-            // check whether the promise is a chained promise 
+            // check whether the promise is a chained promise
             if (task.data[AsyncTestZoneSpec.symbolParentUnresolved] === true) {
                 // chained promise is being scheduled
                 this.unresolvedChainedPromiseCount--;
@@ -90,12 +88,10 @@ var AsyncTestZoneSpec = /** @class */ (function () {
     // was scheduled/invoked/canceled.
     AsyncTestZoneSpec.prototype.onInvoke = function (parentZoneDelegate, currentZone, targetZone, delegate, applyThis, applyArgs, source) {
         try {
-            this.patchPromiseForTest();
             this._isSync = true;
             return parentZoneDelegate.invoke(targetZone, delegate, applyThis, applyArgs, source);
         }
         finally {
-            this.unPatchPromiseForTest();
             var afterTaskCounts = parentZoneDelegate._taskCounts;
             if (this._isSync) {
                 this._finishCallbackIfDone();
diff --git a/dist/fake-async-test.js b/dist/fake-async-test.js
index 32c0f215b..6fd9aa285 100644
--- a/dist/fake-async-test.js
+++ b/dist/fake-async-test.js
@@ -192,6 +192,7 @@
             this._uncaughtPromiseErrors = Promise[Zone.__symbol__('uncaughtPromiseErrors')];
             this.pendingPeriodicTimers = [];
             this.pendingTimers = [];
+            this.patchDateLocked = false;
             this.properties = { 'FakeAsyncTestZoneSpec': this };
             this.name = 'fakeAsyncTestZone for ' + namePrefix;
             // in case user can't access the construction of FakeAsyncTestSpec
@@ -307,12 +308,21 @@
                 return;
             }
             global['Date'] = FakeDate;
+            FakeDate.prototype = OriginalDate.prototype;
         };
         FakeAsyncTestZoneSpec.resetDate = function () {
             if (global['Date'] === FakeDate) {
                 global['Date'] = OriginalDate;
             }
         };
+        FakeAsyncTestZoneSpec.prototype.lockDatePatch = function () {
+            this.patchDateLocked = true;
+            FakeAsyncTestZoneSpec.patchDate();
+        };
+        FakeAsyncTestZoneSpec.prototype.unlockDatePatch = function () {
+            this.patchDateLocked = false;
+            FakeAsyncTestZoneSpec.resetDate();
+        };
         FakeAsyncTestZoneSpec.prototype.tick = function (millis, doTick) {
             if (millis === void 0) { millis = 0; }
             FakeAsyncTestZoneSpec.assertInZone();
@@ -371,6 +381,9 @@
                         case 'setTimeout':
                             task.data['handleId'] = this._setTimeout(task.invoke, task.data['delay'], Array.prototype.slice.call(task.data['args'], 2));
                             break;
+                        case 'setImmediate':
+                            task.data['handleId'] = this._setTimeout(task.invoke, 0, Array.prototype.slice.call(task.data['args'], 1));
+                            break;
                         case 'setInterval':
                             task.data['handleId'] = this._setInterval(task.invoke, task.data['delay'], Array.prototype.slice.call(task.data['args'], 2));
                             break;
@@ -439,7 +452,9 @@
                 return delegate.invoke(target, callback, applyThis, applyArgs, source);
             }
             finally {
-                FakeAsyncTestZoneSpec.resetDate();
+                if (!this.patchDateLocked) {
+                    FakeAsyncTestZoneSpec.resetDate();
+                }
             }
         };
         FakeAsyncTestZoneSpec.prototype.findMacroTaskOption = function (task) {
diff --git a/dist/jasmine-patch.js b/dist/jasmine-patch.js
index 493d91a95..78cf8115b 100644
--- a/dist/jasmine-patch.js
+++ b/dist/jasmine-patch.js
@@ -116,7 +116,7 @@
             return syncZone.run(describeBody, this, arguments);
         };
     }
-    function runInTestZone(testBody, queueRunner, done) {
+    function runInTestZone(testBody, applyThis, queueRunner, done) {
         var isClockInstalled = !!jasmine[symbol('clockInstalled')];
         var testProxyZoneSpec = queueRunner.testProxyZoneSpec;
         var testProxyZone = queueRunner.testProxyZone;
@@ -127,18 +127,23 @@
                 var _fakeAsyncTestZoneSpec = new FakeAsyncTestZoneSpec();
                 lastDelegate = testProxyZoneSpec.getDelegate();
                 testProxyZoneSpec.setDelegate(_fakeAsyncTestZoneSpec);
+                _fakeAsyncTestZoneSpec.lockDatePatch();
             }
         }
         try {
             if (done) {
-                return testProxyZone.run(testBody, this, [done]);
+                return testProxyZone.run(testBody, applyThis, [done]);
             }
             else {
-                return testProxyZone.run(testBody, this);
+                return testProxyZone.run(testBody, applyThis);
             }
         }
         finally {
             if (isClockInstalled) {
+                var _fakeAsyncTestZoneSpec = testProxyZoneSpec.getDelegate();
+                if (_fakeAsyncTestZoneSpec) {
+                    _fakeAsyncTestZoneSpec.unlockDatePatch();
+                }
                 testProxyZoneSpec.setDelegate(lastDelegate);
             }
         }
@@ -153,9 +158,9 @@
         // Note we have to make a function with correct number of arguments, otherwise jasmine will
         // think that all functions are sync or async.
         return (testBody && (testBody.length ? function (done) {
-            return runInTestZone(testBody, this.queueRunner, done);
+            return runInTestZone(testBody, this, this.queueRunner, done);
         } : function () {
-            return runInTestZone(testBody, this.queueRunner);
+            return runInTestZone(testBody, this, this.queueRunner);
         }));
     }
     var QueueRunner = jasmine.QueueRunner;
diff --git a/dist/jasmine-patch.min.js b/dist/jasmine-patch.min.js
index dd0f2ef54..c9796219e 100644
--- a/dist/jasmine-patch.min.js
+++ b/dist/jasmine-patch.min.js
@@ -1 +1 @@
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n():"function"==typeof define&&define.amd?define(n):n()}(this,function(){"use strict";!function(){function e(e){return function(){return u.run(e,this,arguments)}}function n(e,n,t){var o,r=!!jasmine[a("clockInstalled")],i=n.testProxyZoneSpec,s=n.testProxyZone;if(r){var c=Zone.FakeAsyncTestZoneSpec;if(c){var u=new c;o=i.getDelegate(),i.setDelegate(u)}}try{return t?s.run(e,this,[t]):s.run(e,this)}finally{r&&i.setDelegate(o)}}function t(e){return e&&(e.length?function(t){return n(e,this.queueRunner,t)}:function(){return n(e,this.queueRunner)})}var o=function(e,n){function t(){this.constructor=e}for(var o in n)n.hasOwnProperty(o)&&(e[o]=n[o]);e.prototype=null===n?Object.create(n):(t.prototype=n.prototype,new t)},r="undefined"!=typeof window&&window||"undefined"!=typeof self&&self||global;if(!Zone)throw new Error("Missing: zone.js");if("undefined"==typeof jasmine)throw new Error("Missing: jasmine.js");if(jasmine.__zone_patch__)throw new Error("'jasmine' has already been patched with 'Zone'.");jasmine.__zone_patch__=!0;var i=Zone.SyncTestZoneSpec,s=Zone.ProxyZoneSpec;if(!i)throw new Error("Missing: SyncTestZoneSpec");if(!s)throw new Error("Missing: ProxyZoneSpec");var c=Zone.current,u=c.fork(new i("jasmine.describe")),a=Zone.__symbol__,f=jasmine.getEnv();["describe","xdescribe","fdescribe"].forEach(function(n){var t=f[n];f[n]=function(n,o){return t.call(this,n,e(o))}}),["it","xit","fit"].forEach(function(e){var n=f[e];f[a(e)]=n,f[e]=function(e,o,r){return arguments[1]=t(o),n.apply(this,arguments)}}),["beforeEach","afterEach"].forEach(function(e){var n=f[e];f[a(e)]=n,f[e]=function(e,o){return arguments[0]=t(e),n.apply(this,arguments)}});var l=jasmine[a("clock")]=jasmine.clock;jasmine.clock=function(){var e=l.apply(this,arguments),n=e[a("tick")]=e.tick;e.tick=function(){var e=Zone.current.get("FakeAsyncTestZoneSpec");return e?e.tick.apply(e,arguments):n.apply(this,arguments)};var t=e[a("mockDate")]=e.mockDate;return e.mockDate=function(){var e=Zone.current.get("FakeAsyncTestZoneSpec");if(e){var n=arguments[0];return e.setCurrentRealTime.apply(e,n&&"function"==typeof n.getTime?[n.getTime()]:arguments)}return t.apply(this,arguments)},["install","uninstall"].forEach(function(n){var t=e[a(n)]=e[n];e[n]=function(){var e=Zone.FakeAsyncTestZoneSpec;return e?void(jasmine[a("clockInstalled")]="install"===n):t.apply(this,arguments)}}),e};var p=jasmine.QueueRunner;jasmine.QueueRunner=function(e){function n(n){var t=this;n.onComplete=function(e){return function(){t.testProxyZone=null,t.testProxyZoneSpec=null,c.scheduleMicroTask("jasmine.onComplete",e)}}(n.onComplete);var o=r.__zone_symbol__setTimeout,i=r.__zone_symbol__clearTimeout;o&&(n.timeout={setTimeout:o?o:r.setTimeout,clearTimeout:i?i:r.clearTimeout}),jasmine.UserContext?(n.userContext||(n.userContext=new jasmine.UserContext),n.userContext.queueRunner=this):(n.userContext||(n.userContext={}),n.userContext.queueRunner=this);var s=n.onException;n.onException=function(e){if(e&&"Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL."===e.message){var n=this&&this.testProxyZoneSpec;if(n){var t=n.getAndClearPendingTasksInfo();e.message+=t}}s&&s.call(this,e)},e.call(this,n)}return o(n,e),n.prototype.execute=function(){for(var n=this,t=Zone.current,o=!1;t;){if(t===c){o=!0;break}t=t.parent}if(!o)throw new Error("Unexpected Zone: "+Zone.current.name);this.testProxyZoneSpec=new s,this.testProxyZone=c.fork(this.testProxyZoneSpec),Zone.currentTask?e.prototype.execute.call(this):Zone.current.scheduleMicroTask("jasmine.execute().forceTask",function(){return p.prototype.execute.call(n)})},n}(p)}()});
\ No newline at end of file
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n():"function"==typeof define&&define.amd?define(n):n()}(this,function(){"use strict";!function(){function e(e){return function(){return a.run(e,this,arguments)}}function n(e,n,t,o){var r,i=!!jasmine[u("clockInstalled")],s=t.testProxyZoneSpec,c=t.testProxyZone;if(i){var a=Zone.FakeAsyncTestZoneSpec;if(a){var f=new a;r=s.getDelegate(),s.setDelegate(f),f.lockDatePatch()}}try{return o?c.run(e,n,[o]):c.run(e,n)}finally{if(i){var f=s.getDelegate();f&&f.unlockDatePatch(),s.setDelegate(r)}}}function t(e){return e&&(e.length?function(t){return n(e,this,this.queueRunner,t)}:function(){return n(e,this,this.queueRunner)})}var o=function(e,n){function t(){this.constructor=e}for(var o in n)n.hasOwnProperty(o)&&(e[o]=n[o]);e.prototype=null===n?Object.create(n):(t.prototype=n.prototype,new t)},r="undefined"!=typeof window&&window||"undefined"!=typeof self&&self||global;if(!Zone)throw new Error("Missing: zone.js");if("undefined"==typeof jasmine)throw new Error("Missing: jasmine.js");if(jasmine.__zone_patch__)throw new Error("'jasmine' has already been patched with 'Zone'.");jasmine.__zone_patch__=!0;var i=Zone.SyncTestZoneSpec,s=Zone.ProxyZoneSpec;if(!i)throw new Error("Missing: SyncTestZoneSpec");if(!s)throw new Error("Missing: ProxyZoneSpec");var c=Zone.current,a=c.fork(new i("jasmine.describe")),u=Zone.__symbol__,f=jasmine.getEnv();["describe","xdescribe","fdescribe"].forEach(function(n){var t=f[n];f[n]=function(n,o){return t.call(this,n,e(o))}}),["it","xit","fit"].forEach(function(e){var n=f[e];f[u(e)]=n,f[e]=function(e,o,r){return arguments[1]=t(o),n.apply(this,arguments)}}),["beforeEach","afterEach"].forEach(function(e){var n=f[e];f[u(e)]=n,f[e]=function(e,o){return arguments[0]=t(e),n.apply(this,arguments)}});var l=jasmine[u("clock")]=jasmine.clock;jasmine.clock=function(){var e=l.apply(this,arguments),n=e[u("tick")]=e.tick;e.tick=function(){var e=Zone.current.get("FakeAsyncTestZoneSpec");return e?e.tick.apply(e,arguments):n.apply(this,arguments)};var t=e[u("mockDate")]=e.mockDate;return e.mockDate=function(){var e=Zone.current.get("FakeAsyncTestZoneSpec");if(e){var n=arguments[0];return e.setCurrentRealTime.apply(e,n&&"function"==typeof n.getTime?[n.getTime()]:arguments)}return t.apply(this,arguments)},["install","uninstall"].forEach(function(n){var t=e[u(n)]=e[n];e[n]=function(){var e=Zone.FakeAsyncTestZoneSpec;return e?void(jasmine[u("clockInstalled")]="install"===n):t.apply(this,arguments)}}),e};var p=jasmine.QueueRunner;jasmine.QueueRunner=function(e){function n(n){var t=this;n.onComplete=function(e){return function(){t.testProxyZone=null,t.testProxyZoneSpec=null,c.scheduleMicroTask("jasmine.onComplete",e)}}(n.onComplete);var o=r.__zone_symbol__setTimeout,i=r.__zone_symbol__clearTimeout;o&&(n.timeout={setTimeout:o?o:r.setTimeout,clearTimeout:i?i:r.clearTimeout}),jasmine.UserContext?(n.userContext||(n.userContext=new jasmine.UserContext),n.userContext.queueRunner=this):(n.userContext||(n.userContext={}),n.userContext.queueRunner=this);var s=n.onException;n.onException=function(e){if(e&&"Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL."===e.message){var n=this&&this.testProxyZoneSpec;if(n){var t=n.getAndClearPendingTasksInfo();e.message+=t}}s&&s.call(this,e)},e.call(this,n)}return o(n,e),n.prototype.execute=function(){for(var n=this,t=Zone.current,o=!1;t;){if(t===c){o=!0;break}t=t.parent}if(!o)throw new Error("Unexpected Zone: "+Zone.current.name);this.testProxyZoneSpec=new s,this.testProxyZone=c.fork(this.testProxyZoneSpec),Zone.currentTask?e.prototype.execute.call(this):Zone.current.scheduleMicroTask("jasmine.execute().forceTask",function(){return p.prototype.execute.call(n)})},n}(p)}()});
\ No newline at end of file
diff --git a/dist/proxy.js b/dist/proxy.js
index be3c426bb..5766ee978 100644
--- a/dist/proxy.js
+++ b/dist/proxy.js
@@ -63,6 +63,7 @@ var ProxyZoneSpec = /** @class */ (function () {
         return this._delegateSpec;
     };
     ProxyZoneSpec.prototype.resetDelegate = function () {
+        var delegateSpec = this.getDelegate();
         this.setDelegate(this.defaultSpecDelegate);
     };
     ProxyZoneSpec.prototype.tryTriggerHasTask = function (parentZoneDelegate, currentZone, targetZone) {
diff --git a/dist/proxy.min.js b/dist/proxy.min.js
index 5f73c04aa..c0c44d725 100644
--- a/dist/proxy.min.js
+++ b/dist/proxy.min.js
@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&&define.amd?define(t):t()}(this,function(){"use strict";var e=function(){function e(e){void 0===e&&(e=null),this.defaultSpecDelegate=e,this.name="ProxyZone",this.properties={ProxyZoneSpec:this},this.propertyKeys=null,this.lastTaskState=null,this.isNeedToTriggerHasTask=!1,this.tasks=[],this.setDelegate(e)}return e.get=function(){return Zone.current.get("ProxyZoneSpec")},e.isLoaded=function(){return e.get()instanceof e},e.assertPresent=function(){if(!e.isLoaded())throw new Error("Expected to be running in 'ProxyZone', but it was not found.");return e.get()},e.prototype.setDelegate=function(e){var t=this,s=this._delegateSpec!==e;this._delegateSpec=e,this.propertyKeys&&this.propertyKeys.forEach(function(e){return delete t.properties[e]}),this.propertyKeys=null,e&&e.properties&&(this.propertyKeys=Object.keys(e.properties),this.propertyKeys.forEach(function(s){return t.properties[s]=e.properties[s]})),s&&this.lastTaskState&&(this.lastTaskState.macroTask||this.lastTaskState.microTask)&&(this.isNeedToTriggerHasTask=!0)},e.prototype.getDelegate=function(){return this._delegateSpec},e.prototype.resetDelegate=function(){this.setDelegate(this.defaultSpecDelegate)},e.prototype.tryTriggerHasTask=function(e,t,s){this.isNeedToTriggerHasTask&&this.lastTaskState&&(this.isNeedToTriggerHasTask=!1,this.onHasTask(e,t,s,this.lastTaskState))},e.prototype.removeFromTasks=function(e){if(this.tasks)for(var t=0;t<this.tasks.length;t++)if(this.tasks[t]===e)return void this.tasks.splice(t,1)},e.prototype.getAndClearPendingTasksInfo=function(){if(0===this.tasks.length)return"";var e=this.tasks.map(function(e){var t=e.data&&Object.keys(e.data).map(function(t){return t+":"+e.data[t]}).join(",");return"type: "+e.type+", source: "+e.source+", args: {"+t+"}"}),t="--Pendng async tasks are: ["+e+"]";return this.tasks=[],t},e.prototype.onFork=function(e,t,s,n){return this._delegateSpec&&this._delegateSpec.onFork?this._delegateSpec.onFork(e,t,s,n):e.fork(s,n)},e.prototype.onIntercept=function(e,t,s,n,o){return this._delegateSpec&&this._delegateSpec.onIntercept?this._delegateSpec.onIntercept(e,t,s,n,o):e.intercept(s,n,o)},e.prototype.onInvoke=function(e,t,s,n,o,r,a){return this.tryTriggerHasTask(e,t,s),this._delegateSpec&&this._delegateSpec.onInvoke?this._delegateSpec.onInvoke(e,t,s,n,o,r,a):e.invoke(s,n,o,r,a)},e.prototype.onHandleError=function(e,t,s,n){return this._delegateSpec&&this._delegateSpec.onHandleError?this._delegateSpec.onHandleError(e,t,s,n):e.handleError(s,n)},e.prototype.onScheduleTask=function(e,t,s,n){return"eventTask"!==n.type&&this.tasks.push(n),this._delegateSpec&&this._delegateSpec.onScheduleTask?this._delegateSpec.onScheduleTask(e,t,s,n):e.scheduleTask(s,n)},e.prototype.onInvokeTask=function(e,t,s,n,o,r){return"eventTask"!==n.type&&this.removeFromTasks(n),this.tryTriggerHasTask(e,t,s),this._delegateSpec&&this._delegateSpec.onInvokeTask?this._delegateSpec.onInvokeTask(e,t,s,n,o,r):e.invokeTask(s,n,o,r)},e.prototype.onCancelTask=function(e,t,s,n){return"eventTask"!==n.type&&this.removeFromTasks(n),this.tryTriggerHasTask(e,t,s),this._delegateSpec&&this._delegateSpec.onCancelTask?this._delegateSpec.onCancelTask(e,t,s,n):e.cancelTask(s,n)},e.prototype.onHasTask=function(e,t,s,n){this.lastTaskState=n,this._delegateSpec&&this._delegateSpec.onHasTask?this._delegateSpec.onHasTask(e,t,s,n):e.hasTask(s,n)},e}();Zone.ProxyZoneSpec=e});
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&&define.amd?define(t):t()}(this,function(){"use strict";var e=function(){function e(e){void 0===e&&(e=null),this.defaultSpecDelegate=e,this.name="ProxyZone",this.properties={ProxyZoneSpec:this},this.propertyKeys=null,this.lastTaskState=null,this.isNeedToTriggerHasTask=!1,this.tasks=[],this.setDelegate(e)}return e.get=function(){return Zone.current.get("ProxyZoneSpec")},e.isLoaded=function(){return e.get()instanceof e},e.assertPresent=function(){if(!e.isLoaded())throw new Error("Expected to be running in 'ProxyZone', but it was not found.");return e.get()},e.prototype.setDelegate=function(e){var t=this,s=this._delegateSpec!==e;this._delegateSpec=e,this.propertyKeys&&this.propertyKeys.forEach(function(e){return delete t.properties[e]}),this.propertyKeys=null,e&&e.properties&&(this.propertyKeys=Object.keys(e.properties),this.propertyKeys.forEach(function(s){return t.properties[s]=e.properties[s]})),s&&this.lastTaskState&&(this.lastTaskState.macroTask||this.lastTaskState.microTask)&&(this.isNeedToTriggerHasTask=!0)},e.prototype.getDelegate=function(){return this._delegateSpec},e.prototype.resetDelegate=function(){this.getDelegate();this.setDelegate(this.defaultSpecDelegate)},e.prototype.tryTriggerHasTask=function(e,t,s){this.isNeedToTriggerHasTask&&this.lastTaskState&&(this.isNeedToTriggerHasTask=!1,this.onHasTask(e,t,s,this.lastTaskState))},e.prototype.removeFromTasks=function(e){if(this.tasks)for(var t=0;t<this.tasks.length;t++)if(this.tasks[t]===e)return void this.tasks.splice(t,1)},e.prototype.getAndClearPendingTasksInfo=function(){if(0===this.tasks.length)return"";var e=this.tasks.map(function(e){var t=e.data&&Object.keys(e.data).map(function(t){return t+":"+e.data[t]}).join(",");return"type: "+e.type+", source: "+e.source+", args: {"+t+"}"}),t="--Pendng async tasks are: ["+e+"]";return this.tasks=[],t},e.prototype.onFork=function(e,t,s,n){return this._delegateSpec&&this._delegateSpec.onFork?this._delegateSpec.onFork(e,t,s,n):e.fork(s,n)},e.prototype.onIntercept=function(e,t,s,n,o){return this._delegateSpec&&this._delegateSpec.onIntercept?this._delegateSpec.onIntercept(e,t,s,n,o):e.intercept(s,n,o)},e.prototype.onInvoke=function(e,t,s,n,o,r,a){return this.tryTriggerHasTask(e,t,s),this._delegateSpec&&this._delegateSpec.onInvoke?this._delegateSpec.onInvoke(e,t,s,n,o,r,a):e.invoke(s,n,o,r,a)},e.prototype.onHandleError=function(e,t,s,n){return this._delegateSpec&&this._delegateSpec.onHandleError?this._delegateSpec.onHandleError(e,t,s,n):e.handleError(s,n)},e.prototype.onScheduleTask=function(e,t,s,n){return"eventTask"!==n.type&&this.tasks.push(n),this._delegateSpec&&this._delegateSpec.onScheduleTask?this._delegateSpec.onScheduleTask(e,t,s,n):e.scheduleTask(s,n)},e.prototype.onInvokeTask=function(e,t,s,n,o,r){return"eventTask"!==n.type&&this.removeFromTasks(n),this.tryTriggerHasTask(e,t,s),this._delegateSpec&&this._delegateSpec.onInvokeTask?this._delegateSpec.onInvokeTask(e,t,s,n,o,r):e.invokeTask(s,n,o,r)},e.prototype.onCancelTask=function(e,t,s,n){return"eventTask"!==n.type&&this.removeFromTasks(n),this.tryTriggerHasTask(e,t,s),this._delegateSpec&&this._delegateSpec.onCancelTask?this._delegateSpec.onCancelTask(e,t,s,n):e.cancelTask(s,n)},e.prototype.onHasTask=function(e,t,s,n){this.lastTaskState=n,this._delegateSpec&&this._delegateSpec.onHasTask?this._delegateSpec.onHasTask(e,t,s,n):e.hasTask(s,n)},e}();Zone.ProxyZoneSpec=e});
\ No newline at end of file
diff --git a/dist/zone-async-testing.js b/dist/zone-async-testing.js
new file mode 100644
index 000000000..9d6f52df8
--- /dev/null
+++ b/dist/zone-async-testing.js
@@ -0,0 +1,107 @@
+/**
+* @license
+* Copyright Google Inc. All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Zone.__load_patch('asynctest', function (global, Zone, api) {
+    /**
+     * Wraps a test function in an asynchronous test zone. The test will automatically
+     * complete when all asynchronous calls within this zone are done.
+     */
+    Zone[api.symbol('asyncTest')] = function asyncTest(fn) {
+        // If we're running using the Jasmine test framework, adapt to call the 'done'
+        // function when asynchronous activity is finished.
+        if (global.jasmine) {
+            // Not using an arrow function to preserve context passed from call site
+            return function (done) {
+                if (!done) {
+                    // if we run beforeEach in @angular/core/testing/testing_internal then we get no done
+                    // fake it here and assume sync.
+                    done = function () { };
+                    done.fail = function (e) {
+                        throw e;
+                    };
+                }
+                runInTestZone(fn, this, done, function (err) {
+                    if (typeof err === 'string') {
+                        return done.fail(new Error(err));
+                    }
+                    else {
+                        done.fail(err);
+                    }
+                });
+            };
+        }
+        // Otherwise, return a promise which will resolve when asynchronous activity
+        // is finished. This will be correctly consumed by the Mocha framework with
+        // it('...', async(myFn)); or can be used in a custom framework.
+        // Not using an arrow function to preserve context passed from call site
+        return function () {
+            var _this = this;
+            return new Promise(function (finishCallback, failCallback) {
+                runInTestZone(fn, _this, finishCallback, failCallback);
+            });
+        };
+    };
+    function runInTestZone(fn, context, finishCallback, failCallback) {
+        var currentZone = Zone.current;
+        var AsyncTestZoneSpec = Zone['AsyncTestZoneSpec'];
+        if (AsyncTestZoneSpec === undefined) {
+            throw new Error('AsyncTestZoneSpec is needed for the async() test helper but could not be found. ' +
+                'Please make sure that your environment includes zone.js/dist/async-test.js');
+        }
+        var ProxyZoneSpec = Zone['ProxyZoneSpec'];
+        if (ProxyZoneSpec === undefined) {
+            throw new Error('ProxyZoneSpec is needed for the async() test helper but could not be found. ' +
+                'Please make sure that your environment includes zone.js/dist/proxy.js');
+        }
+        var proxyZoneSpec = ProxyZoneSpec.get();
+        ProxyZoneSpec.assertPresent();
+        // We need to create the AsyncTestZoneSpec outside the ProxyZone.
+        // If we do it in ProxyZone then we will get to infinite recursion.
+        var proxyZone = Zone.current.getZoneWith('ProxyZoneSpec');
+        var previousDelegate = proxyZoneSpec.getDelegate();
+        proxyZone.parent.run(function () {
+            var testZoneSpec = new AsyncTestZoneSpec(function () {
+                // Need to restore the original zone.
+                if (proxyZoneSpec.getDelegate() == testZoneSpec) {
+                    // Only reset the zone spec if it's
+                    // sill this one. Otherwise, assume
+                    // it's OK.
+                    proxyZoneSpec.setDelegate(previousDelegate);
+                }
+                currentZone.run(function () {
+                    finishCallback();
+                });
+            }, function (error) {
+                // Need to restore the original zone.
+                if (proxyZoneSpec.getDelegate() == testZoneSpec) {
+                    // Only reset the zone spec if it's sill this one. Otherwise, assume it's OK.
+                    proxyZoneSpec.setDelegate(previousDelegate);
+                }
+                currentZone.run(function () {
+                    failCallback(error);
+                });
+            }, 'test');
+            proxyZoneSpec.setDelegate(testZoneSpec);
+        });
+        return Zone.current.runGuarded(fn, context);
+    }
+});
+
+})));
diff --git a/dist/zone-fake-async.js b/dist/zone-fake-async.js
new file mode 100644
index 000000000..8ae013811
--- /dev/null
+++ b/dist/zone-fake-async.js
@@ -0,0 +1,161 @@
+/**
+* @license
+* Copyright Google Inc. All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Zone.__load_patch('fakeasync', function (global, Zone, api) {
+    var FakeAsyncTestZoneSpec = Zone && Zone['FakeAsyncTestZoneSpec'];
+    var ProxyZoneSpec = Zone && Zone['ProxyZoneSpec'];
+    var _fakeAsyncTestZoneSpec = null;
+    /**
+     * Clears out the shared fake async zone for a test.
+     * To be called in a global `beforeEach`.
+     *
+     * @experimental
+     */
+    function resetFakeAsyncZone() {
+        if (_fakeAsyncTestZoneSpec) {
+            _fakeAsyncTestZoneSpec.unlockDatePatch();
+        }
+        _fakeAsyncTestZoneSpec = null;
+        // in node.js testing we may not have ProxyZoneSpec in which case there is nothing to reset.
+        ProxyZoneSpec && ProxyZoneSpec.assertPresent().resetDelegate();
+    }
+    /**
+    * Wraps a function to be executed in the fakeAsync zone:
+    * - microtasks are manually executed by calling `flushMicrotasks()`,
+    * - timers are synchronous, `tick()` simulates the asynchronous passage of time.
+    *
+    * If there are any pending timers at the end of the function, an exception will be thrown.
+    *
+    * Can be used to wrap inject() calls.
+    *
+    * ## Example
+    *
+    * {@example core/testing/ts/fake_async.ts region='basic'}
+    *
+    * @param fn
+    * @returns The function wrapped to be executed in the fakeAsync zone
+    *
+    * @experimental
+    */
+    function fakeAsync(fn) {
+        // Not using an arrow function to preserve context passed from call site
+        return function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            var proxyZoneSpec = ProxyZoneSpec.assertPresent();
+            if (Zone.current.get('FakeAsyncTestZoneSpec')) {
+                throw new Error('fakeAsync() calls can not be nested');
+            }
+            try {
+                // in case jasmine.clock init a fakeAsyncTestZoneSpec
+                if (!_fakeAsyncTestZoneSpec) {
+                    if (proxyZoneSpec.getDelegate() instanceof FakeAsyncTestZoneSpec) {
+                        throw new Error('fakeAsync() calls can not be nested');
+                    }
+                    _fakeAsyncTestZoneSpec = new FakeAsyncTestZoneSpec();
+                }
+                var res = void 0;
+                var lastProxyZoneSpec = proxyZoneSpec.getDelegate();
+                proxyZoneSpec.setDelegate(_fakeAsyncTestZoneSpec);
+                _fakeAsyncTestZoneSpec.lockDatePatch();
+                try {
+                    res = fn.apply(this, args);
+                    flushMicrotasks();
+                }
+                finally {
+                    proxyZoneSpec.setDelegate(lastProxyZoneSpec);
+                }
+                if (_fakeAsyncTestZoneSpec.pendingPeriodicTimers.length > 0) {
+                    throw new Error(_fakeAsyncTestZoneSpec.pendingPeriodicTimers.length + " " +
+                        "periodic timer(s) still in the queue.");
+                }
+                if (_fakeAsyncTestZoneSpec.pendingTimers.length > 0) {
+                    throw new Error(_fakeAsyncTestZoneSpec.pendingTimers.length + " timer(s) still in the queue.");
+                }
+                return res;
+            }
+            finally {
+                resetFakeAsyncZone();
+            }
+        };
+    }
+    function _getFakeAsyncZoneSpec() {
+        if (_fakeAsyncTestZoneSpec == null) {
+            _fakeAsyncTestZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+            if (_fakeAsyncTestZoneSpec == null) {
+                throw new Error('The code should be running in the fakeAsync zone to call this function');
+            }
+        }
+        return _fakeAsyncTestZoneSpec;
+    }
+    /**
+     * Simulates the asynchronous passage of time for the timers in the fakeAsync zone.
+     *
+     * The microtasks queue is drained at the very start of this function and after any timer callback
+     * has been executed.
+     *
+     * ## Example
+     *
+     * {@example core/testing/ts/fake_async.ts region='basic'}
+     *
+     * @experimental
+     */
+    function tick(millis) {
+        if (millis === void 0) { millis = 0; }
+        _getFakeAsyncZoneSpec().tick(millis);
+    }
+    /**
+     * Simulates the asynchronous passage of time for the timers in the fakeAsync zone by
+     * draining the macrotask queue until it is empty. The returned value is the milliseconds
+     * of time that would have been elapsed.
+     *
+     * @param maxTurns
+     * @returns The simulated time elapsed, in millis.
+     *
+     * @experimental
+     */
+    function flush(maxTurns) {
+        return _getFakeAsyncZoneSpec().flush(maxTurns);
+    }
+    /**
+     * Discard all remaining periodic tasks.
+     *
+     * @experimental
+     */
+    function discardPeriodicTasks() {
+        var zoneSpec = _getFakeAsyncZoneSpec();
+        var pendingTimers = zoneSpec.pendingPeriodicTimers;
+        zoneSpec.pendingPeriodicTimers.length = 0;
+    }
+    /**
+     * Flush any pending microtasks.
+     *
+     * @experimental
+     */
+    function flushMicrotasks() {
+        _getFakeAsyncZoneSpec().flushMicrotasks();
+    }
+    Zone[api.symbol('fakeAsyncTest')] =
+        { resetFakeAsyncZone: resetFakeAsyncZone, flushMicrotasks: flushMicrotasks, discardPeriodicTasks: discardPeriodicTasks, tick: tick, flush: flush, fakeAsync: fakeAsync };
+});
+
+})));
diff --git a/dist/zone-mix.js b/dist/zone-mix.js
index 4b59965e3..23a6e068f 100644
--- a/dist/zone-mix.js
+++ b/dist/zone-mix.js
@@ -643,16 +643,6 @@ var Zone$1 = (function (global) {
     return global['Zone'] = Zone;
 })(typeof window !== 'undefined' && window || typeof self !== 'undefined' && self || global);
 
-var __values = (undefined && undefined.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-    if (m) return m.call(o);
-    return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-};
 Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
     var ObjectGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
     var ObjectDefineProperty = Object.defineProperty;
@@ -926,24 +916,14 @@ Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
             function onReject(error) {
                 promise && (promise = null || reject(error));
             }
-            try {
-                for (var values_1 = __values(values), values_1_1 = values_1.next(); !values_1_1.done; values_1_1 = values_1.next()) {
-                    var value = values_1_1.value;
-                    if (!isThenable(value)) {
-                        value = this.resolve(value);
-                    }
-                    value.then(onResolve, onReject);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (values_1_1 && !values_1_1.done && (_a = values_1.return)) _a.call(values_1);
+            for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
+                var value = values_1[_i];
+                if (!isThenable(value)) {
+                    value = this.resolve(value);
                 }
-                finally { if (e_1) throw e_1.error; }
+                value.then(onResolve, onReject);
             }
             return promise;
-            var e_1, _a;
         };
         ZoneAwarePromise.all = function (values) {
             var resolve;
@@ -954,33 +934,23 @@ Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
             });
             var count = 0;
             var resolvedValues = [];
-            try {
-                for (var values_2 = __values(values), values_2_1 = values_2.next(); !values_2_1.done; values_2_1 = values_2.next()) {
-                    var value = values_2_1.value;
-                    if (!isThenable(value)) {
-                        value = this.resolve(value);
+            for (var _i = 0, values_2 = values; _i < values_2.length; _i++) {
+                var value = values_2[_i];
+                if (!isThenable(value)) {
+                    value = this.resolve(value);
+                }
+                value.then((function (index) { return function (value) {
+                    resolvedValues[index] = value;
+                    count--;
+                    if (!count) {
+                        resolve(resolvedValues);
                     }
-                    value.then((function (index) { return function (value) {
-                        resolvedValues[index] = value;
-                        count--;
-                        if (!count) {
-                            resolve(resolvedValues);
-                        }
-                    }; })(count), reject);
-                    count++;
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (values_2_1 && !values_2_1.done && (_a = values_2.return)) _a.call(values_2);
-                }
-                finally { if (e_2) throw e_2.error; }
+                }; })(count), reject);
+                count++;
             }
             if (!count)
                 resolve(resolvedValues);
             return promise;
-            var e_2, _a;
         };
         ZoneAwarePromise.prototype.then = function (onFulfilled, onRejected) {
             var chainPromise = new this.constructor(null);
diff --git a/dist/zone-node.js b/dist/zone-node.js
index dc55a8875..c857c893c 100644
--- a/dist/zone-node.js
+++ b/dist/zone-node.js
@@ -643,16 +643,6 @@ var Zone$1 = (function (global) {
     return global['Zone'] = Zone;
 })(typeof window !== 'undefined' && window || typeof self !== 'undefined' && self || global);
 
-var __values = (undefined && undefined.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-    if (m) return m.call(o);
-    return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-};
 Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
     var ObjectGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
     var ObjectDefineProperty = Object.defineProperty;
@@ -926,24 +916,14 @@ Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
             function onReject(error) {
                 promise && (promise = null || reject(error));
             }
-            try {
-                for (var values_1 = __values(values), values_1_1 = values_1.next(); !values_1_1.done; values_1_1 = values_1.next()) {
-                    var value = values_1_1.value;
-                    if (!isThenable(value)) {
-                        value = this.resolve(value);
-                    }
-                    value.then(onResolve, onReject);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (values_1_1 && !values_1_1.done && (_a = values_1.return)) _a.call(values_1);
+            for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
+                var value = values_1[_i];
+                if (!isThenable(value)) {
+                    value = this.resolve(value);
                 }
-                finally { if (e_1) throw e_1.error; }
+                value.then(onResolve, onReject);
             }
             return promise;
-            var e_1, _a;
         };
         ZoneAwarePromise.all = function (values) {
             var resolve;
@@ -954,33 +934,23 @@ Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
             });
             var count = 0;
             var resolvedValues = [];
-            try {
-                for (var values_2 = __values(values), values_2_1 = values_2.next(); !values_2_1.done; values_2_1 = values_2.next()) {
-                    var value = values_2_1.value;
-                    if (!isThenable(value)) {
-                        value = this.resolve(value);
+            for (var _i = 0, values_2 = values; _i < values_2.length; _i++) {
+                var value = values_2[_i];
+                if (!isThenable(value)) {
+                    value = this.resolve(value);
+                }
+                value.then((function (index) { return function (value) {
+                    resolvedValues[index] = value;
+                    count--;
+                    if (!count) {
+                        resolve(resolvedValues);
                     }
-                    value.then((function (index) { return function (value) {
-                        resolvedValues[index] = value;
-                        count--;
-                        if (!count) {
-                            resolve(resolvedValues);
-                        }
-                    }; })(count), reject);
-                    count++;
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (values_2_1 && !values_2_1.done && (_a = values_2.return)) _a.call(values_2);
-                }
-                finally { if (e_2) throw e_2.error; }
+                }; })(count), reject);
+                count++;
             }
             if (!count)
                 resolve(resolvedValues);
             return promise;
-            var e_2, _a;
         };
         ZoneAwarePromise.prototype.then = function (onFulfilled, onRejected) {
             var chainPromise = new this.constructor(null);
diff --git a/dist/zone-patch-jsonp.js b/dist/zone-patch-jsonp.js
new file mode 100644
index 000000000..4dcf57382
--- /dev/null
+++ b/dist/zone-patch-jsonp.js
@@ -0,0 +1,81 @@
+/**
+* @license
+* Copyright Google Inc. All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Zone.__load_patch('jsonp', function (global, Zone, api) {
+    Zone[Zone.__symbol__('jsonp')] = function patchJsonp(options) {
+        if (!options || !options.jsonp || !options.sendFuncName) {
+            return;
+        }
+        var noop = function () { };
+        [options.successFuncName, options.failedFuncName].forEach(function (methodName) {
+            if (!methodName) {
+                return;
+            }
+            var oriFunc = global[methodName];
+            if (oriFunc) {
+                api.patchMethod(global, methodName, function (delegate) { return function (self, args) {
+                    var task = global[api.symbol('jsonTask')];
+                    if (task) {
+                        task.callback = delegate;
+                        return task.invoke.apply(self, args);
+                    }
+                    else {
+                        return delegate.apply(self, args);
+                    }
+                }; });
+            }
+            else {
+                Object.defineProperty(global, methodName, {
+                    configurable: true,
+                    enumerable: true,
+                    get: function () {
+                        return function () {
+                            var task = global[api.symbol('jsonpTask')];
+                            var delegate = global[api.symbol("jsonp" + methodName + "callback")];
+                            if (task) {
+                                if (delegate) {
+                                    task.callback = delegate;
+                                }
+                                global[api.symbol('jsonpTask')] = undefined;
+                                return task.invoke.apply(this, arguments);
+                            }
+                            else {
+                                if (delegate) {
+                                    return delegate.apply(this, arguments);
+                                }
+                            }
+                            return null;
+                        };
+                    },
+                    set: function (callback) {
+                        this[api.symbol("jsonp" + methodName + "callback")] = callback;
+                    }
+                });
+            }
+        });
+        api.patchMethod(options.jsonp, options.sendFuncName, function (delegate) { return function (self, args) {
+            global[api.symbol('jsonpTask')] = Zone.current.scheduleMacroTask('jsonp', noop, {}, function (task) {
+                return delegate.apply(self, args);
+            }, noop);
+        }; });
+    };
+});
+
+})));
diff --git a/dist/zone-patch-jsonp.min.js b/dist/zone-patch-jsonp.min.js
new file mode 100644
index 000000000..6d8881776
--- /dev/null
+++ b/dist/zone-patch-jsonp.min.js
@@ -0,0 +1 @@
+!function(n,o){"object"==typeof exports&&"undefined"!=typeof module?o():"function"==typeof define&&define.amd?define(o):o()}(this,function(){"use strict";Zone.__load_patch("jsonp",function(n,o,e){o[o.__symbol__("jsonp")]=function(t){if(t&&t.jsonp&&t.sendFuncName){var c=function(){};[t.successFuncName,t.failedFuncName].forEach(function(o){if(o){var t=n[o];t?e.patchMethod(n,o,function(o){return function(t,c){var s=n[e.symbol("jsonTask")];return s?(s.callback=o,s.invoke.apply(t,c)):o.apply(t,c)}}):Object.defineProperty(n,o,{configurable:!0,enumerable:!0,get:function(){return function(){var t=n[e.symbol("jsonpTask")],c=n[e.symbol("jsonp"+o+"callback")];return t?(c&&(t.callback=c),n[e.symbol("jsonpTask")]=void 0,t.invoke.apply(this,arguments)):c?c.apply(this,arguments):null}},set:function(n){this[e.symbol("jsonp"+o+"callback")]=n}})}}),e.patchMethod(t.jsonp,t.sendFuncName,function(t){return function(s,a){n[e.symbol("jsonpTask")]=o.current.scheduleMacroTask("jsonp",c,{},function(n){return t.apply(s,a)},c)}})}}})});
\ No newline at end of file
diff --git a/dist/zone-patch-promise-test.js b/dist/zone-patch-promise-test.js
new file mode 100644
index 000000000..45a7db12d
--- /dev/null
+++ b/dist/zone-patch-promise-test.js
@@ -0,0 +1,80 @@
+/**
+* @license
+* Copyright Google Inc. All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+/**
+ * Promise for async/fakeAsync zoneSpec test
+ * can support async operation which not supported by zone.js
+ * such as
+ * it ('test jsonp in AsyncZone', async() => {
+ *   new Promise(res => {
+ *     jsonp(url, (data) => {
+ *       // success callback
+ *       res(data);
+ *     });
+ *   }).then((jsonpResult) => {
+ *     // get jsonp result.
+ *
+ *     // user will expect AsyncZoneSpec wait for
+ *     // then, but because jsonp is not zone aware
+ *     // AsyncZone will finish before then is called.
+ *   });
+ * });
+ */
+Zone.__load_patch('promisefortest', function (global, Zone, api) {
+    var symbolState = api.symbol('state');
+    var UNRESOLVED = null;
+    var symbolParentUnresolved = api.symbol('parentUnresolved');
+    // patch Promise.prototype.then to keep an internal
+    // number for tracking unresolved chained promise
+    // we will decrease this number when the parent promise
+    // being resolved/rejected and chained promise was
+    // scheduled as a microTask.
+    // so we can know such kind of chained promise still
+    // not resolved in AsyncTestZone
+    Promise[api.symbol('patchPromiseForTest')] = function patchPromiseForTest() {
+        var oriThen = Promise[Zone.__symbol__('ZonePromiseThen')];
+        if (oriThen) {
+            return;
+        }
+        oriThen = Promise[Zone.__symbol__('ZonePromiseThen')] = Promise.prototype.then;
+        Promise.prototype.then = function () {
+            var chained = oriThen.apply(this, arguments);
+            if (this[symbolState] === UNRESOLVED) {
+                // parent promise is unresolved.
+                var asyncTestZoneSpec = Zone.current.get('AsyncTestZoneSpec');
+                if (asyncTestZoneSpec) {
+                    asyncTestZoneSpec.unresolvedChainedPromiseCount++;
+                    chained[symbolParentUnresolved] = true;
+                }
+            }
+            return chained;
+        };
+    };
+    Promise[api.symbol('unPatchPromiseForTest')] = function unpatchPromiseForTest() {
+        // restore origin then
+        var oriThen = Promise[Zone.__symbol__('ZonePromiseThen')];
+        if (oriThen) {
+            Promise.prototype.then = oriThen;
+            Promise[Zone.__symbol__('ZonePromiseThen')] = undefined;
+        }
+    };
+});
+
+})));
diff --git a/dist/zone-patch-promise-test.min.js b/dist/zone-patch-promise-test.min.js
new file mode 100644
index 000000000..55ac90a8c
--- /dev/null
+++ b/dist/zone-patch-promise-test.min.js
@@ -0,0 +1 @@
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?o():"function"==typeof define&&define.amd?define(o):o()}(this,function(){"use strict";Zone.__load_patch("promisefortest",function(e,o,n){var t=n.symbol("state"),s=null,r=n.symbol("parentUnresolved");Promise[n.symbol("patchPromiseForTest")]=function(){var e=Promise[o.__symbol__("ZonePromiseThen")];e||(e=Promise[o.__symbol__("ZonePromiseThen")]=Promise.prototype.then,Promise.prototype.then=function(){var n=e.apply(this,arguments);if(this[t]===s){var i=o.current.get("AsyncTestZoneSpec");i&&(i.unresolvedChainedPromiseCount++,n[r]=!0)}return n})},Promise[n.symbol("unPatchPromiseForTest")]=function(){var e=Promise[o.__symbol__("ZonePromiseThen")];e&&(Promise.prototype.then=e,Promise[o.__symbol__("ZonePromiseThen")]=void 0)}})});
\ No newline at end of file
diff --git a/dist/zone-patch-resize-observer.js b/dist/zone-patch-resize-observer.js
new file mode 100644
index 000000000..b0cabc088
--- /dev/null
+++ b/dist/zone-patch-resize-observer.js
@@ -0,0 +1,99 @@
+/**
+* @license
+* Copyright Google Inc. All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Zone.__load_patch('ResizeObserver', function (global, Zone, api) {
+    var ResizeObserver = global['ResizeObserver'];
+    if (!ResizeObserver) {
+        return;
+    }
+    var resizeObserverSymbol = api.symbol('ResizeObserver');
+    api.patchMethod(global, 'ResizeObserver', function (delegate) { return function (self, args) {
+        var callback = args.length > 0 ? args[0] : null;
+        if (callback) {
+            args[0] = function (entries, observer) {
+                var _this = this;
+                var zones = {};
+                var currZone = Zone.current;
+                for (var _i = 0, entries_1 = entries; _i < entries_1.length; _i++) {
+                    var entry = entries_1[_i];
+                    var zone = entry.target[resizeObserverSymbol];
+                    if (!zone) {
+                        zone = currZone;
+                    }
+                    var zoneEntriesInfo = zones[zone.name];
+                    if (!zoneEntriesInfo) {
+                        zones[zone.name] = zoneEntriesInfo = { entries: [], zone: zone };
+                    }
+                    zoneEntriesInfo.entries.push(entry);
+                }
+                Object.keys(zones).forEach(function (zoneName) {
+                    var zoneEntriesInfo = zones[zoneName];
+                    if (zoneEntriesInfo.zone !== Zone.current) {
+                        zoneEntriesInfo.zone.run(callback, _this, [zoneEntriesInfo.entries, observer], 'ResizeObserver');
+                    }
+                    else {
+                        callback.call(_this, zoneEntriesInfo.entries, observer);
+                    }
+                });
+            };
+        }
+        return args.length > 0 ? new ResizeObserver(args[0]) : new ResizeObserver();
+    }; });
+    api.patchMethod(ResizeObserver.prototype, 'observe', function (delegate) { return function (self, args) {
+        var target = args.length > 0 ? args[0] : null;
+        if (!target) {
+            return delegate.apply(self, args);
+        }
+        var targets = self[resizeObserverSymbol];
+        if (!targets) {
+            targets = self[resizeObserverSymbol] = [];
+        }
+        targets.push(target);
+        target[resizeObserverSymbol] = Zone.current;
+        return delegate.apply(self, args);
+    }; });
+    api.patchMethod(ResizeObserver.prototype, 'unobserve', function (delegate) { return function (self, args) {
+        var target = args.length > 0 ? args[0] : null;
+        if (!target) {
+            return delegate.apply(self, args);
+        }
+        var targets = self[resizeObserverSymbol];
+        if (targets) {
+            for (var i = 0; i < targets.length; i++) {
+                if (targets[i] === target) {
+                    targets.splice(i, 1);
+                    break;
+                }
+            }
+        }
+        target[resizeObserverSymbol] = undefined;
+        return delegate.apply(self, args);
+    }; });
+    api.patchMethod(ResizeObserver.prototype, 'disconnect', function (delegate) { return function (self, args) {
+        var targets = self[resizeObserverSymbol];
+        if (targets) {
+            targets.forEach(function (target) { target[resizeObserverSymbol] = undefined; });
+            self[resizeObserverSymbol] = undefined;
+        }
+        return delegate.apply(self, args);
+    }; });
+});
+
+})));
diff --git a/dist/zone-patch-resize-observer.min.js b/dist/zone-patch-resize-observer.min.js
new file mode 100644
index 000000000..bffe2a10a
--- /dev/null
+++ b/dist/zone-patch-resize-observer.min.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n():"function"==typeof define&&define.amd?define(n):n()}(this,function(){"use strict";Zone.__load_patch("ResizeObserver",function(e,n,r){var t=e.ResizeObserver;if(t){var o=r.symbol("ResizeObserver");r.patchMethod(e,"ResizeObserver",function(e){return function(e,r){var i=r.length>0?r[0]:null;return i&&(r[0]=function(e,r){for(var t=this,u={},a=n.current,c=0,f=e;c<f.length;c++){var p=f[c],s=p.target[o];s||(s=a);var l=u[s.name];l||(u[s.name]=l={entries:[],zone:s}),l.entries.push(p)}Object.keys(u).forEach(function(e){var o=u[e];o.zone!==n.current?o.zone.run(i,t,[o.entries,r],"ResizeObserver"):i.call(t,o.entries,r)})}),r.length>0?new t(r[0]):new t}}),r.patchMethod(t.prototype,"observe",function(e){return function(r,t){var i=t.length>0?t[0]:null;if(!i)return e.apply(r,t);var u=r[o];return u||(u=r[o]=[]),u.push(i),i[o]=n.current,e.apply(r,t)}}),r.patchMethod(t.prototype,"unobserve",function(e){return function(n,r){var t=r.length>0?r[0]:null;if(!t)return e.apply(n,r);var i=n[o];if(i)for(var u=0;u<i.length;u++)if(i[u]===t){i.splice(u,1);break}return t[o]=void 0,e.apply(n,r)}}),r.patchMethod(t.prototype,"disconnect",function(e){return function(n,r){var t=n[o];return t&&(t.forEach(function(e){e[o]=void 0}),n[o]=void 0),e.apply(n,r)}})}})});
\ No newline at end of file
diff --git a/dist/zone-patch-rxjs-fake-async.js b/dist/zone-patch-rxjs-fake-async.js
new file mode 100644
index 000000000..861af0a37
--- /dev/null
+++ b/dist/zone-patch-rxjs-fake-async.js
@@ -0,0 +1,33 @@
+/**
+* @license
+* Copyright Google Inc. All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('rxjs/Scheduler'), require('rxjs/scheduler/async'), require('rxjs/scheduler/asap')) :
+	typeof define === 'function' && define.amd ? define(['rxjs/Scheduler', 'rxjs/scheduler/async', 'rxjs/scheduler/asap'], factory) :
+	(factory(global.Scheduler,global.async,global.Rx.Scheduler));
+}(this, (function (Scheduler,async,asap) { 'use strict';
+
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Zone.__load_patch('rxjs.Scheduler.now', function (global, Zone, api) {
+    api.patchMethod(Scheduler.Scheduler, 'now', function (delegate) { return function (self, args) {
+        return Date.now.apply(self, args);
+    }; });
+    api.patchMethod(async.async, 'now', function (delegate) { return function (self, args) {
+        return Date.now.apply(self, args);
+    }; });
+    api.patchMethod(asap.asap, 'now', function (delegate) { return function (self, args) {
+        return Date.now.apply(self, args);
+    }; });
+});
+
+})));
diff --git a/dist/zone-patch-rxjs-fake-async.min.js b/dist/zone-patch-rxjs-fake-async.min.js
new file mode 100644
index 000000000..73bb37a79
--- /dev/null
+++ b/dist/zone-patch-rxjs-fake-async.min.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("rxjs/Scheduler"),require("rxjs/scheduler/async"),require("rxjs/scheduler/asap")):"function"==typeof define&&define.amd?define(["rxjs/Scheduler","rxjs/scheduler/async","rxjs/scheduler/asap"],n):n(e.Scheduler,e.async,e.Rx.Scheduler)}(this,function(e,n,r){"use strict";Zone.__load_patch("rxjs.Scheduler.now",function(t,u,c){c.patchMethod(e.Scheduler,"now",function(e){return function(e,n){return Date.now.apply(e,n)}}),c.patchMethod(n.async,"now",function(e){return function(e,n){return Date.now.apply(e,n)}}),c.patchMethod(r.asap,"now",function(e){return function(e,n){return Date.now.apply(e,n)}})})});
\ No newline at end of file
diff --git a/dist/zone-patch-socket-io.js b/dist/zone-patch-socket-io.js
new file mode 100644
index 000000000..dd1c84cbf
--- /dev/null
+++ b/dist/zone-patch-socket-io.js
@@ -0,0 +1,39 @@
+/**
+* @license
+* Copyright Google Inc. All Rights Reserved.
+*
+* Use of this source code is governed by an MIT-style license that can be
+* found in the LICENSE file at https://angular.io/license
+*/
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
+
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Zone.__load_patch('socketio', function (global, Zone, api) {
+    Zone[Zone.__symbol__('socketio')] = function patchSocketIO(io) {
+        // patch io.Socket.prototype event listener related method
+        api.patchEventTarget(global, [io.Socket.prototype], {
+            useG: false,
+            chkDup: false,
+            rt: true,
+            diff: function (task, delegate) {
+                return task.callback === delegate;
+            }
+        });
+        // also patch io.Socket.prototype.on/off/removeListener/removeAllListeners
+        io.Socket.prototype.on = io.Socket.prototype.addEventListener;
+        io.Socket.prototype.off = io.Socket.prototype.removeListener =
+            io.Socket.prototype.removeAllListeners = io.Socket.prototype.removeEventListener;
+    };
+});
+
+})));
diff --git a/dist/zone-patch-socket-io.min.js b/dist/zone-patch-socket-io.min.js
new file mode 100644
index 000000000..29eb2a79b
--- /dev/null
+++ b/dist/zone-patch-socket-io.min.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&&define.amd?define(t):t()}(this,function(){"use strict";Zone.__load_patch("socketio",function(e,t,o){t[t.__symbol__("socketio")]=function(t){o.patchEventTarget(e,[t.Socket.prototype],{useG:!1,chkDup:!1,rt:!0,diff:function(e,t){return e.callback===t}}),t.Socket.prototype.on=t.Socket.prototype.addEventListener,t.Socket.prototype.off=t.Socket.prototype.removeListener=t.Socket.prototype.removeAllListeners=t.Socket.prototype.removeEventListener}})});
\ No newline at end of file
diff --git a/dist/zone-testing-bundle.js b/dist/zone-testing-bundle.js
index 3186c4ab2..0f2276651 100644
--- a/dist/zone-testing-bundle.js
+++ b/dist/zone-testing-bundle.js
@@ -643,16 +643,6 @@ var Zone$1 = (function (global) {
     return global['Zone'] = Zone;
 })(typeof window !== 'undefined' && window || typeof self !== 'undefined' && self || global);
 
-var __values = (undefined && undefined.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-    if (m) return m.call(o);
-    return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-};
 Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
     var ObjectGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
     var ObjectDefineProperty = Object.defineProperty;
@@ -926,24 +916,14 @@ Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
             function onReject(error) {
                 promise && (promise = null || reject(error));
             }
-            try {
-                for (var values_1 = __values(values), values_1_1 = values_1.next(); !values_1_1.done; values_1_1 = values_1.next()) {
-                    var value = values_1_1.value;
-                    if (!isThenable(value)) {
-                        value = this.resolve(value);
-                    }
-                    value.then(onResolve, onReject);
+            for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
+                var value = values_1[_i];
+                if (!isThenable(value)) {
+                    value = this.resolve(value);
                 }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (values_1_1 && !values_1_1.done && (_a = values_1.return)) _a.call(values_1);
-                }
-                finally { if (e_1) throw e_1.error; }
+                value.then(onResolve, onReject);
             }
             return promise;
-            var e_1, _a;
         };
         ZoneAwarePromise.all = function (values) {
             var resolve;
@@ -954,33 +934,23 @@ Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
             });
             var count = 0;
             var resolvedValues = [];
-            try {
-                for (var values_2 = __values(values), values_2_1 = values_2.next(); !values_2_1.done; values_2_1 = values_2.next()) {
-                    var value = values_2_1.value;
-                    if (!isThenable(value)) {
-                        value = this.resolve(value);
-                    }
-                    value.then((function (index) { return function (value) {
-                        resolvedValues[index] = value;
-                        count--;
-                        if (!count) {
-                            resolve(resolvedValues);
-                        }
-                    }; })(count), reject);
-                    count++;
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (values_2_1 && !values_2_1.done && (_a = values_2.return)) _a.call(values_2);
+            for (var _i = 0, values_2 = values; _i < values_2.length; _i++) {
+                var value = values_2[_i];
+                if (!isThenable(value)) {
+                    value = this.resolve(value);
                 }
-                finally { if (e_2) throw e_2.error; }
+                value.then((function (index) { return function (value) {
+                    resolvedValues[index] = value;
+                    count--;
+                    if (!count) {
+                        resolve(resolvedValues);
+                    }
+                }; })(count), reject);
+                count++;
             }
             if (!count)
                 resolve(resolvedValues);
             return promise;
-            var e_2, _a;
         };
         ZoneAwarePromise.prototype.then = function (onFulfilled, onRejected) {
             var chainPromise = new this.constructor(null);
@@ -3299,6 +3269,7 @@ var ProxyZoneSpec = /** @class */ (function () {
         return this._delegateSpec;
     };
     ProxyZoneSpec.prototype.resetDelegate = function () {
+        var delegateSpec = this.getDelegate();
         this.setDelegate(this.defaultSpecDelegate);
     };
     ProxyZoneSpec.prototype.tryTriggerHasTask = function (parentZoneDelegate, currentZone, targetZone) {
@@ -3555,7 +3526,7 @@ Zone['SyncTestZoneSpec'] = SyncTestZoneSpec;
             return syncZone.run(describeBody, this, arguments);
         };
     }
-    function runInTestZone(testBody, queueRunner, done) {
+    function runInTestZone(testBody, applyThis, queueRunner, done) {
         var isClockInstalled = !!jasmine[symbol('clockInstalled')];
         var testProxyZoneSpec = queueRunner.testProxyZoneSpec;
         var testProxyZone = queueRunner.testProxyZone;
@@ -3566,18 +3537,23 @@ Zone['SyncTestZoneSpec'] = SyncTestZoneSpec;
                 var _fakeAsyncTestZoneSpec = new FakeAsyncTestZoneSpec();
                 lastDelegate = testProxyZoneSpec.getDelegate();
                 testProxyZoneSpec.setDelegate(_fakeAsyncTestZoneSpec);
+                _fakeAsyncTestZoneSpec.lockDatePatch();
             }
         }
         try {
             if (done) {
-                return testProxyZone.run(testBody, this, [done]);
+                return testProxyZone.run(testBody, applyThis, [done]);
             }
             else {
-                return testProxyZone.run(testBody, this);
+                return testProxyZone.run(testBody, applyThis);
             }
         }
         finally {
             if (isClockInstalled) {
+                var _fakeAsyncTestZoneSpec = testProxyZoneSpec.getDelegate();
+                if (_fakeAsyncTestZoneSpec) {
+                    _fakeAsyncTestZoneSpec.unlockDatePatch();
+                }
                 testProxyZoneSpec.setDelegate(lastDelegate);
             }
         }
@@ -3592,9 +3568,9 @@ Zone['SyncTestZoneSpec'] = SyncTestZoneSpec;
         // Note we have to make a function with correct number of arguments, otherwise jasmine will
         // think that all functions are sync or async.
         return (testBody && (testBody.length ? function (done) {
-            return runInTestZone(testBody, this.queueRunner, done);
+            return runInTestZone(testBody, this, this.queueRunner, done);
         } : function () {
-            return runInTestZone(testBody, this.queueRunner);
+            return runInTestZone(testBody, this, this.queueRunner);
         }));
     }
     var QueueRunner = jasmine.QueueRunner;
@@ -3709,13 +3685,11 @@ var AsyncTestZoneSpec = /** @class */ (function () {
         this.runZone = Zone.current;
         this.unresolvedChainedPromiseCount = 0;
         this.name = 'asyncTestZone for ' + namePrefix;
-        this.properties = {
-            'AsyncTestZoneSpec': this
-        };
+        this.properties = { 'AsyncTestZoneSpec': this };
     }
     AsyncTestZoneSpec.prototype._finishCallbackIfDone = function () {
         var _this = this;
-        if (!(this._pendingMicroTasks || this._pendingMacroTasks || this.unresolvedChainedPromiseCount !== 0)) {
+        if (!(this._pendingMicroTasks || this._pendingMacroTasks)) {
             // We do this because we would like to catch unhandled rejected promises.
             this.runZone.run(function () {
                 setTimeout(function () {
@@ -3743,7 +3717,7 @@ var AsyncTestZoneSpec = /** @class */ (function () {
             this._isSync = false;
         }
         if (task.type === 'microTask' && task.data && task.data instanceof Promise) {
-            // check whether the promise is a chained promise 
+            // check whether the promise is a chained promise
             if (task.data[AsyncTestZoneSpec.symbolParentUnresolved] === true) {
                 // chained promise is being scheduled
                 this.unresolvedChainedPromiseCount--;
@@ -3770,12 +3744,10 @@ var AsyncTestZoneSpec = /** @class */ (function () {
     // was scheduled/invoked/canceled.
     AsyncTestZoneSpec.prototype.onInvoke = function (parentZoneDelegate, currentZone, targetZone, delegate, applyThis, applyArgs, source) {
         try {
-            this.patchPromiseForTest();
             this._isSync = true;
             return parentZoneDelegate.invoke(targetZone, delegate, applyThis, applyArgs, source);
         }
         finally {
-            this.unPatchPromiseForTest();
             var afterTaskCounts = parentZoneDelegate._taskCounts;
             if (this._isSync) {
                 this._finishCallbackIfDone();
@@ -3990,6 +3962,7 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
             this._uncaughtPromiseErrors = Promise[Zone.__symbol__('uncaughtPromiseErrors')];
             this.pendingPeriodicTimers = [];
             this.pendingTimers = [];
+            this.patchDateLocked = false;
             this.properties = { 'FakeAsyncTestZoneSpec': this };
             this.name = 'fakeAsyncTestZone for ' + namePrefix;
             // in case user can't access the construction of FakeAsyncTestSpec
@@ -4105,12 +4078,21 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
                 return;
             }
             global['Date'] = FakeDate;
+            FakeDate.prototype = OriginalDate.prototype;
         };
         FakeAsyncTestZoneSpec.resetDate = function () {
             if (global['Date'] === FakeDate) {
                 global['Date'] = OriginalDate;
             }
         };
+        FakeAsyncTestZoneSpec.prototype.lockDatePatch = function () {
+            this.patchDateLocked = true;
+            FakeAsyncTestZoneSpec.patchDate();
+        };
+        FakeAsyncTestZoneSpec.prototype.unlockDatePatch = function () {
+            this.patchDateLocked = false;
+            FakeAsyncTestZoneSpec.resetDate();
+        };
         FakeAsyncTestZoneSpec.prototype.tick = function (millis, doTick) {
             if (millis === void 0) { millis = 0; }
             FakeAsyncTestZoneSpec.assertInZone();
@@ -4169,6 +4151,9 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
                         case 'setTimeout':
                             task.data['handleId'] = this._setTimeout(task.invoke, task.data['delay'], Array.prototype.slice.call(task.data['args'], 2));
                             break;
+                        case 'setImmediate':
+                            task.data['handleId'] = this._setTimeout(task.invoke, 0, Array.prototype.slice.call(task.data['args'], 1));
+                            break;
                         case 'setInterval':
                             task.data['handleId'] = this._setInterval(task.invoke, task.data['delay'], Array.prototype.slice.call(task.data['args'], 2));
                             break;
@@ -4237,7 +4222,9 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
                 return delegate.invoke(target, callback, applyThis, applyArgs, source);
             }
             finally {
-                FakeAsyncTestZoneSpec.resetDate();
+                if (!this.patchDateLocked) {
+                    FakeAsyncTestZoneSpec.resetDate();
+                }
             }
         };
         FakeAsyncTestZoneSpec.prototype.findMacroTaskOption = function (task) {
@@ -4336,10 +4323,91 @@ Zone.__load_patch('promisefortest', function (global, Zone, api) {
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-/**
- * Wraps a test function in an asynchronous test zone. The test will automatically
- * complete when all asynchronous calls within this zone are done.
- */
+Zone.__load_patch('asynctest', function (global, Zone, api) {
+    /**
+     * Wraps a test function in an asynchronous test zone. The test will automatically
+     * complete when all asynchronous calls within this zone are done.
+     */
+    Zone[api.symbol('asyncTest')] = function asyncTest(fn) {
+        // If we're running using the Jasmine test framework, adapt to call the 'done'
+        // function when asynchronous activity is finished.
+        if (global.jasmine) {
+            // Not using an arrow function to preserve context passed from call site
+            return function (done) {
+                if (!done) {
+                    // if we run beforeEach in @angular/core/testing/testing_internal then we get no done
+                    // fake it here and assume sync.
+                    done = function () { };
+                    done.fail = function (e) {
+                        throw e;
+                    };
+                }
+                runInTestZone(fn, this, done, function (err) {
+                    if (typeof err === 'string') {
+                        return done.fail(new Error(err));
+                    }
+                    else {
+                        done.fail(err);
+                    }
+                });
+            };
+        }
+        // Otherwise, return a promise which will resolve when asynchronous activity
+        // is finished. This will be correctly consumed by the Mocha framework with
+        // it('...', async(myFn)); or can be used in a custom framework.
+        // Not using an arrow function to preserve context passed from call site
+        return function () {
+            var _this = this;
+            return new Promise(function (finishCallback, failCallback) {
+                runInTestZone(fn, _this, finishCallback, failCallback);
+            });
+        };
+    };
+    function runInTestZone(fn, context, finishCallback, failCallback) {
+        var currentZone = Zone.current;
+        var AsyncTestZoneSpec = Zone['AsyncTestZoneSpec'];
+        if (AsyncTestZoneSpec === undefined) {
+            throw new Error('AsyncTestZoneSpec is needed for the async() test helper but could not be found. ' +
+                'Please make sure that your environment includes zone.js/dist/async-test.js');
+        }
+        var ProxyZoneSpec = Zone['ProxyZoneSpec'];
+        if (ProxyZoneSpec === undefined) {
+            throw new Error('ProxyZoneSpec is needed for the async() test helper but could not be found. ' +
+                'Please make sure that your environment includes zone.js/dist/proxy.js');
+        }
+        var proxyZoneSpec = ProxyZoneSpec.get();
+        ProxyZoneSpec.assertPresent();
+        // We need to create the AsyncTestZoneSpec outside the ProxyZone.
+        // If we do it in ProxyZone then we will get to infinite recursion.
+        var proxyZone = Zone.current.getZoneWith('ProxyZoneSpec');
+        var previousDelegate = proxyZoneSpec.getDelegate();
+        proxyZone.parent.run(function () {
+            var testZoneSpec = new AsyncTestZoneSpec(function () {
+                // Need to restore the original zone.
+                if (proxyZoneSpec.getDelegate() == testZoneSpec) {
+                    // Only reset the zone spec if it's
+                    // sill this one. Otherwise, assume
+                    // it's OK.
+                    proxyZoneSpec.setDelegate(previousDelegate);
+                }
+                currentZone.run(function () {
+                    finishCallback();
+                });
+            }, function (error) {
+                // Need to restore the original zone.
+                if (proxyZoneSpec.getDelegate() == testZoneSpec) {
+                    // Only reset the zone spec if it's sill this one. Otherwise, assume it's OK.
+                    proxyZoneSpec.setDelegate(previousDelegate);
+                }
+                currentZone.run(function () {
+                    failCallback(error);
+                });
+            }, 'test');
+            proxyZoneSpec.setDelegate(testZoneSpec);
+        });
+        return Zone.current.runGuarded(fn, context);
+    }
+});
 
 /**
  * @license
@@ -4348,69 +4416,145 @@ Zone.__load_patch('promisefortest', function (global, Zone, api) {
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var FakeAsyncTestZoneSpec = Zone && Zone['FakeAsyncTestZoneSpec'];
-var ProxyZoneSpec$1 = Zone && Zone['ProxyZoneSpec'];
-/**
- * Clears out the shared fake async zone for a test.
- * To be called in a global `beforeEach`.
- *
- * @experimental
- */
-
-/**
- * Wraps a function to be executed in the fakeAsync zone:
- * - microtasks are manually executed by calling `flushMicrotasks()`,
- * - timers are synchronous, `tick()` simulates the asynchronous passage of time.
- *
- * If there are any pending timers at the end of the function, an exception will be thrown.
- *
- * Can be used to wrap inject() calls.
- *
- * ## Example
- *
- * {@example core/testing/ts/fake_async.ts region='basic'}
- *
- * @param fn
- * @returns The function wrapped to be executed in the fakeAsync zone
- *
- * @experimental
- */
-
-/**
- * Simulates the asynchronous passage of time for the timers in the fakeAsync zone.
- *
- * The microtasks queue is drained at the very start of this function and after any timer callback
- * has been executed.
- *
- * ## Example
- *
- * {@example core/testing/ts/fake_async.ts region='basic'}
- *
- * @experimental
- */
-
-/**
- * Simulates the asynchronous passage of time for the timers in the fakeAsync zone by
- * draining the macrotask queue until it is empty. The returned value is the milliseconds
- * of time that would have been elapsed.
- *
- * @param maxTurns
- * @returns The simulated time elapsed, in millis.
- *
- * @experimental
- */
-
-/**
- * Discard all remaining periodic tasks.
- *
- * @experimental
- */
-
-/**
- * Flush any pending microtasks.
- *
- * @experimental
- */
+Zone.__load_patch('fakeasync', function (global, Zone, api) {
+    var FakeAsyncTestZoneSpec = Zone && Zone['FakeAsyncTestZoneSpec'];
+    var ProxyZoneSpec = Zone && Zone['ProxyZoneSpec'];
+    var _fakeAsyncTestZoneSpec = null;
+    /**
+     * Clears out the shared fake async zone for a test.
+     * To be called in a global `beforeEach`.
+     *
+     * @experimental
+     */
+    function resetFakeAsyncZone() {
+        if (_fakeAsyncTestZoneSpec) {
+            _fakeAsyncTestZoneSpec.unlockDatePatch();
+        }
+        _fakeAsyncTestZoneSpec = null;
+        // in node.js testing we may not have ProxyZoneSpec in which case there is nothing to reset.
+        ProxyZoneSpec && ProxyZoneSpec.assertPresent().resetDelegate();
+    }
+    /**
+    * Wraps a function to be executed in the fakeAsync zone:
+    * - microtasks are manually executed by calling `flushMicrotasks()`,
+    * - timers are synchronous, `tick()` simulates the asynchronous passage of time.
+    *
+    * If there are any pending timers at the end of the function, an exception will be thrown.
+    *
+    * Can be used to wrap inject() calls.
+    *
+    * ## Example
+    *
+    * {@example core/testing/ts/fake_async.ts region='basic'}
+    *
+    * @param fn
+    * @returns The function wrapped to be executed in the fakeAsync zone
+    *
+    * @experimental
+    */
+    function fakeAsync(fn) {
+        // Not using an arrow function to preserve context passed from call site
+        return function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            var proxyZoneSpec = ProxyZoneSpec.assertPresent();
+            if (Zone.current.get('FakeAsyncTestZoneSpec')) {
+                throw new Error('fakeAsync() calls can not be nested');
+            }
+            try {
+                // in case jasmine.clock init a fakeAsyncTestZoneSpec
+                if (!_fakeAsyncTestZoneSpec) {
+                    if (proxyZoneSpec.getDelegate() instanceof FakeAsyncTestZoneSpec) {
+                        throw new Error('fakeAsync() calls can not be nested');
+                    }
+                    _fakeAsyncTestZoneSpec = new FakeAsyncTestZoneSpec();
+                }
+                var res = void 0;
+                var lastProxyZoneSpec = proxyZoneSpec.getDelegate();
+                proxyZoneSpec.setDelegate(_fakeAsyncTestZoneSpec);
+                _fakeAsyncTestZoneSpec.lockDatePatch();
+                try {
+                    res = fn.apply(this, args);
+                    flushMicrotasks();
+                }
+                finally {
+                    proxyZoneSpec.setDelegate(lastProxyZoneSpec);
+                }
+                if (_fakeAsyncTestZoneSpec.pendingPeriodicTimers.length > 0) {
+                    throw new Error(_fakeAsyncTestZoneSpec.pendingPeriodicTimers.length + " " +
+                        "periodic timer(s) still in the queue.");
+                }
+                if (_fakeAsyncTestZoneSpec.pendingTimers.length > 0) {
+                    throw new Error(_fakeAsyncTestZoneSpec.pendingTimers.length + " timer(s) still in the queue.");
+                }
+                return res;
+            }
+            finally {
+                resetFakeAsyncZone();
+            }
+        };
+    }
+    function _getFakeAsyncZoneSpec() {
+        if (_fakeAsyncTestZoneSpec == null) {
+            _fakeAsyncTestZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+            if (_fakeAsyncTestZoneSpec == null) {
+                throw new Error('The code should be running in the fakeAsync zone to call this function');
+            }
+        }
+        return _fakeAsyncTestZoneSpec;
+    }
+    /**
+     * Simulates the asynchronous passage of time for the timers in the fakeAsync zone.
+     *
+     * The microtasks queue is drained at the very start of this function and after any timer callback
+     * has been executed.
+     *
+     * ## Example
+     *
+     * {@example core/testing/ts/fake_async.ts region='basic'}
+     *
+     * @experimental
+     */
+    function tick(millis) {
+        if (millis === void 0) { millis = 0; }
+        _getFakeAsyncZoneSpec().tick(millis);
+    }
+    /**
+     * Simulates the asynchronous passage of time for the timers in the fakeAsync zone by
+     * draining the macrotask queue until it is empty. The returned value is the milliseconds
+     * of time that would have been elapsed.
+     *
+     * @param maxTurns
+     * @returns The simulated time elapsed, in millis.
+     *
+     * @experimental
+     */
+    function flush(maxTurns) {
+        return _getFakeAsyncZoneSpec().flush(maxTurns);
+    }
+    /**
+     * Discard all remaining periodic tasks.
+     *
+     * @experimental
+     */
+    function discardPeriodicTasks() {
+        var zoneSpec = _getFakeAsyncZoneSpec();
+        var pendingTimers = zoneSpec.pendingPeriodicTimers;
+        zoneSpec.pendingPeriodicTimers.length = 0;
+    }
+    /**
+     * Flush any pending microtasks.
+     *
+     * @experimental
+     */
+    function flushMicrotasks() {
+        _getFakeAsyncZoneSpec().flushMicrotasks();
+    }
+    Zone[api.symbol('fakeAsyncTest')] =
+        { resetFakeAsyncZone: resetFakeAsyncZone, flushMicrotasks: flushMicrotasks, discardPeriodicTasks: discardPeriodicTasks, tick: tick, flush: flush, fakeAsync: fakeAsync };
+});
 
 /**
  * @license
diff --git a/dist/zone-testing-node-bundle.js b/dist/zone-testing-node-bundle.js
index 9e9605547..85de0f422 100644
--- a/dist/zone-testing-node-bundle.js
+++ b/dist/zone-testing-node-bundle.js
@@ -643,16 +643,6 @@ var Zone$1 = (function (global) {
     return global['Zone'] = Zone;
 })(typeof window !== 'undefined' && window || typeof self !== 'undefined' && self || global);
 
-var __values = (undefined && undefined.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-    if (m) return m.call(o);
-    return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-};
 Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
     var ObjectGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
     var ObjectDefineProperty = Object.defineProperty;
@@ -926,24 +916,14 @@ Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
             function onReject(error) {
                 promise && (promise = null || reject(error));
             }
-            try {
-                for (var values_1 = __values(values), values_1_1 = values_1.next(); !values_1_1.done; values_1_1 = values_1.next()) {
-                    var value = values_1_1.value;
-                    if (!isThenable(value)) {
-                        value = this.resolve(value);
-                    }
-                    value.then(onResolve, onReject);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (values_1_1 && !values_1_1.done && (_a = values_1.return)) _a.call(values_1);
+            for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
+                var value = values_1[_i];
+                if (!isThenable(value)) {
+                    value = this.resolve(value);
                 }
-                finally { if (e_1) throw e_1.error; }
+                value.then(onResolve, onReject);
             }
             return promise;
-            var e_1, _a;
         };
         ZoneAwarePromise.all = function (values) {
             var resolve;
@@ -954,33 +934,23 @@ Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
             });
             var count = 0;
             var resolvedValues = [];
-            try {
-                for (var values_2 = __values(values), values_2_1 = values_2.next(); !values_2_1.done; values_2_1 = values_2.next()) {
-                    var value = values_2_1.value;
-                    if (!isThenable(value)) {
-                        value = this.resolve(value);
+            for (var _i = 0, values_2 = values; _i < values_2.length; _i++) {
+                var value = values_2[_i];
+                if (!isThenable(value)) {
+                    value = this.resolve(value);
+                }
+                value.then((function (index) { return function (value) {
+                    resolvedValues[index] = value;
+                    count--;
+                    if (!count) {
+                        resolve(resolvedValues);
                     }
-                    value.then((function (index) { return function (value) {
-                        resolvedValues[index] = value;
-                        count--;
-                        if (!count) {
-                            resolve(resolvedValues);
-                        }
-                    }; })(count), reject);
-                    count++;
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (values_2_1 && !values_2_1.done && (_a = values_2.return)) _a.call(values_2);
-                }
-                finally { if (e_2) throw e_2.error; }
+                }; })(count), reject);
+                count++;
             }
             if (!count)
                 resolve(resolvedValues);
             return promise;
-            var e_2, _a;
         };
         ZoneAwarePromise.prototype.then = function (onFulfilled, onRejected) {
             var chainPromise = new this.constructor(null);
@@ -2537,6 +2507,7 @@ var ProxyZoneSpec = /** @class */ (function () {
         return this._delegateSpec;
     };
     ProxyZoneSpec.prototype.resetDelegate = function () {
+        var delegateSpec = this.getDelegate();
         this.setDelegate(this.defaultSpecDelegate);
     };
     ProxyZoneSpec.prototype.tryTriggerHasTask = function (parentZoneDelegate, currentZone, targetZone) {
@@ -2793,7 +2764,7 @@ Zone['SyncTestZoneSpec'] = SyncTestZoneSpec;
             return syncZone.run(describeBody, this, arguments);
         };
     }
-    function runInTestZone(testBody, queueRunner, done) {
+    function runInTestZone(testBody, applyThis, queueRunner, done) {
         var isClockInstalled = !!jasmine[symbol('clockInstalled')];
         var testProxyZoneSpec = queueRunner.testProxyZoneSpec;
         var testProxyZone = queueRunner.testProxyZone;
@@ -2804,18 +2775,23 @@ Zone['SyncTestZoneSpec'] = SyncTestZoneSpec;
                 var _fakeAsyncTestZoneSpec = new FakeAsyncTestZoneSpec();
                 lastDelegate = testProxyZoneSpec.getDelegate();
                 testProxyZoneSpec.setDelegate(_fakeAsyncTestZoneSpec);
+                _fakeAsyncTestZoneSpec.lockDatePatch();
             }
         }
         try {
             if (done) {
-                return testProxyZone.run(testBody, this, [done]);
+                return testProxyZone.run(testBody, applyThis, [done]);
             }
             else {
-                return testProxyZone.run(testBody, this);
+                return testProxyZone.run(testBody, applyThis);
             }
         }
         finally {
             if (isClockInstalled) {
+                var _fakeAsyncTestZoneSpec = testProxyZoneSpec.getDelegate();
+                if (_fakeAsyncTestZoneSpec) {
+                    _fakeAsyncTestZoneSpec.unlockDatePatch();
+                }
                 testProxyZoneSpec.setDelegate(lastDelegate);
             }
         }
@@ -2830,9 +2806,9 @@ Zone['SyncTestZoneSpec'] = SyncTestZoneSpec;
         // Note we have to make a function with correct number of arguments, otherwise jasmine will
         // think that all functions are sync or async.
         return (testBody && (testBody.length ? function (done) {
-            return runInTestZone(testBody, this.queueRunner, done);
+            return runInTestZone(testBody, this, this.queueRunner, done);
         } : function () {
-            return runInTestZone(testBody, this.queueRunner);
+            return runInTestZone(testBody, this, this.queueRunner);
         }));
     }
     var QueueRunner = jasmine.QueueRunner;
@@ -2947,13 +2923,11 @@ var AsyncTestZoneSpec = /** @class */ (function () {
         this.runZone = Zone.current;
         this.unresolvedChainedPromiseCount = 0;
         this.name = 'asyncTestZone for ' + namePrefix;
-        this.properties = {
-            'AsyncTestZoneSpec': this
-        };
+        this.properties = { 'AsyncTestZoneSpec': this };
     }
     AsyncTestZoneSpec.prototype._finishCallbackIfDone = function () {
         var _this = this;
-        if (!(this._pendingMicroTasks || this._pendingMacroTasks || this.unresolvedChainedPromiseCount !== 0)) {
+        if (!(this._pendingMicroTasks || this._pendingMacroTasks)) {
             // We do this because we would like to catch unhandled rejected promises.
             this.runZone.run(function () {
                 setTimeout(function () {
@@ -2981,7 +2955,7 @@ var AsyncTestZoneSpec = /** @class */ (function () {
             this._isSync = false;
         }
         if (task.type === 'microTask' && task.data && task.data instanceof Promise) {
-            // check whether the promise is a chained promise 
+            // check whether the promise is a chained promise
             if (task.data[AsyncTestZoneSpec.symbolParentUnresolved] === true) {
                 // chained promise is being scheduled
                 this.unresolvedChainedPromiseCount--;
@@ -3008,12 +2982,10 @@ var AsyncTestZoneSpec = /** @class */ (function () {
     // was scheduled/invoked/canceled.
     AsyncTestZoneSpec.prototype.onInvoke = function (parentZoneDelegate, currentZone, targetZone, delegate, applyThis, applyArgs, source) {
         try {
-            this.patchPromiseForTest();
             this._isSync = true;
             return parentZoneDelegate.invoke(targetZone, delegate, applyThis, applyArgs, source);
         }
         finally {
-            this.unPatchPromiseForTest();
             var afterTaskCounts = parentZoneDelegate._taskCounts;
             if (this._isSync) {
                 this._finishCallbackIfDone();
@@ -3228,6 +3200,7 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
             this._uncaughtPromiseErrors = Promise[Zone.__symbol__('uncaughtPromiseErrors')];
             this.pendingPeriodicTimers = [];
             this.pendingTimers = [];
+            this.patchDateLocked = false;
             this.properties = { 'FakeAsyncTestZoneSpec': this };
             this.name = 'fakeAsyncTestZone for ' + namePrefix;
             // in case user can't access the construction of FakeAsyncTestSpec
@@ -3343,12 +3316,21 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
                 return;
             }
             global['Date'] = FakeDate;
+            FakeDate.prototype = OriginalDate.prototype;
         };
         FakeAsyncTestZoneSpec.resetDate = function () {
             if (global['Date'] === FakeDate) {
                 global['Date'] = OriginalDate;
             }
         };
+        FakeAsyncTestZoneSpec.prototype.lockDatePatch = function () {
+            this.patchDateLocked = true;
+            FakeAsyncTestZoneSpec.patchDate();
+        };
+        FakeAsyncTestZoneSpec.prototype.unlockDatePatch = function () {
+            this.patchDateLocked = false;
+            FakeAsyncTestZoneSpec.resetDate();
+        };
         FakeAsyncTestZoneSpec.prototype.tick = function (millis, doTick) {
             if (millis === void 0) { millis = 0; }
             FakeAsyncTestZoneSpec.assertInZone();
@@ -3407,6 +3389,9 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
                         case 'setTimeout':
                             task.data['handleId'] = this._setTimeout(task.invoke, task.data['delay'], Array.prototype.slice.call(task.data['args'], 2));
                             break;
+                        case 'setImmediate':
+                            task.data['handleId'] = this._setTimeout(task.invoke, 0, Array.prototype.slice.call(task.data['args'], 1));
+                            break;
                         case 'setInterval':
                             task.data['handleId'] = this._setInterval(task.invoke, task.data['delay'], Array.prototype.slice.call(task.data['args'], 2));
                             break;
@@ -3475,7 +3460,9 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
                 return delegate.invoke(target, callback, applyThis, applyArgs, source);
             }
             finally {
-                FakeAsyncTestZoneSpec.resetDate();
+                if (!this.patchDateLocked) {
+                    FakeAsyncTestZoneSpec.resetDate();
+                }
             }
         };
         FakeAsyncTestZoneSpec.prototype.findMacroTaskOption = function (task) {
@@ -3574,10 +3561,91 @@ Zone.__load_patch('promisefortest', function (global, Zone, api) {
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-/**
- * Wraps a test function in an asynchronous test zone. The test will automatically
- * complete when all asynchronous calls within this zone are done.
- */
+Zone.__load_patch('asynctest', function (global, Zone, api) {
+    /**
+     * Wraps a test function in an asynchronous test zone. The test will automatically
+     * complete when all asynchronous calls within this zone are done.
+     */
+    Zone[api.symbol('asyncTest')] = function asyncTest(fn) {
+        // If we're running using the Jasmine test framework, adapt to call the 'done'
+        // function when asynchronous activity is finished.
+        if (global.jasmine) {
+            // Not using an arrow function to preserve context passed from call site
+            return function (done) {
+                if (!done) {
+                    // if we run beforeEach in @angular/core/testing/testing_internal then we get no done
+                    // fake it here and assume sync.
+                    done = function () { };
+                    done.fail = function (e) {
+                        throw e;
+                    };
+                }
+                runInTestZone(fn, this, done, function (err) {
+                    if (typeof err === 'string') {
+                        return done.fail(new Error(err));
+                    }
+                    else {
+                        done.fail(err);
+                    }
+                });
+            };
+        }
+        // Otherwise, return a promise which will resolve when asynchronous activity
+        // is finished. This will be correctly consumed by the Mocha framework with
+        // it('...', async(myFn)); or can be used in a custom framework.
+        // Not using an arrow function to preserve context passed from call site
+        return function () {
+            var _this = this;
+            return new Promise(function (finishCallback, failCallback) {
+                runInTestZone(fn, _this, finishCallback, failCallback);
+            });
+        };
+    };
+    function runInTestZone(fn, context, finishCallback, failCallback) {
+        var currentZone = Zone.current;
+        var AsyncTestZoneSpec = Zone['AsyncTestZoneSpec'];
+        if (AsyncTestZoneSpec === undefined) {
+            throw new Error('AsyncTestZoneSpec is needed for the async() test helper but could not be found. ' +
+                'Please make sure that your environment includes zone.js/dist/async-test.js');
+        }
+        var ProxyZoneSpec = Zone['ProxyZoneSpec'];
+        if (ProxyZoneSpec === undefined) {
+            throw new Error('ProxyZoneSpec is needed for the async() test helper but could not be found. ' +
+                'Please make sure that your environment includes zone.js/dist/proxy.js');
+        }
+        var proxyZoneSpec = ProxyZoneSpec.get();
+        ProxyZoneSpec.assertPresent();
+        // We need to create the AsyncTestZoneSpec outside the ProxyZone.
+        // If we do it in ProxyZone then we will get to infinite recursion.
+        var proxyZone = Zone.current.getZoneWith('ProxyZoneSpec');
+        var previousDelegate = proxyZoneSpec.getDelegate();
+        proxyZone.parent.run(function () {
+            var testZoneSpec = new AsyncTestZoneSpec(function () {
+                // Need to restore the original zone.
+                if (proxyZoneSpec.getDelegate() == testZoneSpec) {
+                    // Only reset the zone spec if it's
+                    // sill this one. Otherwise, assume
+                    // it's OK.
+                    proxyZoneSpec.setDelegate(previousDelegate);
+                }
+                currentZone.run(function () {
+                    finishCallback();
+                });
+            }, function (error) {
+                // Need to restore the original zone.
+                if (proxyZoneSpec.getDelegate() == testZoneSpec) {
+                    // Only reset the zone spec if it's sill this one. Otherwise, assume it's OK.
+                    proxyZoneSpec.setDelegate(previousDelegate);
+                }
+                currentZone.run(function () {
+                    failCallback(error);
+                });
+            }, 'test');
+            proxyZoneSpec.setDelegate(testZoneSpec);
+        });
+        return Zone.current.runGuarded(fn, context);
+    }
+});
 
 /**
  * @license
@@ -3586,69 +3654,145 @@ Zone.__load_patch('promisefortest', function (global, Zone, api) {
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var FakeAsyncTestZoneSpec = Zone && Zone['FakeAsyncTestZoneSpec'];
-var ProxyZoneSpec$1 = Zone && Zone['ProxyZoneSpec'];
-/**
- * Clears out the shared fake async zone for a test.
- * To be called in a global `beforeEach`.
- *
- * @experimental
- */
-
-/**
- * Wraps a function to be executed in the fakeAsync zone:
- * - microtasks are manually executed by calling `flushMicrotasks()`,
- * - timers are synchronous, `tick()` simulates the asynchronous passage of time.
- *
- * If there are any pending timers at the end of the function, an exception will be thrown.
- *
- * Can be used to wrap inject() calls.
- *
- * ## Example
- *
- * {@example core/testing/ts/fake_async.ts region='basic'}
- *
- * @param fn
- * @returns The function wrapped to be executed in the fakeAsync zone
- *
- * @experimental
- */
-
-/**
- * Simulates the asynchronous passage of time for the timers in the fakeAsync zone.
- *
- * The microtasks queue is drained at the very start of this function and after any timer callback
- * has been executed.
- *
- * ## Example
- *
- * {@example core/testing/ts/fake_async.ts region='basic'}
- *
- * @experimental
- */
-
-/**
- * Simulates the asynchronous passage of time for the timers in the fakeAsync zone by
- * draining the macrotask queue until it is empty. The returned value is the milliseconds
- * of time that would have been elapsed.
- *
- * @param maxTurns
- * @returns The simulated time elapsed, in millis.
- *
- * @experimental
- */
-
-/**
- * Discard all remaining periodic tasks.
- *
- * @experimental
- */
-
-/**
- * Flush any pending microtasks.
- *
- * @experimental
- */
+Zone.__load_patch('fakeasync', function (global, Zone, api) {
+    var FakeAsyncTestZoneSpec = Zone && Zone['FakeAsyncTestZoneSpec'];
+    var ProxyZoneSpec = Zone && Zone['ProxyZoneSpec'];
+    var _fakeAsyncTestZoneSpec = null;
+    /**
+     * Clears out the shared fake async zone for a test.
+     * To be called in a global `beforeEach`.
+     *
+     * @experimental
+     */
+    function resetFakeAsyncZone() {
+        if (_fakeAsyncTestZoneSpec) {
+            _fakeAsyncTestZoneSpec.unlockDatePatch();
+        }
+        _fakeAsyncTestZoneSpec = null;
+        // in node.js testing we may not have ProxyZoneSpec in which case there is nothing to reset.
+        ProxyZoneSpec && ProxyZoneSpec.assertPresent().resetDelegate();
+    }
+    /**
+    * Wraps a function to be executed in the fakeAsync zone:
+    * - microtasks are manually executed by calling `flushMicrotasks()`,
+    * - timers are synchronous, `tick()` simulates the asynchronous passage of time.
+    *
+    * If there are any pending timers at the end of the function, an exception will be thrown.
+    *
+    * Can be used to wrap inject() calls.
+    *
+    * ## Example
+    *
+    * {@example core/testing/ts/fake_async.ts region='basic'}
+    *
+    * @param fn
+    * @returns The function wrapped to be executed in the fakeAsync zone
+    *
+    * @experimental
+    */
+    function fakeAsync(fn) {
+        // Not using an arrow function to preserve context passed from call site
+        return function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            var proxyZoneSpec = ProxyZoneSpec.assertPresent();
+            if (Zone.current.get('FakeAsyncTestZoneSpec')) {
+                throw new Error('fakeAsync() calls can not be nested');
+            }
+            try {
+                // in case jasmine.clock init a fakeAsyncTestZoneSpec
+                if (!_fakeAsyncTestZoneSpec) {
+                    if (proxyZoneSpec.getDelegate() instanceof FakeAsyncTestZoneSpec) {
+                        throw new Error('fakeAsync() calls can not be nested');
+                    }
+                    _fakeAsyncTestZoneSpec = new FakeAsyncTestZoneSpec();
+                }
+                var res = void 0;
+                var lastProxyZoneSpec = proxyZoneSpec.getDelegate();
+                proxyZoneSpec.setDelegate(_fakeAsyncTestZoneSpec);
+                _fakeAsyncTestZoneSpec.lockDatePatch();
+                try {
+                    res = fn.apply(this, args);
+                    flushMicrotasks();
+                }
+                finally {
+                    proxyZoneSpec.setDelegate(lastProxyZoneSpec);
+                }
+                if (_fakeAsyncTestZoneSpec.pendingPeriodicTimers.length > 0) {
+                    throw new Error(_fakeAsyncTestZoneSpec.pendingPeriodicTimers.length + " " +
+                        "periodic timer(s) still in the queue.");
+                }
+                if (_fakeAsyncTestZoneSpec.pendingTimers.length > 0) {
+                    throw new Error(_fakeAsyncTestZoneSpec.pendingTimers.length + " timer(s) still in the queue.");
+                }
+                return res;
+            }
+            finally {
+                resetFakeAsyncZone();
+            }
+        };
+    }
+    function _getFakeAsyncZoneSpec() {
+        if (_fakeAsyncTestZoneSpec == null) {
+            _fakeAsyncTestZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+            if (_fakeAsyncTestZoneSpec == null) {
+                throw new Error('The code should be running in the fakeAsync zone to call this function');
+            }
+        }
+        return _fakeAsyncTestZoneSpec;
+    }
+    /**
+     * Simulates the asynchronous passage of time for the timers in the fakeAsync zone.
+     *
+     * The microtasks queue is drained at the very start of this function and after any timer callback
+     * has been executed.
+     *
+     * ## Example
+     *
+     * {@example core/testing/ts/fake_async.ts region='basic'}
+     *
+     * @experimental
+     */
+    function tick(millis) {
+        if (millis === void 0) { millis = 0; }
+        _getFakeAsyncZoneSpec().tick(millis);
+    }
+    /**
+     * Simulates the asynchronous passage of time for the timers in the fakeAsync zone by
+     * draining the macrotask queue until it is empty. The returned value is the milliseconds
+     * of time that would have been elapsed.
+     *
+     * @param maxTurns
+     * @returns The simulated time elapsed, in millis.
+     *
+     * @experimental
+     */
+    function flush(maxTurns) {
+        return _getFakeAsyncZoneSpec().flush(maxTurns);
+    }
+    /**
+     * Discard all remaining periodic tasks.
+     *
+     * @experimental
+     */
+    function discardPeriodicTasks() {
+        var zoneSpec = _getFakeAsyncZoneSpec();
+        var pendingTimers = zoneSpec.pendingPeriodicTimers;
+        zoneSpec.pendingPeriodicTimers.length = 0;
+    }
+    /**
+     * Flush any pending microtasks.
+     *
+     * @experimental
+     */
+    function flushMicrotasks() {
+        _getFakeAsyncZoneSpec().flushMicrotasks();
+    }
+    Zone[api.symbol('fakeAsyncTest')] =
+        { resetFakeAsyncZone: resetFakeAsyncZone, flushMicrotasks: flushMicrotasks, discardPeriodicTasks: discardPeriodicTasks, tick: tick, flush: flush, fakeAsync: fakeAsync };
+});
 
 /**
  * @license
diff --git a/dist/zone-testing.js b/dist/zone-testing.js
index 2e6d244d6..5ea69eca1 100644
--- a/dist/zone-testing.js
+++ b/dist/zone-testing.js
@@ -6,10 +6,10 @@
 * found in the LICENSE file at https://angular.io/license
 */
 (function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
-	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global.zone = {})));
-}(this, (function (exports) { 'use strict';
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(factory());
+}(this, (function () { 'use strict';
 
 /**
  * @license
@@ -223,6 +223,7 @@ var ProxyZoneSpec = /** @class */ (function () {
         return this._delegateSpec;
     };
     ProxyZoneSpec.prototype.resetDelegate = function () {
+        var delegateSpec = this.getDelegate();
         this.setDelegate(this.defaultSpecDelegate);
     };
     ProxyZoneSpec.prototype.tryTriggerHasTask = function (parentZoneDelegate, currentZone, targetZone) {
@@ -479,7 +480,7 @@ Zone['SyncTestZoneSpec'] = SyncTestZoneSpec;
             return syncZone.run(describeBody, this, arguments);
         };
     }
-    function runInTestZone(testBody, queueRunner, done) {
+    function runInTestZone(testBody, applyThis, queueRunner, done) {
         var isClockInstalled = !!jasmine[symbol('clockInstalled')];
         var testProxyZoneSpec = queueRunner.testProxyZoneSpec;
         var testProxyZone = queueRunner.testProxyZone;
@@ -490,18 +491,23 @@ Zone['SyncTestZoneSpec'] = SyncTestZoneSpec;
                 var _fakeAsyncTestZoneSpec = new FakeAsyncTestZoneSpec();
                 lastDelegate = testProxyZoneSpec.getDelegate();
                 testProxyZoneSpec.setDelegate(_fakeAsyncTestZoneSpec);
+                _fakeAsyncTestZoneSpec.lockDatePatch();
             }
         }
         try {
             if (done) {
-                return testProxyZone.run(testBody, this, [done]);
+                return testProxyZone.run(testBody, applyThis, [done]);
             }
             else {
-                return testProxyZone.run(testBody, this);
+                return testProxyZone.run(testBody, applyThis);
             }
         }
         finally {
             if (isClockInstalled) {
+                var _fakeAsyncTestZoneSpec = testProxyZoneSpec.getDelegate();
+                if (_fakeAsyncTestZoneSpec) {
+                    _fakeAsyncTestZoneSpec.unlockDatePatch();
+                }
                 testProxyZoneSpec.setDelegate(lastDelegate);
             }
         }
@@ -516,9 +522,9 @@ Zone['SyncTestZoneSpec'] = SyncTestZoneSpec;
         // Note we have to make a function with correct number of arguments, otherwise jasmine will
         // think that all functions are sync or async.
         return (testBody && (testBody.length ? function (done) {
-            return runInTestZone(testBody, this.queueRunner, done);
+            return runInTestZone(testBody, this, this.queueRunner, done);
         } : function () {
-            return runInTestZone(testBody, this.queueRunner);
+            return runInTestZone(testBody, this, this.queueRunner);
         }));
     }
     var QueueRunner = jasmine.QueueRunner;
@@ -633,13 +639,11 @@ var AsyncTestZoneSpec = /** @class */ (function () {
         this.runZone = Zone.current;
         this.unresolvedChainedPromiseCount = 0;
         this.name = 'asyncTestZone for ' + namePrefix;
-        this.properties = {
-            'AsyncTestZoneSpec': this
-        };
+        this.properties = { 'AsyncTestZoneSpec': this };
     }
     AsyncTestZoneSpec.prototype._finishCallbackIfDone = function () {
         var _this = this;
-        if (!(this._pendingMicroTasks || this._pendingMacroTasks || this.unresolvedChainedPromiseCount !== 0)) {
+        if (!(this._pendingMicroTasks || this._pendingMacroTasks)) {
             // We do this because we would like to catch unhandled rejected promises.
             this.runZone.run(function () {
                 setTimeout(function () {
@@ -667,7 +671,7 @@ var AsyncTestZoneSpec = /** @class */ (function () {
             this._isSync = false;
         }
         if (task.type === 'microTask' && task.data && task.data instanceof Promise) {
-            // check whether the promise is a chained promise 
+            // check whether the promise is a chained promise
             if (task.data[AsyncTestZoneSpec.symbolParentUnresolved] === true) {
                 // chained promise is being scheduled
                 this.unresolvedChainedPromiseCount--;
@@ -694,12 +698,10 @@ var AsyncTestZoneSpec = /** @class */ (function () {
     // was scheduled/invoked/canceled.
     AsyncTestZoneSpec.prototype.onInvoke = function (parentZoneDelegate, currentZone, targetZone, delegate, applyThis, applyArgs, source) {
         try {
-            this.patchPromiseForTest();
             this._isSync = true;
             return parentZoneDelegate.invoke(targetZone, delegate, applyThis, applyArgs, source);
         }
         finally {
-            this.unPatchPromiseForTest();
             var afterTaskCounts = parentZoneDelegate._taskCounts;
             if (this._isSync) {
                 this._finishCallbackIfDone();
@@ -914,6 +916,7 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
             this._uncaughtPromiseErrors = Promise[Zone.__symbol__('uncaughtPromiseErrors')];
             this.pendingPeriodicTimers = [];
             this.pendingTimers = [];
+            this.patchDateLocked = false;
             this.properties = { 'FakeAsyncTestZoneSpec': this };
             this.name = 'fakeAsyncTestZone for ' + namePrefix;
             // in case user can't access the construction of FakeAsyncTestSpec
@@ -1029,12 +1032,21 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
                 return;
             }
             global['Date'] = FakeDate;
+            FakeDate.prototype = OriginalDate.prototype;
         };
         FakeAsyncTestZoneSpec.resetDate = function () {
             if (global['Date'] === FakeDate) {
                 global['Date'] = OriginalDate;
             }
         };
+        FakeAsyncTestZoneSpec.prototype.lockDatePatch = function () {
+            this.patchDateLocked = true;
+            FakeAsyncTestZoneSpec.patchDate();
+        };
+        FakeAsyncTestZoneSpec.prototype.unlockDatePatch = function () {
+            this.patchDateLocked = false;
+            FakeAsyncTestZoneSpec.resetDate();
+        };
         FakeAsyncTestZoneSpec.prototype.tick = function (millis, doTick) {
             if (millis === void 0) { millis = 0; }
             FakeAsyncTestZoneSpec.assertInZone();
@@ -1093,6 +1105,9 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
                         case 'setTimeout':
                             task.data['handleId'] = this._setTimeout(task.invoke, task.data['delay'], Array.prototype.slice.call(task.data['args'], 2));
                             break;
+                        case 'setImmediate':
+                            task.data['handleId'] = this._setTimeout(task.invoke, 0, Array.prototype.slice.call(task.data['args'], 1));
+                            break;
                         case 'setInterval':
                             task.data['handleId'] = this._setInterval(task.invoke, task.data['delay'], Array.prototype.slice.call(task.data['args'], 2));
                             break;
@@ -1161,7 +1176,9 @@ Zone['AsyncTestZoneSpec'] = AsyncTestZoneSpec;
                 return delegate.invoke(target, callback, applyThis, applyArgs, source);
             }
             finally {
-                FakeAsyncTestZoneSpec.resetDate();
+                if (!this.patchDateLocked) {
+                    FakeAsyncTestZoneSpec.resetDate();
+                }
             }
         };
         FakeAsyncTestZoneSpec.prototype.findMacroTaskOption = function (task) {
@@ -1260,90 +1277,91 @@ Zone.__load_patch('promisefortest', function (global, Zone, api) {
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var _global = typeof window !== 'undefined' && window || typeof self !== 'undefined' && self || global;
-/**
- * Wraps a test function in an asynchronous test zone. The test will automatically
- * complete when all asynchronous calls within this zone are done.
- */
-function asyncTest(fn) {
-    // If we're running using the Jasmine test framework, adapt to call the 'done'
-    // function when asynchronous activity is finished.
-    if (_global.jasmine) {
-        // Not using an arrow function to preserve context passed from call site
-        return function (done) {
-            if (!done) {
-                // if we run beforeEach in @angular/core/testing/testing_internal then we get no done
-                // fake it here and assume sync.
-                done = function () { };
-                done.fail = function (e) {
-                    throw e;
-                };
-            }
-            runInTestZone(fn, this, done, function (err) {
-                if (typeof err === 'string') {
-                    return done.fail(new Error(err));
-                }
-                else {
-                    done.fail(err);
+Zone.__load_patch('asynctest', function (global, Zone, api) {
+    /**
+     * Wraps a test function in an asynchronous test zone. The test will automatically
+     * complete when all asynchronous calls within this zone are done.
+     */
+    Zone[api.symbol('asyncTest')] = function asyncTest(fn) {
+        // If we're running using the Jasmine test framework, adapt to call the 'done'
+        // function when asynchronous activity is finished.
+        if (global.jasmine) {
+            // Not using an arrow function to preserve context passed from call site
+            return function (done) {
+                if (!done) {
+                    // if we run beforeEach in @angular/core/testing/testing_internal then we get no done
+                    // fake it here and assume sync.
+                    done = function () { };
+                    done.fail = function (e) {
+                        throw e;
+                    };
                 }
+                runInTestZone(fn, this, done, function (err) {
+                    if (typeof err === 'string') {
+                        return done.fail(new Error(err));
+                    }
+                    else {
+                        done.fail(err);
+                    }
+                });
+            };
+        }
+        // Otherwise, return a promise which will resolve when asynchronous activity
+        // is finished. This will be correctly consumed by the Mocha framework with
+        // it('...', async(myFn)); or can be used in a custom framework.
+        // Not using an arrow function to preserve context passed from call site
+        return function () {
+            var _this = this;
+            return new Promise(function (finishCallback, failCallback) {
+                runInTestZone(fn, _this, finishCallback, failCallback);
             });
         };
-    }
-    // Otherwise, return a promise which will resolve when asynchronous activity
-    // is finished. This will be correctly consumed by the Mocha framework with
-    // it('...', async(myFn)); or can be used in a custom framework.
-    // Not using an arrow function to preserve context passed from call site
-    return function () {
-        var _this = this;
-        return new Promise(function (finishCallback, failCallback) {
-            runInTestZone(fn, _this, finishCallback, failCallback);
-        });
     };
-}
-function runInTestZone(fn, context, finishCallback, failCallback) {
-    var currentZone = Zone.current;
-    var AsyncTestZoneSpec = Zone['AsyncTestZoneSpec'];
-    if (AsyncTestZoneSpec === undefined) {
-        throw new Error('AsyncTestZoneSpec is needed for the async() test helper but could not be found. ' +
-            'Please make sure that your environment includes zone.js/dist/async-test.js');
-    }
-    var ProxyZoneSpec = Zone['ProxyZoneSpec'];
-    if (ProxyZoneSpec === undefined) {
-        throw new Error('ProxyZoneSpec is needed for the async() test helper but could not be found. ' +
-            'Please make sure that your environment includes zone.js/dist/proxy.js');
+    function runInTestZone(fn, context, finishCallback, failCallback) {
+        var currentZone = Zone.current;
+        var AsyncTestZoneSpec = Zone['AsyncTestZoneSpec'];
+        if (AsyncTestZoneSpec === undefined) {
+            throw new Error('AsyncTestZoneSpec is needed for the async() test helper but could not be found. ' +
+                'Please make sure that your environment includes zone.js/dist/async-test.js');
+        }
+        var ProxyZoneSpec = Zone['ProxyZoneSpec'];
+        if (ProxyZoneSpec === undefined) {
+            throw new Error('ProxyZoneSpec is needed for the async() test helper but could not be found. ' +
+                'Please make sure that your environment includes zone.js/dist/proxy.js');
+        }
+        var proxyZoneSpec = ProxyZoneSpec.get();
+        ProxyZoneSpec.assertPresent();
+        // We need to create the AsyncTestZoneSpec outside the ProxyZone.
+        // If we do it in ProxyZone then we will get to infinite recursion.
+        var proxyZone = Zone.current.getZoneWith('ProxyZoneSpec');
+        var previousDelegate = proxyZoneSpec.getDelegate();
+        proxyZone.parent.run(function () {
+            var testZoneSpec = new AsyncTestZoneSpec(function () {
+                // Need to restore the original zone.
+                if (proxyZoneSpec.getDelegate() == testZoneSpec) {
+                    // Only reset the zone spec if it's
+                    // sill this one. Otherwise, assume
+                    // it's OK.
+                    proxyZoneSpec.setDelegate(previousDelegate);
+                }
+                currentZone.run(function () {
+                    finishCallback();
+                });
+            }, function (error) {
+                // Need to restore the original zone.
+                if (proxyZoneSpec.getDelegate() == testZoneSpec) {
+                    // Only reset the zone spec if it's sill this one. Otherwise, assume it's OK.
+                    proxyZoneSpec.setDelegate(previousDelegate);
+                }
+                currentZone.run(function () {
+                    failCallback(error);
+                });
+            }, 'test');
+            proxyZoneSpec.setDelegate(testZoneSpec);
+        });
+        return Zone.current.runGuarded(fn, context);
     }
-    var proxyZoneSpec = ProxyZoneSpec.get();
-    ProxyZoneSpec.assertPresent();
-    // We need to create the AsyncTestZoneSpec outside the ProxyZone.
-    // If we do it in ProxyZone then we will get to infinite recursion.
-    var proxyZone = Zone.current.getZoneWith('ProxyZoneSpec');
-    var previousDelegate = proxyZoneSpec.getDelegate();
-    proxyZone.parent.run(function () {
-        var testZoneSpec = new AsyncTestZoneSpec(function () {
-            // Need to restore the original zone.
-            if (proxyZoneSpec.getDelegate() == testZoneSpec) {
-                // Only reset the zone spec if it's
-                // sill this one. Otherwise, assume
-                // it's OK.
-                proxyZoneSpec.setDelegate(previousDelegate);
-            }
-            currentZone.run(function () {
-                finishCallback();
-            });
-        }, function (error) {
-            // Need to restore the original zone.
-            if (proxyZoneSpec.getDelegate() == testZoneSpec) {
-                // Only reset the zone spec if it's sill this one. Otherwise, assume it's OK.
-                proxyZoneSpec.setDelegate(previousDelegate);
-            }
-            currentZone.run(function () {
-                failCallback(error);
-            });
-        }, 'test');
-        proxyZoneSpec.setDelegate(testZoneSpec);
-    });
-    return Zone.current.runGuarded(fn, context);
-}
+});
 
 /**
  * @license
@@ -1352,136 +1370,145 @@ function runInTestZone(fn, context, finishCallback, failCallback) {
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var FakeAsyncTestZoneSpec = Zone && Zone['FakeAsyncTestZoneSpec'];
-var ProxyZoneSpec$1 = Zone && Zone['ProxyZoneSpec'];
-var _fakeAsyncTestZoneSpec = null;
-/**
- * Clears out the shared fake async zone for a test.
- * To be called in a global `beforeEach`.
- *
- * @experimental
- */
-function resetFakeAsyncZone() {
-    _fakeAsyncTestZoneSpec = null;
-    // in node.js testing we may not have ProxyZoneSpec in which case there is nothing to reset.
-    ProxyZoneSpec$1 && ProxyZoneSpec$1.assertPresent().resetDelegate();
-}
-var _inFakeAsyncCall = false;
-/**
- * Wraps a function to be executed in the fakeAsync zone:
- * - microtasks are manually executed by calling `flushMicrotasks()`,
- * - timers are synchronous, `tick()` simulates the asynchronous passage of time.
- *
- * If there are any pending timers at the end of the function, an exception will be thrown.
- *
- * Can be used to wrap inject() calls.
- *
- * ## Example
- *
- * {@example core/testing/ts/fake_async.ts region='basic'}
- *
- * @param fn
- * @returns The function wrapped to be executed in the fakeAsync zone
- *
- * @experimental
- */
-function fakeAsync(fn) {
-    // Not using an arrow function to preserve context passed from call site
-    return function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var proxyZoneSpec = ProxyZoneSpec$1.assertPresent();
-        if (_inFakeAsyncCall) {
-            throw new Error('fakeAsync() calls can not be nested');
+Zone.__load_patch('fakeasync', function (global, Zone, api) {
+    var FakeAsyncTestZoneSpec = Zone && Zone['FakeAsyncTestZoneSpec'];
+    var ProxyZoneSpec = Zone && Zone['ProxyZoneSpec'];
+    var _fakeAsyncTestZoneSpec = null;
+    /**
+     * Clears out the shared fake async zone for a test.
+     * To be called in a global `beforeEach`.
+     *
+     * @experimental
+     */
+    function resetFakeAsyncZone() {
+        if (_fakeAsyncTestZoneSpec) {
+            _fakeAsyncTestZoneSpec.unlockDatePatch();
         }
-        _inFakeAsyncCall = true;
-        try {
-            if (!_fakeAsyncTestZoneSpec) {
-                if (proxyZoneSpec.getDelegate() instanceof FakeAsyncTestZoneSpec) {
-                    throw new Error('fakeAsync() calls can not be nested');
-                }
-                _fakeAsyncTestZoneSpec = new FakeAsyncTestZoneSpec();
+        _fakeAsyncTestZoneSpec = null;
+        // in node.js testing we may not have ProxyZoneSpec in which case there is nothing to reset.
+        ProxyZoneSpec && ProxyZoneSpec.assertPresent().resetDelegate();
+    }
+    /**
+    * Wraps a function to be executed in the fakeAsync zone:
+    * - microtasks are manually executed by calling `flushMicrotasks()`,
+    * - timers are synchronous, `tick()` simulates the asynchronous passage of time.
+    *
+    * If there are any pending timers at the end of the function, an exception will be thrown.
+    *
+    * Can be used to wrap inject() calls.
+    *
+    * ## Example
+    *
+    * {@example core/testing/ts/fake_async.ts region='basic'}
+    *
+    * @param fn
+    * @returns The function wrapped to be executed in the fakeAsync zone
+    *
+    * @experimental
+    */
+    function fakeAsync(fn) {
+        // Not using an arrow function to preserve context passed from call site
+        return function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            var proxyZoneSpec = ProxyZoneSpec.assertPresent();
+            if (Zone.current.get('FakeAsyncTestZoneSpec')) {
+                throw new Error('fakeAsync() calls can not be nested');
             }
-            var res = void 0;
-            var lastProxyZoneSpec = proxyZoneSpec.getDelegate();
-            proxyZoneSpec.setDelegate(_fakeAsyncTestZoneSpec);
             try {
-                res = fn.apply(this, args);
-                flushMicrotasks();
+                // in case jasmine.clock init a fakeAsyncTestZoneSpec
+                if (!_fakeAsyncTestZoneSpec) {
+                    if (proxyZoneSpec.getDelegate() instanceof FakeAsyncTestZoneSpec) {
+                        throw new Error('fakeAsync() calls can not be nested');
+                    }
+                    _fakeAsyncTestZoneSpec = new FakeAsyncTestZoneSpec();
+                }
+                var res = void 0;
+                var lastProxyZoneSpec = proxyZoneSpec.getDelegate();
+                proxyZoneSpec.setDelegate(_fakeAsyncTestZoneSpec);
+                _fakeAsyncTestZoneSpec.lockDatePatch();
+                try {
+                    res = fn.apply(this, args);
+                    flushMicrotasks();
+                }
+                finally {
+                    proxyZoneSpec.setDelegate(lastProxyZoneSpec);
+                }
+                if (_fakeAsyncTestZoneSpec.pendingPeriodicTimers.length > 0) {
+                    throw new Error(_fakeAsyncTestZoneSpec.pendingPeriodicTimers.length + " " +
+                        "periodic timer(s) still in the queue.");
+                }
+                if (_fakeAsyncTestZoneSpec.pendingTimers.length > 0) {
+                    throw new Error(_fakeAsyncTestZoneSpec.pendingTimers.length + " timer(s) still in the queue.");
+                }
+                return res;
             }
             finally {
-                proxyZoneSpec.setDelegate(lastProxyZoneSpec);
-            }
-            if (_fakeAsyncTestZoneSpec.pendingPeriodicTimers.length > 0) {
-                throw new Error(_fakeAsyncTestZoneSpec.pendingPeriodicTimers.length + " " +
-                    "periodic timer(s) still in the queue.");
+                resetFakeAsyncZone();
             }
-            if (_fakeAsyncTestZoneSpec.pendingTimers.length > 0) {
-                throw new Error(_fakeAsyncTestZoneSpec.pendingTimers.length + " timer(s) still in the queue.");
+        };
+    }
+    function _getFakeAsyncZoneSpec() {
+        if (_fakeAsyncTestZoneSpec == null) {
+            _fakeAsyncTestZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec');
+            if (_fakeAsyncTestZoneSpec == null) {
+                throw new Error('The code should be running in the fakeAsync zone to call this function');
             }
-            return res;
-        }
-        finally {
-            _inFakeAsyncCall = false;
-            resetFakeAsyncZone();
         }
-    };
-}
-function _getFakeAsyncZoneSpec() {
-    if (_fakeAsyncTestZoneSpec == null) {
-        throw new Error('The code should be running in the fakeAsync zone to call this function');
+        return _fakeAsyncTestZoneSpec;
     }
-    return _fakeAsyncTestZoneSpec;
-}
-/**
- * Simulates the asynchronous passage of time for the timers in the fakeAsync zone.
- *
- * The microtasks queue is drained at the very start of this function and after any timer callback
- * has been executed.
- *
- * ## Example
- *
- * {@example core/testing/ts/fake_async.ts region='basic'}
- *
- * @experimental
- */
-function tick(millis) {
-    if (millis === void 0) { millis = 0; }
-    _getFakeAsyncZoneSpec().tick(millis);
-}
-/**
- * Simulates the asynchronous passage of time for the timers in the fakeAsync zone by
- * draining the macrotask queue until it is empty. The returned value is the milliseconds
- * of time that would have been elapsed.
- *
- * @param maxTurns
- * @returns The simulated time elapsed, in millis.
- *
- * @experimental
- */
-function flush(maxTurns) {
-    return _getFakeAsyncZoneSpec().flush(maxTurns);
-}
-/**
- * Discard all remaining periodic tasks.
- *
- * @experimental
- */
-function discardPeriodicTasks() {
-    var zoneSpec = _getFakeAsyncZoneSpec();
-    var pendingTimers = zoneSpec.pendingPeriodicTimers;
-    zoneSpec.pendingPeriodicTimers.length = 0;
-}
-/**
- * Flush any pending microtasks.
- *
- * @experimental
- */
-function flushMicrotasks() {
-    _getFakeAsyncZoneSpec().flushMicrotasks();
-}
+    /**
+     * Simulates the asynchronous passage of time for the timers in the fakeAsync zone.
+     *
+     * The microtasks queue is drained at the very start of this function and after any timer callback
+     * has been executed.
+     *
+     * ## Example
+     *
+     * {@example core/testing/ts/fake_async.ts region='basic'}
+     *
+     * @experimental
+     */
+    function tick(millis) {
+        if (millis === void 0) { millis = 0; }
+        _getFakeAsyncZoneSpec().tick(millis);
+    }
+    /**
+     * Simulates the asynchronous passage of time for the timers in the fakeAsync zone by
+     * draining the macrotask queue until it is empty. The returned value is the milliseconds
+     * of time that would have been elapsed.
+     *
+     * @param maxTurns
+     * @returns The simulated time elapsed, in millis.
+     *
+     * @experimental
+     */
+    function flush(maxTurns) {
+        return _getFakeAsyncZoneSpec().flush(maxTurns);
+    }
+    /**
+     * Discard all remaining periodic tasks.
+     *
+     * @experimental
+     */
+    function discardPeriodicTasks() {
+        var zoneSpec = _getFakeAsyncZoneSpec();
+        var pendingTimers = zoneSpec.pendingPeriodicTimers;
+        zoneSpec.pendingPeriodicTimers.length = 0;
+    }
+    /**
+     * Flush any pending microtasks.
+     *
+     * @experimental
+     */
+    function flushMicrotasks() {
+        _getFakeAsyncZoneSpec().flushMicrotasks();
+    }
+    Zone[api.symbol('fakeAsyncTest')] =
+        { resetFakeAsyncZone: resetFakeAsyncZone, flushMicrotasks: flushMicrotasks, discardPeriodicTasks: discardPeriodicTasks, tick: tick, flush: flush, fakeAsync: fakeAsync };
+});
 
 /**
  * @license
@@ -1492,14 +1519,4 @@ function flushMicrotasks() {
  */
 // load test related files into bundle in correct order
 
-exports.asyncTest = asyncTest;
-exports.resetFakeAsyncZone = resetFakeAsyncZone;
-exports.fakeAsync = fakeAsync;
-exports.tick = tick;
-exports.flush = flush;
-exports.discardPeriodicTasks = discardPeriodicTasks;
-exports.flushMicrotasks = flushMicrotasks;
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
 })));
diff --git a/dist/zone.js b/dist/zone.js
index 2cd0134c8..e15c127cf 100644
--- a/dist/zone.js
+++ b/dist/zone.js
@@ -643,16 +643,6 @@ var Zone$1 = (function (global) {
     return global['Zone'] = Zone;
 })(typeof window !== 'undefined' && window || typeof self !== 'undefined' && self || global);
 
-var __values = (undefined && undefined.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-    if (m) return m.call(o);
-    return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-};
 Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
     var ObjectGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
     var ObjectDefineProperty = Object.defineProperty;
@@ -926,24 +916,14 @@ Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
             function onReject(error) {
                 promise && (promise = null || reject(error));
             }
-            try {
-                for (var values_1 = __values(values), values_1_1 = values_1.next(); !values_1_1.done; values_1_1 = values_1.next()) {
-                    var value = values_1_1.value;
-                    if (!isThenable(value)) {
-                        value = this.resolve(value);
-                    }
-                    value.then(onResolve, onReject);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (values_1_1 && !values_1_1.done && (_a = values_1.return)) _a.call(values_1);
+            for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
+                var value = values_1[_i];
+                if (!isThenable(value)) {
+                    value = this.resolve(value);
                 }
-                finally { if (e_1) throw e_1.error; }
+                value.then(onResolve, onReject);
             }
             return promise;
-            var e_1, _a;
         };
         ZoneAwarePromise.all = function (values) {
             var resolve;
@@ -954,33 +934,23 @@ Zone.__load_patch('ZoneAwarePromise', function (global, Zone, api) {
             });
             var count = 0;
             var resolvedValues = [];
-            try {
-                for (var values_2 = __values(values), values_2_1 = values_2.next(); !values_2_1.done; values_2_1 = values_2.next()) {
-                    var value = values_2_1.value;
-                    if (!isThenable(value)) {
-                        value = this.resolve(value);
+            for (var _i = 0, values_2 = values; _i < values_2.length; _i++) {
+                var value = values_2[_i];
+                if (!isThenable(value)) {
+                    value = this.resolve(value);
+                }
+                value.then((function (index) { return function (value) {
+                    resolvedValues[index] = value;
+                    count--;
+                    if (!count) {
+                        resolve(resolvedValues);
                     }
-                    value.then((function (index) { return function (value) {
-                        resolvedValues[index] = value;
-                        count--;
-                        if (!count) {
-                            resolve(resolvedValues);
-                        }
-                    }; })(count), reject);
-                    count++;
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (values_2_1 && !values_2_1.done && (_a = values_2.return)) _a.call(values_2);
-                }
-                finally { if (e_2) throw e_2.error; }
+                }; })(count), reject);
+                count++;
             }
             if (!count)
                 resolve(resolvedValues);
             return promise;
-            var e_2, _a;
         };
         ZoneAwarePromise.prototype.then = function (onFulfilled, onRejected) {
             var chainPromise = new this.constructor(null);
diff --git a/dist/zone.min.js b/dist/zone.min.js
index 7d809e8d1..b95e78412 100644
--- a/dist/zone.min.js
+++ b/dist/zone.min.js
@@ -1,2 +1,2 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&&define.amd?define(t):t()}(this,function(){"use strict";function e(e,t){return Zone.current.wrap(e,t)}function t(e,t,n,r,o){return Zone.current.scheduleMacroTask(e,t,n,r,o)}function n(t,n){for(var r=t.length-1;r>=0;r--)"function"==typeof t[r]&&(t[r]=e(t[r],n+"_"+r));return t}function r(e,t){for(var r=e.constructor.name,a=function(a){var i=t[a],s=e[i];if(s){var c=j(e,i);if(!o(c))return"continue";e[i]=function(e){var t=function(){return e.apply(this,n(arguments,r+"."+i))};return l(t,e),t}(s)}},i=0;i<t.length;i++)a(i)}function o(e){return!e||e.writable!==!1&&!("function"==typeof e.get&&"undefined"==typeof e.set)}function a(e,t,n){var r=j(e,t);if(!r&&n){var o=j(n,t);o&&(r={enumerable:!0,configurable:!0})}if(r&&r.configurable){delete r.writable,delete r.value;var a=r.get,i=r.set,s=t.substr(2),c=$[s];c||(c=$[s]=N("ON_PROPERTY"+s)),r.set=function(t){var n=this;if(n||e!==G||(n=G),n){var r=n[c];r&&n.removeEventListener(s,ee),i&&i.apply(n,V),"function"==typeof t?(n[c]=t,n.addEventListener(s,ee,!1)):n[c]=null}},r.get=function(){var n=this;if(n||e!==G||(n=G),!n)return null;var o=n[c];if(o)return o;if(a){var i=a&&a.call(this);if(i)return r.set.call(this,i),"function"==typeof n[U]&&n.removeAttribute(t),i}return null},C(e,t,r)}}function i(e,t,n){if(t)for(var r=0;r<t.length;r++)a(e,"on"+t[r],n);else{var o=[];for(var i in e)"on"==i.substr(0,2)&&o.push(i);for(var s=0;s<o.length;s++)a(e,o[s],n)}}function s(t){var r=G[t];if(r){G[N(t)]=r,G[t]=function(){var e=n(arguments,t);switch(e.length){case 0:this[te]=new r;break;case 1:this[te]=new r(e[0]);break;case 2:this[te]=new r(e[0],e[1]);break;case 3:this[te]=new r(e[0],e[1],e[2]);break;case 4:this[te]=new r(e[0],e[1],e[2],e[3]);break;default:throw new Error("Arg list too long.")}},l(G[t],r);var o,a=new r(function(){});for(o in a)"XMLHttpRequest"===t&&"responseBlob"===o||!function(n){"function"==typeof a[n]?G[t].prototype[n]=function(){return this[te][n].apply(this[te],arguments)}:C(G[t].prototype,n,{set:function(r){"function"==typeof r?(this[te][n]=e(r,t+"."+n),l(this[te][n],r)):this[te][n]=r},get:function(){return this[te][n]}})}(o);for(o in r)"prototype"!==o&&r.hasOwnProperty(o)&&(G[t][o]=r[o])}}function c(e,t,n){for(var r=e;r&&!r.hasOwnProperty(t);)r=I(r);!r&&e[t]&&(r=e);var a,i=N(t);if(r&&!(a=r[i])){a=r[i]=r[t];var s=r&&j(r,t);if(o(s)){var c=n(a,i,t);r[t]=function(){return c(this,arguments)},l(r[t],a)}}return a}function u(e,n,r){function o(e){var t=e.data;return t.args[t.cbIdx]=function(){e.invoke.apply(this,arguments)},a.apply(t.target,t.args),e}var a=null;a=c(e,n,function(e){return function(n,a){var i=r(n,a);return i.cbIdx>=0&&"function"==typeof a[i.cbIdx]?t(i.name,a[i.cbIdx],i,o,null):e.apply(n,a)}})}function l(e,t){e[N("OriginalDelegate")]=t}function f(){if(ne)return re;ne=!0;try{var e=X.navigator.userAgent;return e.indexOf("MSIE ")===-1&&e.indexOf("Trident/")===-1&&e.indexOf("Edge/")===-1||(re=!0),re}catch(t){}}function p(e,t,n){function r(t,n){if(!t)return!1;var r=!0;n&&void 0!==n.useG&&(r=n.useG);var d=n&&n.vh,y=!0;n&&void 0!==n.chkDup&&(y=n.chkDup);var m=!1;n&&void 0!==n.rt&&(m=n.rt);for(var k=t;k&&!k.hasOwnProperty(o);)k=I(k);if(!k&&t[o]&&(k=t),!k)return!1;if(k[c])return!1;var _,b={},T=k[c]=k[o],w=k[N(a)]=k[a],E=k[N(i)]=k[i],S=k[N(s)]=k[s];n&&n.prepend&&(_=k[N(n.prepend)]=k[n.prepend]);var D=function(){if(!b.isExisting)return T.call(b.target,b.eventName,b.capture?g:v,b.options)},Z=function(e){if(!e.isRemoved){var t=ae[e.eventName],n=void 0;t&&(n=t[e.capture?q:A]);var r=n&&e.target[n];if(r)for(var o=0;o<r.length;o++){var a=r[o];if(a===e){r.splice(o,1),e.isRemoved=!0,0===r.length&&(e.allRemoved=!0,e.target[n]=null);break}}}if(e.allRemoved)return w.call(e.target,e.eventName,e.capture?g:v,e.options)},z=function(e){return T.call(b.target,b.eventName,e.invoke,b.options)},O=function(e){return _.call(b.target,b.eventName,e.invoke,b.options)},P=function(e){return w.call(e.target,e.eventName,e.invoke,e.options)},j=r?D:z,C=r?Z:P,L=function(e,t){var n=typeof t;return"function"===n&&e.callback===t||"object"===n&&e.originalDelegate===t},M=n&&n.diff?n.diff:L,R=Zone[Zone.__symbol__("BLACK_LISTED_EVENTS")],x=function(t,n,o,a,i,s){return void 0===i&&(i=!1),void 0===s&&(s=!1),function(){var c=this||e,u=arguments[1];if(!u)return t.apply(this,arguments);var l=!1;if("function"!=typeof u){if(!u.handleEvent)return t.apply(this,arguments);l=!0}if(!d||d(t,u,c,arguments)){var f=arguments[0],p=arguments[2];if(R)for(var h=0;h<R.length;h++)if(f===R[h])return t.apply(this,arguments);var v,g=!1;void 0===p?v=!1:p===!0?v=!0:p===!1?v=!1:(v=!!p&&!!p.capture,g=!!p&&!!p.once);var m,k=Zone.current,_=ae[f];if(_)m=_[v?q:A];else{var T=f+A,w=f+q,E=B+T,S=B+w;ae[f]={},ae[f][A]=E,ae[f][q]=S,m=v?S:E}var D=c[m],Z=!1;if(D){if(Z=!0,y)for(var h=0;h<D.length;h++)if(M(D[h],u))return}else D=c[m]=[];var z,O=c.constructor.name,P=ie[O];P&&(z=P[f]),z||(z=O+n+f),b.options=p,g&&(b.options.once=!1),b.target=c,b.capture=v,b.eventName=f,b.isExisting=Z;var j=r?oe:null;j&&(j.taskData=b);var C=k.scheduleEventTask(z,u,j,o,a);return b.target=null,j&&(j.taskData=null),g&&(p.once=!0),C.options=p,C.target=c,C.capture=v,C.eventName=f,l&&(C.originalDelegate=u),s?D.unshift(C):D.push(C),i?c:void 0}}};return k[o]=x(T,u,j,C,m),_&&(k[f]=x(_,p,O,C,m,!0)),k[a]=function(){var t,n=this||e,r=arguments[0],o=arguments[2];t=void 0!==o&&(o===!0||o!==!1&&(!!o&&!!o.capture));var a=arguments[1];if(!a)return w.apply(this,arguments);if(!d||d(w,a,n,arguments)){var i,s=ae[r];s&&(i=s[t?q:A]);var c=i&&n[i];if(c)for(var u=0;u<c.length;u++){var l=c[u];if(M(l,a)){if(c.splice(u,1),l.isRemoved=!0,0===c.length&&(l.allRemoved=!0,n[i]=null),l.zone.cancelTask(l),m)return n;return}}return w.apply(this,arguments)}},k[i]=function(){for(var t=this||e,n=arguments[0],r=[],o=h(t,n),a=0;a<o.length;a++){var i=o[a],s=i.originalDelegate?i.originalDelegate:i.callback;r.push(s)}return r},k[s]=function(){var t=this||e,n=arguments[0];if(n){var r=ae[n];if(r){var o=r[A],i=r[q],c=t[o],u=t[i];if(c)for(var l=c.slice(),f=0;f<l.length;f++){var p=l[f],h=p.originalDelegate?p.originalDelegate:p.callback;this[a].call(this,n,h,p.options)}if(u)for(var l=u.slice(),f=0;f<l.length;f++){var p=l[f],h=p.originalDelegate?p.originalDelegate:p.callback;this[a].call(this,n,h,p.options)}}}else{for(var d=Object.keys(t),f=0;f<d.length;f++){var v=d[f],g=se.exec(v),y=g&&g[1];y&&"removeListener"!==y&&this[s].call(this,y)}this[s].call(this,"removeListener")}if(m)return this},l(k[o],T),l(k[a],w),S&&l(k[s],S),E&&l(k[i],E),!0}for(var o=n&&n.add||R,a=n&&n.rm||x,i=n&&n.listeners||"eventListeners",s=n&&n.rmAll||"removeAllListeners",c=N(o),u="."+o+":",f="prependListener",p="."+f+":",d=function(e,t,n){if(!e.isRemoved){var r=e.callback;"object"==typeof r&&r.handleEvent&&(e.callback=function(e){return r.handleEvent(e)},e.originalDelegate=r),e.invoke(e,t,[n]);var o=e.options;if(o&&"object"==typeof o&&o.once){var i=e.originalDelegate?e.originalDelegate:e.callback;t[a].call(t,n.type,i,o)}}},v=function(t){if(t=t||e.event){var n=this||t.target||e,r=n[ae[t.type][A]];if(r)if(1===r.length)d(r[0],n,t);else for(var o=r.slice(),a=0;a<o.length&&(!t||t[ce]!==!0);a++)d(o[a],n,t)}},g=function(t){if(t=t||e.event){var n=this||t.target||e,r=n[ae[t.type][q]];if(r)if(1===r.length)d(r[0],n,t);else for(var o=r.slice(),a=0;a<o.length&&(!t||t[ce]!==!0);a++)d(o[a],n,t)}},y=[],m=0;m<t.length;m++)y[m]=r(t[m],n);return y}function h(e,t){var n=[];for(var r in e){var o=se.exec(r),a=o&&o[1];if(a&&(!t||a===t)){var i=e[r];if(i)for(var s=0;s<i.length;s++)n.push(i[s])}}return n}function d(e,t){var n=e.Event;n&&n.prototype&&t.patchMethod(n.prototype,"stopImmediatePropagation",function(e){return function(t,n){t[ce]=!0,e&&e.apply(t,n)}})}function v(e,n,r,o){function a(t){function n(){try{t.invoke.apply(this,arguments)}finally{t.data&&t.data.isPeriodic||("number"==typeof r.handleId?delete l[r.handleId]:r.handleId&&(r.handleId[ue]=null))}}var r=t.data;return r.args[0]=n,r.handleId=s.apply(e,r.args),t}function i(e){return u(e.data.handleId)}var s=null,u=null;n+=o,r+=o;var l={};s=c(e,n,function(r){return function(s,c){if("function"==typeof c[0]){var u={handleId:null,isPeriodic:"Interval"===o,delay:"Timeout"===o||"Interval"===o?c[1]||0:null,args:c},f=t(n,c[0],u,a,i);if(!f)return f;var p=f.data.handleId;return"number"==typeof p?l[p]=f:p&&(p[ue]=f),p&&p.ref&&p.unref&&"function"==typeof p.ref&&"function"==typeof p.unref&&(f.ref=p.ref.bind(p),f.unref=p.unref.bind(p)),"number"==typeof p||p?p:f}return r.apply(e,c)}}),u=c(e,r,function(t){return function(n,r){var o,a=r[0];"number"==typeof a?o=l[a]:(o=a&&a[ue],o||(o=a)),o&&"string"==typeof o.type?"notScheduled"!==o.state&&(o.cancelFn&&o.data.isPeriodic||0===o.runCount)&&("number"==typeof a?delete l[a]:a&&(a[ue]=null),o.zone.cancelTask(o)):t.apply(e,r)}})}function g(){Object.defineProperty=function(e,t,n){if(m(e,t))throw new TypeError("Cannot assign to read only property '"+t+"' of "+e);var r=n.configurable;return"prototype"!==t&&(n=k(e,t,n)),_(e,t,n,r)},Object.defineProperties=function(e,t){return Object.keys(t).forEach(function(n){Object.defineProperty(e,n,t[n])}),e},Object.create=function(e,t){return"object"!=typeof t||Object.isFrozen(t)||Object.keys(t).forEach(function(n){t[n]=k(e,n,t[n])}),pe(e,t)},Object.getOwnPropertyDescriptor=function(e,t){var n=fe(e,t);return m(e,t)&&(n.configurable=!1),n}}function y(e,t,n){var r=n.configurable;return n=k(e,t,n),_(e,t,n,r)}function m(e,t){return e&&e[he]&&e[he][t]}function k(e,t,n){return Object.isFrozen(n)||(n.configurable=!0),n.configurable||(e[he]||Object.isFrozen(e)||le(e,he,{writable:!0,value:{}}),e[he]&&(e[he][t]=!0)),n}function _(e,t,n,r){try{return le(e,t,n)}catch(o){if(!n.configurable)throw o;"undefined"==typeof r?delete n.configurable:n.configurable=r;try{return le(e,t,n)}catch(o){var a=null;try{a=JSON.stringify(n)}catch(o){a=n.toString()}console.log("Attempting to configure '"+t+"' with descriptor '"+a+"' on object '"+e+"' and got error, giving up: "+o)}}}function b(e,t){var n=t.WebSocket;t.EventTarget||p(t,[n.prototype]),t.WebSocket=function(e,t){var r,o,a=arguments.length>1?new n(e,t):new n(e),s=j(a,"onmessage");return s&&s.configurable===!1?(r=L(a),o=a,[R,x,"send","close"].forEach(function(e){r[e]=function(){var t=M.call(arguments);if(e===R||e===x){var n=t.length>0?t[0]:void 0;if(n){var o=Zone.__symbol__("ON_PROPERTY"+n);a[o]=r[o]}}return a[e].apply(a,t)}})):r=a,i(r,["close","error","message","open"],o),r};var r=t.WebSocket;for(var o in n)r[o]=n[o]}function T(e,t,n){if(!n)return t;var r=n.filter(function(t){return t.target===e});if(!r||0===r.length)return t;var o=r[0].ignoreProperties;return t.filter(function(e){return o.indexOf(e)===-1})}function w(e,t,n,r){if(e){var o=T(e,t,n);i(e,o,r)}}function E(e,t){if(!J||Q){var n="undefined"!=typeof WebSocket;if(S()){var r=t.__Zone_ignore_on_properties;if(Y){var o=window;w(o,Pe.concat(["messageerror"]),r,I(o)),w(Document.prototype,Pe,r),"undefined"!=typeof o.SVGElement&&w(o.SVGElement.prototype,Pe,r),w(Element.prototype,Pe,r),w(HTMLElement.prototype,Pe,r),w(HTMLMediaElement.prototype,me,r),w(HTMLFrameSetElement.prototype,ge.concat(Ee),r),w(HTMLBodyElement.prototype,ge.concat(Ee),r),w(HTMLFrameElement.prototype,we,r),w(HTMLIFrameElement.prototype,we,r);var a=o.HTMLMarqueeElement;a&&w(a.prototype,Se,r);var i=o.Worker;i&&w(i.prototype,Oe,r)}w(XMLHttpRequest.prototype,De,r);var c=t.XMLHttpRequestEventTarget;c&&w(c&&c.prototype,De,r),"undefined"!=typeof IDBIndex&&(w(IDBIndex.prototype,Ze,r),w(IDBRequest.prototype,Ze,r),w(IDBOpenDBRequest.prototype,Ze,r),w(IDBDatabase.prototype,Ze,r),w(IDBTransaction.prototype,Ze,r),w(IDBCursor.prototype,Ze,r)),n&&w(WebSocket.prototype,ze,r)}else D(),s("XMLHttpRequest"),n&&b(e,t)}}function S(){if((Y||Q)&&!j(HTMLElement.prototype,"onclick")&&"undefined"!=typeof Element){var e=j(Element.prototype,"onclick");if(e&&!e.configurable)return!1}var t="onreadystatechange",n=XMLHttpRequest.prototype,r=j(n,t);if(r){C(n,t,{enumerable:!0,configurable:!0,get:function(){return!0}});var o=new XMLHttpRequest,a=!!o.onreadystatechange;return C(n,t,r||{}),a}var i=N("fake");C(n,t,{enumerable:!0,configurable:!0,get:function(){return this[i]},set:function(e){this[i]=e}});var o=new XMLHttpRequest,s=function(){};o.onreadystatechange=s;var a=o[i]===s;return o.onreadystatechange=null,a}function D(){for(var t=function(t){var n=Pe[t],r="on"+n;self.addEventListener(n,function(t){var n,o,a=t.target;for(o=a?a.constructor.name+"."+r:"unknown."+r;a;)a[r]&&!a[r][je]&&(n=e(a[r],o),n[je]=a[r],a[r]=n),a=a.parentElement},!0)},n=0;n<Pe.length;n++)t(n)}function Z(e,t){var n="Anchor,Area,Audio,BR,Base,BaseFont,Body,Button,Canvas,Content,DList,Directory,Div,Embed,FieldSet,Font,Form,Frame,FrameSet,HR,Head,Heading,Html,IFrame,Image,Input,Keygen,LI,Label,Legend,Link,Map,Marquee,Media,Menu,Meta,Meter,Mod,OList,Object,OptGroup,Option,Output,Paragraph,Pre,Progress,Quote,Script,Select,Source,Span,Style,TableCaption,TableCell,TableCol,Table,TableRow,TableSection,TextArea,Title,Track,UList,Unknown,Video",r="ApplicationCache,EventSource,FileReader,InputMethodContext,MediaController,MessagePort,Node,Performance,SVGElementInstance,SharedWorker,TextTrack,TextTrackCue,TextTrackList,WebKitNamedFlow,Window,Worker,WorkerGlobalScope,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload,IDBRequest,IDBOpenDBRequest,IDBDatabase,IDBTransaction,IDBCursor,DBIndex,WebSocket".split(","),o="EventTarget",a=[],i=e.wtf,s=n.split(",");i?a=s.map(function(e){return"HTML"+e+"Element"}).concat(r):e[o]?a.push(o):a=r;for(var c=e.__Zone_disable_IE_check||!1,u=e.__Zone_enable_cross_context_check||!1,l=f(),h=".addEventListener:",d="[object FunctionWrapper]",v="function __BROWSERTOOLS_CONSOLE_SAFEFUNC() { [native code] }",g=0;g<Pe.length;g++){var y=Pe[g],m=y+A,k=y+q,_=B+m,b=B+k;ae[y]={},ae[y][A]=_,ae[y][q]=b}for(var g=0;g<n.length;g++)for(var T=s[g],w=ie[T]={},E=0;E<Pe.length;E++){var y=Pe[E];w[y]=T+h+y}for(var S=function(e,t,n,r){if(!c&&l)if(u)try{var o=t.toString();if(o===d||o==v)return e.apply(n,r),!1}catch(a){return e.apply(n,r),!1}else{var o=t.toString();if(o===d||o==v)return e.apply(n,r),!1}else if(u)try{t.toString()}catch(a){return e.apply(n,r),!1}return!0},D=[],g=0;g<a.length;g++){var Z=e[a[g]];D.push(Z&&Z.prototype)}return p(e,D,{vh:S}),t.patchEventTarget=p,!0}function z(e,t){d(e,t)}function O(t){if((Y||Q)&&"registerElement"in t.document){var n=document.registerElement,r=["createdCallback","attachedCallback","detachedCallback","attributeChangedCallback"];document.registerElement=function(t,o){return o&&o.prototype&&r.forEach(function(t){var n="Document.registerElement::"+t,r=o.prototype;if(r.hasOwnProperty(t)){var a=j(r,t);a&&a.value?(a.value=e(a.value,n),y(o.prototype,t,a)):r[t]=e(r[t],n)}else r[t]&&(r[t]=e(r[t],n))}),n.call(document,t,o)},l(document.registerElement,n)}}var P=(function(e){function t(e){c&&c.mark&&c.mark(e)}function n(e,t){c&&c.measure&&c.measure(e,t)}function r(t){0===I&&0===y.length&&(u||e[v]&&(u=e[v].resolve(0)),u?u[g](o):e[d](o,0)),t&&y.push(t)}function o(){if(!m){for(m=!0;y.length;){var e=y;y=[];for(var t=0;t<e.length;t++){var n=e[t];try{n.zone.runTask(n,null,null)}catch(r){P.onUnhandledError(r)}}}P.microtaskDrainDone(),m=!1}}function a(){}function i(e){return"__zone_symbol__"+e}var s="function",c=e.performance;if(t("Zone"),e.Zone)throw new Error("Zone already loaded.");var u,l=function(){function r(e,t){this._properties=null,this._parent=e,this._name=t?t.name||"unnamed":"<root>",this._properties=t&&t.properties||{},this._zoneDelegate=new p(this,this._parent&&this._parent._zoneDelegate,t)}return r.assertZonePatched=function(){if(e.Promise!==O.ZoneAwarePromise)throw new Error("Zone.js has detected that ZoneAwarePromise `(window|global).Promise` has been overwritten.\nMost likely cause is that a Promise polyfill has been loaded after Zone.js (Polyfilling Promise api is not necessary when zone.js is loaded. If you must load one, do so before loading zone.js.)")},Object.defineProperty(r,"root",{get:function(){for(var e=r.current;e.parent;)e=e.parent;return e},enumerable:!0,configurable:!0}),Object.defineProperty(r,"current",{get:function(){return j.zone},enumerable:!0,configurable:!0}),Object.defineProperty(r,"currentTask",{get:function(){return C},enumerable:!0,configurable:!0}),r.__load_patch=function(o,a){if(O.hasOwnProperty(o))throw Error("Already loaded patch: "+o);if(!e["__Zone_disable_"+o]){var i="Zone:"+o;t(i),O[o]=a(e,r,P),n(i,i)}},Object.defineProperty(r.prototype,"parent",{get:function(){return this._parent},enumerable:!0,configurable:!0}),Object.defineProperty(r.prototype,"name",{get:function(){return this._name},enumerable:!0,configurable:!0}),r.prototype.get=function(e){var t=this.getZoneWith(e);if(t)return t._properties[e]},r.prototype.getZoneWith=function(e){for(var t=this;t;){if(t._properties.hasOwnProperty(e))return t;t=t._parent}return null},r.prototype.fork=function(e){if(!e)throw new Error("ZoneSpec required!");return this._zoneDelegate.fork(this,e)},r.prototype.wrap=function(e,t){if(typeof e!==s)throw new Error("Expecting function got: "+e);var n=this._zoneDelegate.intercept(this,e,t),r=this;return function(){return r.runGuarded(n,this,arguments,t)}},r.prototype.run=function(e,t,n,r){void 0===t&&(t=void 0),void 0===n&&(n=null),void 0===r&&(r=null),j={parent:j,zone:this};try{return this._zoneDelegate.invoke(this,e,t,n,r)}finally{j=j.parent}},r.prototype.runGuarded=function(e,t,n,r){void 0===t&&(t=null),void 0===n&&(n=null),void 0===r&&(r=null),j={parent:j,zone:this};try{try{return this._zoneDelegate.invoke(this,e,t,n,r)}catch(o){if(this._zoneDelegate.handleError(this,o))throw o}}finally{j=j.parent}},r.prototype.runTask=function(e,t,n){if(e.zone!=this)throw new Error("A task can only be run in the zone of creation! (Creation: "+(e.zone||k).name+"; Execution: "+this.name+")");var r=e.state===_;if(!r||e.type!==z){var o=e.state!=w;o&&e._transitionTo(w,T),e.runCount++;var a=C;C=e,j={parent:j,zone:this};try{e.type==Z&&e.data&&!e.data.isPeriodic&&(e.cancelFn=null);try{return this._zoneDelegate.invokeTask(this,e,t,n)}catch(i){if(this._zoneDelegate.handleError(this,i))throw i}}finally{e.state!==_&&e.state!==S&&(e.type==z||e.data&&e.data.isPeriodic?o&&e._transitionTo(T,w):(e.runCount=0,this._updateTaskCount(e,-1),o&&e._transitionTo(_,w,_))),j=j.parent,C=a}}},r.prototype.scheduleTask=function(e){if(e.zone&&e.zone!==this)for(var t=this;t;){if(t===e.zone)throw Error("can not reschedule task to "+this.name+" which is descendants of the original zone "+e.zone.name);t=t.parent}e._transitionTo(b,_);var n=[];e._zoneDelegates=n,e._zone=this;try{e=this._zoneDelegate.scheduleTask(this,e)}catch(r){throw e._transitionTo(S,b,_),this._zoneDelegate.handleError(this,r),r}return e._zoneDelegates===n&&this._updateTaskCount(e,1),e.state==b&&e._transitionTo(T,b),e},r.prototype.scheduleMicroTask=function(e,t,n,r){return this.scheduleTask(new h(D,e,t,n,r,null))},r.prototype.scheduleMacroTask=function(e,t,n,r,o){return this.scheduleTask(new h(Z,e,t,n,r,o))},r.prototype.scheduleEventTask=function(e,t,n,r,o){return this.scheduleTask(new h(z,e,t,n,r,o))},r.prototype.cancelTask=function(e){if(e.zone!=this)throw new Error("A task can only be cancelled in the zone of creation! (Creation: "+(e.zone||k).name+"; Execution: "+this.name+")");e._transitionTo(E,T,w);try{this._zoneDelegate.cancelTask(this,e)}catch(t){throw e._transitionTo(S,E),this._zoneDelegate.handleError(this,t),t}return this._updateTaskCount(e,-1),e._transitionTo(_,E),e.runCount=0,e},r.prototype._updateTaskCount=function(e,t){var n=e._zoneDelegates;t==-1&&(e._zoneDelegates=null);for(var r=0;r<n.length;r++)n[r]._updateTaskCount(e.type,t)},r.__symbol__=i,r}(),f={name:"",onHasTask:function(e,t,n,r){return e.hasTask(n,r)},onScheduleTask:function(e,t,n,r){return e.scheduleTask(n,r)},onInvokeTask:function(e,t,n,r,o,a){return e.invokeTask(n,r,o,a)},onCancelTask:function(e,t,n,r){return e.cancelTask(n,r)}},p=function(){function e(e,t,n){this._taskCounts={microTask:0,macroTask:0,eventTask:0},this.zone=e,this._parentDelegate=t,this._forkZS=n&&(n&&n.onFork?n:t._forkZS),this._forkDlgt=n&&(n.onFork?t:t._forkDlgt),this._forkCurrZone=n&&(n.onFork?this.zone:t.zone),this._interceptZS=n&&(n.onIntercept?n:t._interceptZS),this._interceptDlgt=n&&(n.onIntercept?t:t._interceptDlgt),this._interceptCurrZone=n&&(n.onIntercept?this.zone:t.zone),this._invokeZS=n&&(n.onInvoke?n:t._invokeZS),this._invokeDlgt=n&&(n.onInvoke?t:t._invokeDlgt),this._invokeCurrZone=n&&(n.onInvoke?this.zone:t.zone),this._handleErrorZS=n&&(n.onHandleError?n:t._handleErrorZS),this._handleErrorDlgt=n&&(n.onHandleError?t:t._handleErrorDlgt),this._handleErrorCurrZone=n&&(n.onHandleError?this.zone:t.zone),this._scheduleTaskZS=n&&(n.onScheduleTask?n:t._scheduleTaskZS),this._scheduleTaskDlgt=n&&(n.onScheduleTask?t:t._scheduleTaskDlgt),this._scheduleTaskCurrZone=n&&(n.onScheduleTask?this.zone:t.zone),this._invokeTaskZS=n&&(n.onInvokeTask?n:t._invokeTaskZS),this._invokeTaskDlgt=n&&(n.onInvokeTask?t:t._invokeTaskDlgt),this._invokeTaskCurrZone=n&&(n.onInvokeTask?this.zone:t.zone),this._cancelTaskZS=n&&(n.onCancelTask?n:t._cancelTaskZS),this._cancelTaskDlgt=n&&(n.onCancelTask?t:t._cancelTaskDlgt),this._cancelTaskCurrZone=n&&(n.onCancelTask?this.zone:t.zone),this._hasTaskZS=null,this._hasTaskDlgt=null,this._hasTaskDlgtOwner=null,this._hasTaskCurrZone=null;var r=n&&n.onHasTask,o=t&&t._hasTaskZS;(r||o)&&(this._hasTaskZS=r?n:f,this._hasTaskDlgt=t,this._hasTaskDlgtOwner=this,this._hasTaskCurrZone=e,n.onScheduleTask||(this._scheduleTaskZS=f,this._scheduleTaskDlgt=t,this._scheduleTaskCurrZone=this.zone),n.onInvokeTask||(this._invokeTaskZS=f,this._invokeTaskDlgt=t,this._invokeTaskCurrZone=this.zone),n.onCancelTask||(this._cancelTaskZS=f,this._cancelTaskDlgt=t,this._cancelTaskCurrZone=this.zone))}return e.prototype.fork=function(e,t){return this._forkZS?this._forkZS.onFork(this._forkDlgt,this.zone,e,t):new l(e,t)},e.prototype.intercept=function(e,t,n){return this._interceptZS?this._interceptZS.onIntercept(this._interceptDlgt,this._interceptCurrZone,e,t,n):t},e.prototype.invoke=function(e,t,n,r,o){return this._invokeZS?this._invokeZS.onInvoke(this._invokeDlgt,this._invokeCurrZone,e,t,n,r,o):t.apply(n,r)},e.prototype.handleError=function(e,t){return!this._handleErrorZS||this._handleErrorZS.onHandleError(this._handleErrorDlgt,this._handleErrorCurrZone,e,t)},e.prototype.scheduleTask=function(e,t){var n=t;if(this._scheduleTaskZS)this._hasTaskZS&&n._zoneDelegates.push(this._hasTaskDlgtOwner),n=this._scheduleTaskZS.onScheduleTask(this._scheduleTaskDlgt,this._scheduleTaskCurrZone,e,t),n||(n=t);else if(t.scheduleFn)t.scheduleFn(t);else{if(t.type!=D)throw new Error("Task is missing scheduleFn.");r(t)}return n},e.prototype.invokeTask=function(e,t,n,r){return this._invokeTaskZS?this._invokeTaskZS.onInvokeTask(this._invokeTaskDlgt,this._invokeTaskCurrZone,e,t,n,r):t.callback.apply(n,r)},e.prototype.cancelTask=function(e,t){var n;if(this._cancelTaskZS)n=this._cancelTaskZS.onCancelTask(this._cancelTaskDlgt,this._cancelTaskCurrZone,e,t);else{if(!t.cancelFn)throw Error("Task is not cancelable");n=t.cancelFn(t)}return n},e.prototype.hasTask=function(e,t){try{return this._hasTaskZS&&this._hasTaskZS.onHasTask(this._hasTaskDlgt,this._hasTaskCurrZone,e,t)}catch(n){this.handleError(e,n)}},e.prototype._updateTaskCount=function(e,t){var n=this._taskCounts,r=n[e],o=n[e]=r+t;if(o<0)throw new Error("More tasks executed then were scheduled.");if(0==r||0==o){var a={microTask:n.microTask>0,macroTask:n.macroTask>0,eventTask:n.eventTask>0,change:e};this.hasTask(this.zone,a)}},e}(),h=function(){function t(n,r,o,a,i,s){this._zone=null,this.runCount=0,this._zoneDelegates=null,this._state="notScheduled",this.type=n,this.source=r,this.data=a,this.scheduleFn=i,this.cancelFn=s,this.callback=o;var c=this;n===z&&a&&a.useG?this.invoke=t.invokeTask:this.invoke=function(){return t.invokeTask.call(e,c,this,arguments)}}return t.invokeTask=function(e,t,n){e||(e=this),I++;try{return e.runCount++,e.zone.runTask(e,t,n)}finally{1==I&&o(),I--}},Object.defineProperty(t.prototype,"zone",{get:function(){return this._zone},enumerable:!0,configurable:!0}),Object.defineProperty(t.prototype,"state",{get:function(){return this._state},enumerable:!0,configurable:!0}),t.prototype.cancelScheduleRequest=function(){this._transitionTo(_,b)},t.prototype._transitionTo=function(e,t,n){if(this._state!==t&&this._state!==n)throw new Error(this.type+" '"+this.source+"': can not transition to '"+e+"', expecting state '"+t+"'"+(n?" or '"+n+"'":"")+", was '"+this._state+"'.");this._state=e,e==_&&(this._zoneDelegates=null)},t.prototype.toString=function(){return this.data&&"undefined"!=typeof this.data.handleId?this.data.handleId:Object.prototype.toString.call(this)},t.prototype.toJSON=function(){return{type:this.type,state:this.state,source:this.source,zone:this.zone.name,runCount:this.runCount}},t}(),d=i("setTimeout"),v=i("Promise"),g=i("then"),y=[],m=!1,k={name:"NO ZONE"},_="notScheduled",b="scheduling",T="scheduled",w="running",E="canceling",S="unknown",D="microTask",Z="macroTask",z="eventTask",O={},P={symbol:i,currentZoneFrame:function(){return j},onUnhandledError:a,microtaskDrainDone:a,scheduleMicroTask:r,showUncaughtError:function(){return!l[i("ignoreConsoleErrorUncaughtError")]},patchEventTarget:function(){return[]},patchOnProperties:a,patchMethod:function(){return a},bindArguments:function(){return null},setNativePromise:function(e){e&&typeof e.resolve===s&&(u=e.resolve(0))}},j={parent:null,zone:new l(null,null)},C=null,I=0;return n("Zone","Zone"),e.Zone=l}("undefined"!=typeof window&&window||"undefined"!=typeof self&&self||global),function(e){var t="function"==typeof Symbol&&e[Symbol.iterator],n=0;return t?t.call(e):{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}}});Zone.__load_patch("ZoneAwarePromise",function(e,t,n){function r(e){if(e&&e.toString===Object.prototype.toString){var t=e.constructor&&e.constructor.name;return(t?t:"")+": "+JSON.stringify(e)}return e?e.toString():Object.prototype.toString.call(e)}function o(e){n.onUnhandledError(e);try{var r=t[b];r&&"function"==typeof r&&r.call(this,e)}catch(o){}}function a(e){return e&&e.then}function i(e){return e}function s(e){return H.reject(e)}function c(e,t){return function(n){try{u(e,t,n)}catch(r){u(e,!1,r)}}}function u(e,o,a){var i=I();if(e===a)throw new TypeError(L);if(e[T]===z){var s=null;try{"object"!=typeof a&&"function"!=typeof a||(s=a&&a.then)}catch(p){return i(function(){u(e,!1,p)})(),e}if(o!==j&&a instanceof H&&a.hasOwnProperty(T)&&a.hasOwnProperty(w)&&a[T]!==z)l(a),u(e,a[T],a[w]);else if(o!==j&&"function"==typeof s)try{s.call(a,i(c(e,o)),i(c(e,!1)))}catch(p){i(function(){u(e,!1,p)})()}else{e[T]=o;var h=e[w];if(e[w]=a,e[E]===E&&o===O&&(e[T]=e[D],e[w]=e[S]),o===j&&a instanceof Error){var d=t.currentTask&&t.currentTask.data&&t.currentTask.data[_];d&&v(a,M,{configurable:!0,enumerable:!1,writable:!0,value:d})}for(var g=0;g<h.length;)f(e,h[g++],h[g++],h[g++],h[g++]);if(0==h.length&&o==j){e[T]=C;try{throw new Error("Uncaught (in promise): "+r(a)+(a&&a.stack?"\n"+a.stack:""))}catch(p){var m=p;m.rejection=a,m.promise=e,m.zone=t.current,m.task=t.currentTask,y.push(m),n.scheduleMicroTask()}}}}return e}function l(e){if(e[T]===C){try{var n=t[R];n&&"function"==typeof n&&n.call(this,{rejection:e[w],promise:e})}catch(r){}e[T]=j;for(var o=0;o<y.length;o++)e===y[o].promise&&y.splice(o,1)}}function f(e,t,n,r,o){l(e);var a=e[T],c=a?"function"==typeof r?r:i:"function"==typeof o?o:s;t.scheduleMicroTask(Z,function(){try{var r=e[w],o=n&&E===n[E];o&&(n[S]=r,n[D]=a);var l=t.run(c,void 0,o&&c!==s&&c!==i?[]:[r]);u(n,!0,l)}catch(f){u(n,!1,f)}},n)}function p(e){var t=e.prototype,n=d(t,"then");if(!n||n.writable!==!1&&n.configurable){var r=t.then;t[k]=r,e.prototype.then=function(e,t){var n=this,o=new H(function(e,t){r.call(n,e,t)});return o.then(e,t)},e[B]=!0}}function h(e){return function(){var t=e.apply(this,arguments);if(t instanceof H)return t;var n=t.constructor;return n[B]||p(n),t}}var d=Object.getOwnPropertyDescriptor,v=Object.defineProperty,g=n.symbol,y=[],m=g("Promise"),k=g("then"),_="__creationTrace__";n.onUnhandledError=function(e){if(n.showUncaughtError()){var t=e&&e.rejection;t?console.error("Unhandled Promise rejection:",t instanceof Error?t.message:t,"; Zone:",e.zone.name,"; Task:",e.task&&e.task.source,"; Value:",t,t instanceof Error?t.stack:void 0):console.error(e)}},n.microtaskDrainDone=function(){for(;y.length;)for(var e=function(){var e=y.shift();try{e.zone.runGuarded(function(){throw e})}catch(t){o(t)}};y.length;)e()};var b=g("unhandledPromiseRejectionHandler"),T=g("state"),w=g("value"),E=g("finally"),S=g("parentPromiseValue"),D=g("parentPromiseState"),Z="Promise.then",z=null,O=!0,j=!1,C=0,I=function(){var e=!1;return function(t){return function(){e||(e=!0,t.apply(null,arguments))}}},L="Promise resolved with itself",M=g("currentTaskTrace"),R=g("rejectionHandledHandler"),x="function ZoneAwarePromise() { [native code] }",H=function(){function e(t){var n=this;if(!(n instanceof e))throw new Error("Must be an instanceof Promise.");n[T]=z,n[w]=[];try{t&&t(c(n,O),c(n,j))}catch(r){u(n,!1,r)}}return e.toString=function(){return x},e.resolve=function(e){return u(new this(null),O,e)},e.reject=function(e){return u(new this(null),j,e)},e.race=function(e){function t(e){i&&(i=r(e))}function n(e){i&&(i=o(e))}var r,o,i=new this(function(e,t){r=e,o=t});try{for(var s=P(e),c=s.next();!c.done;c=s.next()){var u=c.value;a(u)||(u=this.resolve(u)),u.then(t,n)}}catch(l){f={error:l}}finally{try{c&&!c.done&&(p=s["return"])&&p.call(s)}finally{if(f)throw f.error}}return i;var f,p},e.all=function(e){var t,n,r=new this(function(e,r){t=e,n=r}),o=0,i=[];try{for(var s=P(e),c=s.next();!c.done;c=s.next()){var u=c.value;a(u)||(u=this.resolve(u)),u.then(function(e){return function(n){i[e]=n,o--,o||t(i)}}(o),n),o++}}catch(l){f={error:l}}finally{try{c&&!c.done&&(p=s["return"])&&p.call(s)}finally{if(f)throw f.error}}return o||t(i),r;var f,p},e.prototype.then=function(e,n){var r=new this.constructor(null),o=t.current;return this[T]==z?this[w].push(o,r,e,n):f(this,o,r,e,n),r},e.prototype["catch"]=function(e){return this.then(null,e)},e.prototype["finally"]=function(e){var n=new this.constructor(null);n[E]=E;var r=t.current;return this[T]==z?this[w].push(r,n,e,e):f(this,r,n,e,e),n},e}();H.resolve=H.resolve,H.reject=H.reject,H.race=H.race,H.all=H.all;var F=e[m]=e.Promise,q=t.__symbol__("ZoneAwarePromise"),A=d(e,"Promise");A&&!A.configurable||(A&&delete A.writable,A&&delete A.value,A||(A={configurable:!0,enumerable:!0}),A.get=function(){return e[q]?e[q]:e[m]},A.set=function(t){t===H?e[q]=t:(e[m]=t,t.prototype[k]||p(t),n.setNativePromise(t))},v(e,"Promise",A)),e.Promise=H;var B=g("thenPatched");if(F){p(F);var N=e.fetch;"function"==typeof N&&(e.fetch=h(N))}return Promise[t.__symbol__("uncaughtPromiseErrors")]=y,H});var j=Object.getOwnPropertyDescriptor,C=Object.defineProperty,I=Object.getPrototypeOf,L=Object.create,M=Array.prototype.slice,R="addEventListener",x="removeEventListener",H=Zone.__symbol__(R),F=Zone.__symbol__(x),q="true",A="false",B="__zone_symbol__",N=Zone.__symbol__,W="undefined"!=typeof window,X=W?window:void 0,G=W&&X||"object"==typeof self&&self||global,U="removeAttribute",V=[null],K="undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope,J=!("nw"in G)&&"undefined"!=typeof G.process&&"[object process]"==={}.toString.call(G.process),Y=!J&&!K&&!(!W||!X.HTMLElement),Q="undefined"!=typeof G.process&&"[object process]"==={}.toString.call(G.process)&&!K&&!(!W||!X.HTMLElement),$={},ee=function(e){if(e=e||G.event){var t=$[e.type];t||(t=$[e.type]=N("ON_PROPERTY"+e.type));var n=this||e.target||G,r=n[t],o=r&&r.apply(this,arguments);return void 0==o||o||e.preventDefault(),o}},te=N("originalInstance"),ne=!1,re=!1;Zone.__load_patch("toString",function(e){var t=Function.prototype.toString,n=N("OriginalDelegate"),r=N("Promise"),o=N("Error"),a=function(){if("function"==typeof this){var a=this[n];if(a)return"function"==typeof a?t.apply(this[n],arguments):Object.prototype.toString.call(a);
-if(this===Promise){var i=e[r];if(i)return t.apply(i,arguments)}if(this===Error){var s=e[o];if(s)return t.apply(s,arguments)}}return t.apply(this,arguments)};a[n]=t,Function.prototype.toString=a;var i=Object.prototype.toString,s="[object Promise]";Object.prototype.toString=function(){return this instanceof Promise?s:i.apply(this,arguments)}});var oe={useG:!0},ae={},ie={},se=/^__zone_symbol__(\w+)(true|false)$/,ce="__zone_symbol__propagationStopped",ue=N("zoneTask"),le=Object[N("defineProperty")]=Object.defineProperty,fe=Object[N("getOwnPropertyDescriptor")]=Object.getOwnPropertyDescriptor,pe=Object.create,he=N("unconfigurables"),de=["abort","animationcancel","animationend","animationiteration","auxclick","beforeinput","blur","cancel","canplay","canplaythrough","change","compositionstart","compositionupdate","compositionend","cuechange","click","close","contextmenu","curechange","dblclick","drag","dragend","dragenter","dragexit","dragleave","dragover","drop","durationchange","emptied","ended","error","focus","focusin","focusout","gotpointercapture","input","invalid","keydown","keypress","keyup","load","loadstart","loadeddata","loadedmetadata","lostpointercapture","mousedown","mouseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","mousewheel","orientationchange","pause","play","playing","pointercancel","pointerdown","pointerenter","pointerleave","pointerlockchange","mozpointerlockchange","webkitpointerlockerchange","pointerlockerror","mozpointerlockerror","webkitpointerlockerror","pointermove","pointout","pointerover","pointerup","progress","ratechange","reset","resize","scroll","seeked","seeking","select","selectionchange","selectstart","show","sort","stalled","submit","suspend","timeupdate","volumechange","touchcancel","touchmove","touchstart","touchend","transitioncancel","transitionend","waiting","wheel"],ve=["afterscriptexecute","beforescriptexecute","DOMContentLoaded","fullscreenchange","mozfullscreenchange","webkitfullscreenchange","msfullscreenchange","fullscreenerror","mozfullscreenerror","webkitfullscreenerror","msfullscreenerror","readystatechange","visibilitychange"],ge=["absolutedeviceorientation","afterinput","afterprint","appinstalled","beforeinstallprompt","beforeprint","beforeunload","devicelight","devicemotion","deviceorientation","deviceorientationabsolute","deviceproximity","hashchange","languagechange","message","mozbeforepaint","offline","online","paint","pageshow","pagehide","popstate","rejectionhandled","storage","unhandledrejection","unload","userproximity","vrdisplyconnected","vrdisplaydisconnected","vrdisplaypresentchange"],ye=["beforecopy","beforecut","beforepaste","copy","cut","paste","dragstart","loadend","animationstart","search","transitionrun","transitionstart","webkitanimationend","webkitanimationiteration","webkitanimationstart","webkittransitionend"],me=["encrypted","waitingforkey","msneedkey","mozinterruptbegin","mozinterruptend"],ke=["activate","afterupdate","ariarequest","beforeactivate","beforedeactivate","beforeeditfocus","beforeupdate","cellchange","controlselect","dataavailable","datasetchanged","datasetcomplete","errorupdate","filterchange","layoutcomplete","losecapture","move","moveend","movestart","propertychange","resizeend","resizestart","rowenter","rowexit","rowsdelete","rowsinserted","command","compassneedscalibration","deactivate","help","mscontentzoom","msmanipulationstatechanged","msgesturechange","msgesturedoubletap","msgestureend","msgesturehold","msgesturestart","msgesturetap","msgotpointercapture","msinertiastart","mslostpointercapture","mspointercancel","mspointerdown","mspointerenter","mspointerhover","mspointerleave","mspointermove","mspointerout","mspointerover","mspointerup","pointerout","mssitemodejumplistitemremoved","msthumbnailclick","stop","storagecommit"],_e=["webglcontextrestored","webglcontextlost","webglcontextcreationerror"],be=["autocomplete","autocompleteerror"],Te=["toggle"],we=["load"],Ee=["blur","error","focus","load","resize","scroll","messageerror"],Se=["bounce","finish","start"],De=["loadstart","progress","abort","error","load","progress","timeout","loadend","readystatechange"],Ze=["upgradeneeded","complete","abort","success","error","blocked","versionchange","close"],ze=["close","error","open","message"],Oe=["error","message"],Pe=de.concat(_e,be,Te,ve,ge,ye,ke),je=N("unbound");Zone.__load_patch("util",function(e,t,r){r.patchOnProperties=i,r.patchMethod=c,r.bindArguments=n}),Zone.__load_patch("timers",function(e){var t="set",n="clear";v(e,t,n,"Timeout"),v(e,t,n,"Interval"),v(e,t,n,"Immediate")}),Zone.__load_patch("requestAnimationFrame",function(e){v(e,"request","cancel","AnimationFrame"),v(e,"mozRequest","mozCancel","AnimationFrame"),v(e,"webkitRequest","webkitCancel","AnimationFrame")}),Zone.__load_patch("blocking",function(e,t){for(var n=["alert","prompt","confirm"],r=0;r<n.length;r++){var o=n[r];c(e,o,function(n,r,o){return function(r,a){return t.current.run(n,e,a,o)}})}}),Zone.__load_patch("EventTarget",function(e,t,n){var r=t.__symbol__("BLACK_LISTED_EVENTS");e[r]&&(t[r]=e[r]),z(e,n),Z(e,n);var o=e.XMLHttpRequestEventTarget;o&&o.prototype&&n.patchEventTarget(e,[o.prototype]),s("MutationObserver"),s("WebKitMutationObserver"),s("IntersectionObserver"),s("FileReader")}),Zone.__load_patch("on_property",function(e,t,n){E(n,e),g(),O(e)}),Zone.__load_patch("canvas",function(e){var t=e.HTMLCanvasElement;"undefined"!=typeof t&&t.prototype&&t.prototype.toBlob&&u(t.prototype,"toBlob",function(e,t){return{name:"HTMLCanvasElement.toBlob",target:e,cbIdx:0,args:t}})}),Zone.__load_patch("XHR",function(e,n){function r(e){function n(e){return e[o]}function r(e){XMLHttpRequest[s]=!1;var t=e.data,n=t.target,r=n[i];h||(h=n[H],d=n[F]),r&&d.call(n,y,r);var a=n[i]=function(){n.readyState===n.DONE&&!t.aborted&&XMLHttpRequest[s]&&e.state===m&&e.invoke()};h.call(n,y,a);var c=n[o];return c||(n[o]=e),b.apply(n,t.args),XMLHttpRequest[s]=!0,e}function l(){}function f(e){var t=e.data;return t.aborted=!0,T.apply(t.target,t.args)}var p=XMLHttpRequest.prototype,h=p[H],d=p[F];if(!h){var v=e.XMLHttpRequestEventTarget;if(v){var g=v.prototype;h=g[H],d=g[F]}}var y="readystatechange",m="scheduled",k=c(p,"open",function(){return function(e,t){return e[a]=0==t[2],e[u]=t[1],k.apply(e,t)}}),_="XMLHttpRequest.send",b=c(p,"send",function(){return function(e,n){if(e[a])return b.apply(e,n);var o={target:e,url:e[u],isPeriodic:!1,delay:null,args:n,aborted:!1};return t(_,l,o,r,f)}}),T=c(p,"abort",function(){return function(e){var t=n(e);if(t&&"string"==typeof t.type){if(null==t.cancelFn||t.data&&t.data.aborted)return;t.zone.cancelTask(t)}}})}r(e);var o=N("xhrTask"),a=N("xhrSync"),i=N("xhrListener"),s=N("xhrScheduled"),u=N("xhrURL")}),Zone.__load_patch("geolocation",function(e){e.navigator&&e.navigator.geolocation&&r(e.navigator.geolocation,["getCurrentPosition","watchPosition"])}),Zone.__load_patch("PromiseRejectionEvent",function(e,t){function n(t){return function(n){var r=h(e,t);r.forEach(function(r){var o=e.PromiseRejectionEvent;if(o){var a=new o(t,{promise:n.promise,reason:n.rejection});r.invoke(a)}})}}e.PromiseRejectionEvent&&(t[N("unhandledPromiseRejectionHandler")]=n("unhandledrejection"),t[N("rejectionHandledHandler")]=n("rejectionhandled"))})});
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&&define.amd?define(t):t()}(this,function(){"use strict";function e(e,t){return Zone.current.wrap(e,t)}function t(e,t,n,r,o){return Zone.current.scheduleMacroTask(e,t,n,r,o)}function n(t,n){for(var r=t.length-1;r>=0;r--)"function"==typeof t[r]&&(t[r]=e(t[r],n+"_"+r));return t}function r(e,t){for(var r=e.constructor.name,a=function(a){var i=t[a],s=e[i];if(s){var c=P(e,i);if(!o(c))return"continue";e[i]=function(e){var t=function(){return e.apply(this,n(arguments,r+"."+i))};return l(t,e),t}(s)}},i=0;i<t.length;i++)a(i)}function o(e){return!e||e.writable!==!1&&!("function"==typeof e.get&&"undefined"==typeof e.set)}function a(e,t,n){var r=P(e,t);if(!r&&n){var o=P(n,t);o&&(r={enumerable:!0,configurable:!0})}if(r&&r.configurable){delete r.writable,delete r.value;var a=r.get,i=r.set,s=t.substr(2),c=Q[s];c||(c=Q[s]=B("ON_PROPERTY"+s)),r.set=function(t){var n=this;if(n||e!==X||(n=X),n){var r=n[c];r&&n.removeEventListener(s,$),i&&i.apply(n,U),"function"==typeof t?(n[c]=t,n.addEventListener(s,$,!1)):n[c]=null}},r.get=function(){var n=this;if(n||e!==X||(n=X),!n)return null;var o=n[c];if(o)return o;if(a){var i=a&&a.call(this);if(i)return r.set.call(this,i),"function"==typeof n[G]&&n.removeAttribute(t),i}return null},j(e,t,r)}}function i(e,t,n){if(t)for(var r=0;r<t.length;r++)a(e,"on"+t[r],n);else{var o=[];for(var i in e)"on"==i.substr(0,2)&&o.push(i);for(var s=0;s<o.length;s++)a(e,o[s],n)}}function s(t){var r=X[t];if(r){X[B(t)]=r,X[t]=function(){var e=n(arguments,t);switch(e.length){case 0:this[ee]=new r;break;case 1:this[ee]=new r(e[0]);break;case 2:this[ee]=new r(e[0],e[1]);break;case 3:this[ee]=new r(e[0],e[1],e[2]);break;case 4:this[ee]=new r(e[0],e[1],e[2],e[3]);break;default:throw new Error("Arg list too long.")}},l(X[t],r);var o,a=new r(function(){});for(o in a)"XMLHttpRequest"===t&&"responseBlob"===o||!function(n){"function"==typeof a[n]?X[t].prototype[n]=function(){return this[ee][n].apply(this[ee],arguments)}:j(X[t].prototype,n,{set:function(r){"function"==typeof r?(this[ee][n]=e(r,t+"."+n),l(this[ee][n],r)):this[ee][n]=r},get:function(){return this[ee][n]}})}(o);for(o in r)"prototype"!==o&&r.hasOwnProperty(o)&&(X[t][o]=r[o])}}function c(e,t,n){for(var r=e;r&&!r.hasOwnProperty(t);)r=C(r);!r&&e[t]&&(r=e);var a,i=B(t);if(r&&!(a=r[i])){a=r[i]=r[t];var s=r&&P(r,t);if(o(s)){var c=n(a,i,t);r[t]=function(){return c(this,arguments)},l(r[t],a)}}return a}function u(e,n,r){function o(e){var t=e.data;return t.args[t.cbIdx]=function(){e.invoke.apply(this,arguments)},a.apply(t.target,t.args),e}var a=null;a=c(e,n,function(e){return function(n,a){var i=r(n,a);return i.cbIdx>=0&&"function"==typeof a[i.cbIdx]?t(i.name,a[i.cbIdx],i,o,null):e.apply(n,a)}})}function l(e,t){e[B("OriginalDelegate")]=t}function f(){if(te)return ne;te=!0;try{var e=W.navigator.userAgent;return e.indexOf("MSIE ")===-1&&e.indexOf("Trident/")===-1&&e.indexOf("Edge/")===-1||(ne=!0),ne}catch(t){}}function p(e,t,n){function r(t,n){if(!t)return!1;var r=!0;n&&void 0!==n.useG&&(r=n.useG);var d=n&&n.vh,y=!0;n&&void 0!==n.chkDup&&(y=n.chkDup);var m=!1;n&&void 0!==n.rt&&(m=n.rt);for(var k=t;k&&!k.hasOwnProperty(o);)k=C(k);if(!k&&t[o]&&(k=t),!k)return!1;if(k[c])return!1;var _,b={},T=k[c]=k[o],w=k[B(a)]=k[a],E=k[B(i)]=k[i],S=k[B(s)]=k[s];n&&n.prepend&&(_=k[B(n.prepend)]=k[n.prepend]);var D=function(){if(!b.isExisting)return T.call(b.target,b.eventName,b.capture?g:v,b.options)},Z=function(e){if(!e.isRemoved){var t=oe[e.eventName],n=void 0;t&&(n=t[e.capture?F:q]);var r=n&&e.target[n];if(r)for(var o=0;o<r.length;o++){var a=r[o];if(a===e){r.splice(o,1),e.isRemoved=!0,0===r.length&&(e.allRemoved=!0,e.target[n]=null);break}}}if(e.allRemoved)return w.call(e.target,e.eventName,e.capture?g:v,e.options)},z=function(e){return T.call(b.target,b.eventName,e.invoke,b.options)},O=function(e){return _.call(b.target,b.eventName,e.invoke,b.options)},P=function(e){return w.call(e.target,e.eventName,e.invoke,e.options)},j=r?D:z,I=r?Z:P,L=function(e,t){var n=typeof t;return"function"===n&&e.callback===t||"object"===n&&e.originalDelegate===t},M=n&&n.diff?n.diff:L,R=Zone[Zone.__symbol__("BLACK_LISTED_EVENTS")],H=function(t,n,o,a,i,s){return void 0===i&&(i=!1),void 0===s&&(s=!1),function(){var c=this||e,u=arguments[1];if(!u)return t.apply(this,arguments);var l=!1;if("function"!=typeof u){if(!u.handleEvent)return t.apply(this,arguments);l=!0}if(!d||d(t,u,c,arguments)){var f=arguments[0],p=arguments[2];if(R)for(var h=0;h<R.length;h++)if(f===R[h])return t.apply(this,arguments);var v,g=!1;void 0===p?v=!1:p===!0?v=!0:p===!1?v=!1:(v=!!p&&!!p.capture,g=!!p&&!!p.once);var m,k=Zone.current,_=oe[f];if(_)m=_[v?F:q];else{var T=f+q,w=f+F,E=A+T,S=A+w;oe[f]={},oe[f][q]=E,oe[f][F]=S,m=v?S:E}var D=c[m],Z=!1;if(D){if(Z=!0,y)for(var h=0;h<D.length;h++)if(M(D[h],u))return}else D=c[m]=[];var z,O=c.constructor.name,P=ae[O];P&&(z=P[f]),z||(z=O+n+f),b.options=p,g&&(b.options.once=!1),b.target=c,b.capture=v,b.eventName=f,b.isExisting=Z;var j=r?re:null;j&&(j.taskData=b);var C=k.scheduleEventTask(z,u,j,o,a);return b.target=null,j&&(j.taskData=null),g&&(p.once=!0),C.options=p,C.target=c,C.capture=v,C.eventName=f,l&&(C.originalDelegate=u),s?D.unshift(C):D.push(C),i?c:void 0}}};return k[o]=H(T,u,j,I,m),_&&(k[f]=H(_,p,O,I,m,!0)),k[a]=function(){var t,n=this||e,r=arguments[0],o=arguments[2];t=void 0!==o&&(o===!0||o!==!1&&(!!o&&!!o.capture));var a=arguments[1];if(!a)return w.apply(this,arguments);if(!d||d(w,a,n,arguments)){var i,s=oe[r];s&&(i=s[t?F:q]);var c=i&&n[i];if(c)for(var u=0;u<c.length;u++){var l=c[u];if(M(l,a)){if(c.splice(u,1),l.isRemoved=!0,0===c.length&&(l.allRemoved=!0,n[i]=null),l.zone.cancelTask(l),m)return n;return}}return w.apply(this,arguments)}},k[i]=function(){for(var t=this||e,n=arguments[0],r=[],o=h(t,n),a=0;a<o.length;a++){var i=o[a],s=i.originalDelegate?i.originalDelegate:i.callback;r.push(s)}return r},k[s]=function(){var t=this||e,n=arguments[0];if(n){var r=oe[n];if(r){var o=r[q],i=r[F],c=t[o],u=t[i];if(c)for(var l=c.slice(),f=0;f<l.length;f++){var p=l[f],h=p.originalDelegate?p.originalDelegate:p.callback;this[a].call(this,n,h,p.options)}if(u)for(var l=u.slice(),f=0;f<l.length;f++){var p=l[f],h=p.originalDelegate?p.originalDelegate:p.callback;this[a].call(this,n,h,p.options)}}}else{for(var d=Object.keys(t),f=0;f<d.length;f++){var v=d[f],g=ie.exec(v),y=g&&g[1];y&&"removeListener"!==y&&this[s].call(this,y)}this[s].call(this,"removeListener")}if(m)return this},l(k[o],T),l(k[a],w),S&&l(k[s],S),E&&l(k[i],E),!0}for(var o=n&&n.add||M,a=n&&n.rm||R,i=n&&n.listeners||"eventListeners",s=n&&n.rmAll||"removeAllListeners",c=B(o),u="."+o+":",f="prependListener",p="."+f+":",d=function(e,t,n){if(!e.isRemoved){var r=e.callback;"object"==typeof r&&r.handleEvent&&(e.callback=function(e){return r.handleEvent(e)},e.originalDelegate=r),e.invoke(e,t,[n]);var o=e.options;if(o&&"object"==typeof o&&o.once){var i=e.originalDelegate?e.originalDelegate:e.callback;t[a].call(t,n.type,i,o)}}},v=function(t){if(t=t||e.event){var n=this||t.target||e,r=n[oe[t.type][q]];if(r)if(1===r.length)d(r[0],n,t);else for(var o=r.slice(),a=0;a<o.length&&(!t||t[se]!==!0);a++)d(o[a],n,t)}},g=function(t){if(t=t||e.event){var n=this||t.target||e,r=n[oe[t.type][F]];if(r)if(1===r.length)d(r[0],n,t);else for(var o=r.slice(),a=0;a<o.length&&(!t||t[se]!==!0);a++)d(o[a],n,t)}},y=[],m=0;m<t.length;m++)y[m]=r(t[m],n);return y}function h(e,t){var n=[];for(var r in e){var o=ie.exec(r),a=o&&o[1];if(a&&(!t||a===t)){var i=e[r];if(i)for(var s=0;s<i.length;s++)n.push(i[s])}}return n}function d(e,t){var n=e.Event;n&&n.prototype&&t.patchMethod(n.prototype,"stopImmediatePropagation",function(e){return function(t,n){t[se]=!0,e&&e.apply(t,n)}})}function v(e,n,r,o){function a(t){function n(){try{t.invoke.apply(this,arguments)}finally{t.data&&t.data.isPeriodic||("number"==typeof r.handleId?delete l[r.handleId]:r.handleId&&(r.handleId[ce]=null))}}var r=t.data;return r.args[0]=n,r.handleId=s.apply(e,r.args),t}function i(e){return u(e.data.handleId)}var s=null,u=null;n+=o,r+=o;var l={};s=c(e,n,function(r){return function(s,c){if("function"==typeof c[0]){var u={handleId:null,isPeriodic:"Interval"===o,delay:"Timeout"===o||"Interval"===o?c[1]||0:null,args:c},f=t(n,c[0],u,a,i);if(!f)return f;var p=f.data.handleId;return"number"==typeof p?l[p]=f:p&&(p[ce]=f),p&&p.ref&&p.unref&&"function"==typeof p.ref&&"function"==typeof p.unref&&(f.ref=p.ref.bind(p),f.unref=p.unref.bind(p)),"number"==typeof p||p?p:f}return r.apply(e,c)}}),u=c(e,r,function(t){return function(n,r){var o,a=r[0];"number"==typeof a?o=l[a]:(o=a&&a[ce],o||(o=a)),o&&"string"==typeof o.type?"notScheduled"!==o.state&&(o.cancelFn&&o.data.isPeriodic||0===o.runCount)&&("number"==typeof a?delete l[a]:a&&(a[ce]=null),o.zone.cancelTask(o)):t.apply(e,r)}})}function g(){Object.defineProperty=function(e,t,n){if(m(e,t))throw new TypeError("Cannot assign to read only property '"+t+"' of "+e);var r=n.configurable;return"prototype"!==t&&(n=k(e,t,n)),_(e,t,n,r)},Object.defineProperties=function(e,t){return Object.keys(t).forEach(function(n){Object.defineProperty(e,n,t[n])}),e},Object.create=function(e,t){return"object"!=typeof t||Object.isFrozen(t)||Object.keys(t).forEach(function(n){t[n]=k(e,n,t[n])}),fe(e,t)},Object.getOwnPropertyDescriptor=function(e,t){var n=le(e,t);return m(e,t)&&(n.configurable=!1),n}}function y(e,t,n){var r=n.configurable;return n=k(e,t,n),_(e,t,n,r)}function m(e,t){return e&&e[pe]&&e[pe][t]}function k(e,t,n){return Object.isFrozen(n)||(n.configurable=!0),n.configurable||(e[pe]||Object.isFrozen(e)||ue(e,pe,{writable:!0,value:{}}),e[pe]&&(e[pe][t]=!0)),n}function _(e,t,n,r){try{return ue(e,t,n)}catch(o){if(!n.configurable)throw o;"undefined"==typeof r?delete n.configurable:n.configurable=r;try{return ue(e,t,n)}catch(o){var a=null;try{a=JSON.stringify(n)}catch(o){a=n.toString()}console.log("Attempting to configure '"+t+"' with descriptor '"+a+"' on object '"+e+"' and got error, giving up: "+o)}}}function b(e,t){var n=t.WebSocket;t.EventTarget||p(t,[n.prototype]),t.WebSocket=function(e,t){var r,o,a=arguments.length>1?new n(e,t):new n(e),s=P(a,"onmessage");return s&&s.configurable===!1?(r=I(a),o=a,[M,R,"send","close"].forEach(function(e){r[e]=function(){var t=L.call(arguments);if(e===M||e===R){var n=t.length>0?t[0]:void 0;if(n){var o=Zone.__symbol__("ON_PROPERTY"+n);a[o]=r[o]}}return a[e].apply(a,t)}})):r=a,i(r,["close","error","message","open"],o),r};var r=t.WebSocket;for(var o in n)r[o]=n[o]}function T(e,t,n){if(!n)return t;var r=n.filter(function(t){return t.target===e});if(!r||0===r.length)return t;var o=r[0].ignoreProperties;return t.filter(function(e){return o.indexOf(e)===-1})}function w(e,t,n,r){if(e){var o=T(e,t,n);i(e,o,r)}}function E(e,t){if(!K||Y){var n="undefined"!=typeof WebSocket;if(S()){var r=t.__Zone_ignore_on_properties;if(J){var o=window;w(o,Oe.concat(["messageerror"]),r,C(o)),w(Document.prototype,Oe,r),"undefined"!=typeof o.SVGElement&&w(o.SVGElement.prototype,Oe,r),w(Element.prototype,Oe,r),w(HTMLElement.prototype,Oe,r),w(HTMLMediaElement.prototype,ye,r),w(HTMLFrameSetElement.prototype,ve.concat(we),r),w(HTMLBodyElement.prototype,ve.concat(we),r),w(HTMLFrameElement.prototype,Te,r),w(HTMLIFrameElement.prototype,Te,r);var a=o.HTMLMarqueeElement;a&&w(a.prototype,Ee,r);var i=o.Worker;i&&w(i.prototype,ze,r)}w(XMLHttpRequest.prototype,Se,r);var c=t.XMLHttpRequestEventTarget;c&&w(c&&c.prototype,Se,r),"undefined"!=typeof IDBIndex&&(w(IDBIndex.prototype,De,r),w(IDBRequest.prototype,De,r),w(IDBOpenDBRequest.prototype,De,r),w(IDBDatabase.prototype,De,r),w(IDBTransaction.prototype,De,r),w(IDBCursor.prototype,De,r)),n&&w(WebSocket.prototype,Ze,r)}else D(),s("XMLHttpRequest"),n&&b(e,t)}}function S(){if((J||Y)&&!P(HTMLElement.prototype,"onclick")&&"undefined"!=typeof Element){var e=P(Element.prototype,"onclick");if(e&&!e.configurable)return!1}var t="onreadystatechange",n=XMLHttpRequest.prototype,r=P(n,t);if(r){j(n,t,{enumerable:!0,configurable:!0,get:function(){return!0}});var o=new XMLHttpRequest,a=!!o.onreadystatechange;return j(n,t,r||{}),a}var i=B("fake");j(n,t,{enumerable:!0,configurable:!0,get:function(){return this[i]},set:function(e){this[i]=e}});var o=new XMLHttpRequest,s=function(){};o.onreadystatechange=s;var a=o[i]===s;return o.onreadystatechange=null,a}function D(){for(var t=function(t){var n=Oe[t],r="on"+n;self.addEventListener(n,function(t){var n,o,a=t.target;for(o=a?a.constructor.name+"."+r:"unknown."+r;a;)a[r]&&!a[r][Pe]&&(n=e(a[r],o),n[Pe]=a[r],a[r]=n),a=a.parentElement},!0)},n=0;n<Oe.length;n++)t(n)}function Z(e,t){var n="Anchor,Area,Audio,BR,Base,BaseFont,Body,Button,Canvas,Content,DList,Directory,Div,Embed,FieldSet,Font,Form,Frame,FrameSet,HR,Head,Heading,Html,IFrame,Image,Input,Keygen,LI,Label,Legend,Link,Map,Marquee,Media,Menu,Meta,Meter,Mod,OList,Object,OptGroup,Option,Output,Paragraph,Pre,Progress,Quote,Script,Select,Source,Span,Style,TableCaption,TableCell,TableCol,Table,TableRow,TableSection,TextArea,Title,Track,UList,Unknown,Video",r="ApplicationCache,EventSource,FileReader,InputMethodContext,MediaController,MessagePort,Node,Performance,SVGElementInstance,SharedWorker,TextTrack,TextTrackCue,TextTrackList,WebKitNamedFlow,Window,Worker,WorkerGlobalScope,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload,IDBRequest,IDBOpenDBRequest,IDBDatabase,IDBTransaction,IDBCursor,DBIndex,WebSocket".split(","),o="EventTarget",a=[],i=e.wtf,s=n.split(",");i?a=s.map(function(e){return"HTML"+e+"Element"}).concat(r):e[o]?a.push(o):a=r;for(var c=e.__Zone_disable_IE_check||!1,u=e.__Zone_enable_cross_context_check||!1,l=f(),h=".addEventListener:",d="[object FunctionWrapper]",v="function __BROWSERTOOLS_CONSOLE_SAFEFUNC() { [native code] }",g=0;g<Oe.length;g++){var y=Oe[g],m=y+q,k=y+F,_=A+m,b=A+k;oe[y]={},oe[y][q]=_,oe[y][F]=b}for(var g=0;g<n.length;g++)for(var T=s[g],w=ae[T]={},E=0;E<Oe.length;E++){var y=Oe[E];w[y]=T+h+y}for(var S=function(e,t,n,r){if(!c&&l)if(u)try{var o=t.toString();if(o===d||o==v)return e.apply(n,r),!1}catch(a){return e.apply(n,r),!1}else{var o=t.toString();if(o===d||o==v)return e.apply(n,r),!1}else if(u)try{t.toString()}catch(a){return e.apply(n,r),!1}return!0},D=[],g=0;g<a.length;g++){var Z=e[a[g]];D.push(Z&&Z.prototype)}return p(e,D,{vh:S}),t.patchEventTarget=p,!0}function z(e,t){d(e,t)}function O(t){if((J||Y)&&"registerElement"in t.document){var n=document.registerElement,r=["createdCallback","attachedCallback","detachedCallback","attributeChangedCallback"];document.registerElement=function(t,o){return o&&o.prototype&&r.forEach(function(t){var n="Document.registerElement::"+t,r=o.prototype;if(r.hasOwnProperty(t)){var a=P(r,t);a&&a.value?(a.value=e(a.value,n),y(o.prototype,t,a)):r[t]=e(r[t],n)}else r[t]&&(r[t]=e(r[t],n))}),n.call(document,t,o)},l(document.registerElement,n)}}(function(e){function t(e){c&&c.mark&&c.mark(e)}function n(e,t){c&&c.measure&&c.measure(e,t)}function r(t){0===I&&0===y.length&&(u||e[v]&&(u=e[v].resolve(0)),u?u[g](o):e[d](o,0)),t&&y.push(t)}function o(){if(!m){for(m=!0;y.length;){var e=y;y=[];for(var t=0;t<e.length;t++){var n=e[t];try{n.zone.runTask(n,null,null)}catch(r){P.onUnhandledError(r)}}}P.microtaskDrainDone(),m=!1}}function a(){}function i(e){return"__zone_symbol__"+e}var s="function",c=e.performance;if(t("Zone"),e.Zone)throw new Error("Zone already loaded.");var u,l=function(){function r(e,t){this._properties=null,this._parent=e,this._name=t?t.name||"unnamed":"<root>",this._properties=t&&t.properties||{},this._zoneDelegate=new p(this,this._parent&&this._parent._zoneDelegate,t)}return r.assertZonePatched=function(){if(e.Promise!==O.ZoneAwarePromise)throw new Error("Zone.js has detected that ZoneAwarePromise `(window|global).Promise` has been overwritten.\nMost likely cause is that a Promise polyfill has been loaded after Zone.js (Polyfilling Promise api is not necessary when zone.js is loaded. If you must load one, do so before loading zone.js.)")},Object.defineProperty(r,"root",{get:function(){for(var e=r.current;e.parent;)e=e.parent;return e},enumerable:!0,configurable:!0}),Object.defineProperty(r,"current",{get:function(){return j.zone},enumerable:!0,configurable:!0}),Object.defineProperty(r,"currentTask",{get:function(){return C},enumerable:!0,configurable:!0}),r.__load_patch=function(o,a){if(O.hasOwnProperty(o))throw Error("Already loaded patch: "+o);if(!e["__Zone_disable_"+o]){var i="Zone:"+o;t(i),O[o]=a(e,r,P),n(i,i)}},Object.defineProperty(r.prototype,"parent",{get:function(){return this._parent},enumerable:!0,configurable:!0}),Object.defineProperty(r.prototype,"name",{get:function(){return this._name},enumerable:!0,configurable:!0}),r.prototype.get=function(e){var t=this.getZoneWith(e);if(t)return t._properties[e]},r.prototype.getZoneWith=function(e){for(var t=this;t;){if(t._properties.hasOwnProperty(e))return t;t=t._parent}return null},r.prototype.fork=function(e){if(!e)throw new Error("ZoneSpec required!");return this._zoneDelegate.fork(this,e)},r.prototype.wrap=function(e,t){if(typeof e!==s)throw new Error("Expecting function got: "+e);var n=this._zoneDelegate.intercept(this,e,t),r=this;return function(){return r.runGuarded(n,this,arguments,t)}},r.prototype.run=function(e,t,n,r){void 0===t&&(t=void 0),void 0===n&&(n=null),void 0===r&&(r=null),j={parent:j,zone:this};try{return this._zoneDelegate.invoke(this,e,t,n,r)}finally{j=j.parent}},r.prototype.runGuarded=function(e,t,n,r){void 0===t&&(t=null),void 0===n&&(n=null),void 0===r&&(r=null),j={parent:j,zone:this};try{try{return this._zoneDelegate.invoke(this,e,t,n,r)}catch(o){if(this._zoneDelegate.handleError(this,o))throw o}}finally{j=j.parent}},r.prototype.runTask=function(e,t,n){if(e.zone!=this)throw new Error("A task can only be run in the zone of creation! (Creation: "+(e.zone||k).name+"; Execution: "+this.name+")");var r=e.state===_;if(!r||e.type!==z){var o=e.state!=w;o&&e._transitionTo(w,T),e.runCount++;var a=C;C=e,j={parent:j,zone:this};try{e.type==Z&&e.data&&!e.data.isPeriodic&&(e.cancelFn=null);try{return this._zoneDelegate.invokeTask(this,e,t,n)}catch(i){if(this._zoneDelegate.handleError(this,i))throw i}}finally{e.state!==_&&e.state!==S&&(e.type==z||e.data&&e.data.isPeriodic?o&&e._transitionTo(T,w):(e.runCount=0,this._updateTaskCount(e,-1),o&&e._transitionTo(_,w,_))),j=j.parent,C=a}}},r.prototype.scheduleTask=function(e){if(e.zone&&e.zone!==this)for(var t=this;t;){if(t===e.zone)throw Error("can not reschedule task to "+this.name+" which is descendants of the original zone "+e.zone.name);t=t.parent}e._transitionTo(b,_);var n=[];e._zoneDelegates=n,e._zone=this;try{e=this._zoneDelegate.scheduleTask(this,e)}catch(r){throw e._transitionTo(S,b,_),this._zoneDelegate.handleError(this,r),r}return e._zoneDelegates===n&&this._updateTaskCount(e,1),e.state==b&&e._transitionTo(T,b),e},r.prototype.scheduleMicroTask=function(e,t,n,r){return this.scheduleTask(new h(D,e,t,n,r,null))},r.prototype.scheduleMacroTask=function(e,t,n,r,o){return this.scheduleTask(new h(Z,e,t,n,r,o))},r.prototype.scheduleEventTask=function(e,t,n,r,o){return this.scheduleTask(new h(z,e,t,n,r,o))},r.prototype.cancelTask=function(e){if(e.zone!=this)throw new Error("A task can only be cancelled in the zone of creation! (Creation: "+(e.zone||k).name+"; Execution: "+this.name+")");e._transitionTo(E,T,w);try{this._zoneDelegate.cancelTask(this,e)}catch(t){throw e._transitionTo(S,E),this._zoneDelegate.handleError(this,t),t}return this._updateTaskCount(e,-1),e._transitionTo(_,E),e.runCount=0,e},r.prototype._updateTaskCount=function(e,t){var n=e._zoneDelegates;t==-1&&(e._zoneDelegates=null);for(var r=0;r<n.length;r++)n[r]._updateTaskCount(e.type,t)},r.__symbol__=i,r}(),f={name:"",onHasTask:function(e,t,n,r){return e.hasTask(n,r)},onScheduleTask:function(e,t,n,r){return e.scheduleTask(n,r)},onInvokeTask:function(e,t,n,r,o,a){return e.invokeTask(n,r,o,a)},onCancelTask:function(e,t,n,r){return e.cancelTask(n,r)}},p=function(){function e(e,t,n){this._taskCounts={microTask:0,macroTask:0,eventTask:0},this.zone=e,this._parentDelegate=t,this._forkZS=n&&(n&&n.onFork?n:t._forkZS),this._forkDlgt=n&&(n.onFork?t:t._forkDlgt),this._forkCurrZone=n&&(n.onFork?this.zone:t.zone),this._interceptZS=n&&(n.onIntercept?n:t._interceptZS),this._interceptDlgt=n&&(n.onIntercept?t:t._interceptDlgt),this._interceptCurrZone=n&&(n.onIntercept?this.zone:t.zone),this._invokeZS=n&&(n.onInvoke?n:t._invokeZS),this._invokeDlgt=n&&(n.onInvoke?t:t._invokeDlgt),this._invokeCurrZone=n&&(n.onInvoke?this.zone:t.zone),this._handleErrorZS=n&&(n.onHandleError?n:t._handleErrorZS),this._handleErrorDlgt=n&&(n.onHandleError?t:t._handleErrorDlgt),this._handleErrorCurrZone=n&&(n.onHandleError?this.zone:t.zone),this._scheduleTaskZS=n&&(n.onScheduleTask?n:t._scheduleTaskZS),this._scheduleTaskDlgt=n&&(n.onScheduleTask?t:t._scheduleTaskDlgt),this._scheduleTaskCurrZone=n&&(n.onScheduleTask?this.zone:t.zone),this._invokeTaskZS=n&&(n.onInvokeTask?n:t._invokeTaskZS),this._invokeTaskDlgt=n&&(n.onInvokeTask?t:t._invokeTaskDlgt),this._invokeTaskCurrZone=n&&(n.onInvokeTask?this.zone:t.zone),this._cancelTaskZS=n&&(n.onCancelTask?n:t._cancelTaskZS),this._cancelTaskDlgt=n&&(n.onCancelTask?t:t._cancelTaskDlgt),this._cancelTaskCurrZone=n&&(n.onCancelTask?this.zone:t.zone),this._hasTaskZS=null,this._hasTaskDlgt=null,this._hasTaskDlgtOwner=null,this._hasTaskCurrZone=null;var r=n&&n.onHasTask,o=t&&t._hasTaskZS;(r||o)&&(this._hasTaskZS=r?n:f,this._hasTaskDlgt=t,this._hasTaskDlgtOwner=this,this._hasTaskCurrZone=e,n.onScheduleTask||(this._scheduleTaskZS=f,this._scheduleTaskDlgt=t,this._scheduleTaskCurrZone=this.zone),n.onInvokeTask||(this._invokeTaskZS=f,this._invokeTaskDlgt=t,this._invokeTaskCurrZone=this.zone),n.onCancelTask||(this._cancelTaskZS=f,this._cancelTaskDlgt=t,this._cancelTaskCurrZone=this.zone))}return e.prototype.fork=function(e,t){return this._forkZS?this._forkZS.onFork(this._forkDlgt,this.zone,e,t):new l(e,t)},e.prototype.intercept=function(e,t,n){return this._interceptZS?this._interceptZS.onIntercept(this._interceptDlgt,this._interceptCurrZone,e,t,n):t},e.prototype.invoke=function(e,t,n,r,o){return this._invokeZS?this._invokeZS.onInvoke(this._invokeDlgt,this._invokeCurrZone,e,t,n,r,o):t.apply(n,r)},e.prototype.handleError=function(e,t){return!this._handleErrorZS||this._handleErrorZS.onHandleError(this._handleErrorDlgt,this._handleErrorCurrZone,e,t)},e.prototype.scheduleTask=function(e,t){var n=t;if(this._scheduleTaskZS)this._hasTaskZS&&n._zoneDelegates.push(this._hasTaskDlgtOwner),n=this._scheduleTaskZS.onScheduleTask(this._scheduleTaskDlgt,this._scheduleTaskCurrZone,e,t),n||(n=t);else if(t.scheduleFn)t.scheduleFn(t);else{if(t.type!=D)throw new Error("Task is missing scheduleFn.");r(t)}return n},e.prototype.invokeTask=function(e,t,n,r){return this._invokeTaskZS?this._invokeTaskZS.onInvokeTask(this._invokeTaskDlgt,this._invokeTaskCurrZone,e,t,n,r):t.callback.apply(n,r)},e.prototype.cancelTask=function(e,t){var n;if(this._cancelTaskZS)n=this._cancelTaskZS.onCancelTask(this._cancelTaskDlgt,this._cancelTaskCurrZone,e,t);else{if(!t.cancelFn)throw Error("Task is not cancelable");n=t.cancelFn(t)}return n},e.prototype.hasTask=function(e,t){try{return this._hasTaskZS&&this._hasTaskZS.onHasTask(this._hasTaskDlgt,this._hasTaskCurrZone,e,t)}catch(n){this.handleError(e,n)}},e.prototype._updateTaskCount=function(e,t){var n=this._taskCounts,r=n[e],o=n[e]=r+t;if(o<0)throw new Error("More tasks executed then were scheduled.");if(0==r||0==o){var a={microTask:n.microTask>0,macroTask:n.macroTask>0,eventTask:n.eventTask>0,change:e};this.hasTask(this.zone,a)}},e}(),h=function(){function t(n,r,o,a,i,s){this._zone=null,this.runCount=0,this._zoneDelegates=null,this._state="notScheduled",this.type=n,this.source=r,this.data=a,this.scheduleFn=i,this.cancelFn=s,this.callback=o;var c=this;n===z&&a&&a.useG?this.invoke=t.invokeTask:this.invoke=function(){return t.invokeTask.call(e,c,this,arguments)}}return t.invokeTask=function(e,t,n){e||(e=this),I++;try{return e.runCount++,e.zone.runTask(e,t,n)}finally{1==I&&o(),I--}},Object.defineProperty(t.prototype,"zone",{get:function(){return this._zone},enumerable:!0,configurable:!0}),Object.defineProperty(t.prototype,"state",{get:function(){return this._state},enumerable:!0,configurable:!0}),t.prototype.cancelScheduleRequest=function(){this._transitionTo(_,b)},t.prototype._transitionTo=function(e,t,n){if(this._state!==t&&this._state!==n)throw new Error(this.type+" '"+this.source+"': can not transition to '"+e+"', expecting state '"+t+"'"+(n?" or '"+n+"'":"")+", was '"+this._state+"'.");this._state=e,e==_&&(this._zoneDelegates=null)},t.prototype.toString=function(){return this.data&&"undefined"!=typeof this.data.handleId?this.data.handleId:Object.prototype.toString.call(this)},t.prototype.toJSON=function(){return{type:this.type,state:this.state,source:this.source,zone:this.zone.name,runCount:this.runCount}},t}(),d=i("setTimeout"),v=i("Promise"),g=i("then"),y=[],m=!1,k={name:"NO ZONE"},_="notScheduled",b="scheduling",T="scheduled",w="running",E="canceling",S="unknown",D="microTask",Z="macroTask",z="eventTask",O={},P={symbol:i,currentZoneFrame:function(){return j},onUnhandledError:a,microtaskDrainDone:a,scheduleMicroTask:r,showUncaughtError:function(){return!l[i("ignoreConsoleErrorUncaughtError")]},patchEventTarget:function(){return[]},patchOnProperties:a,patchMethod:function(){return a},bindArguments:function(){return null},setNativePromise:function(e){e&&typeof e.resolve===s&&(u=e.resolve(0))}},j={parent:null,zone:new l(null,null)},C=null,I=0;return n("Zone","Zone"),e.Zone=l})("undefined"!=typeof window&&window||"undefined"!=typeof self&&self||global);Zone.__load_patch("ZoneAwarePromise",function(e,t,n){function r(e){if(e&&e.toString===Object.prototype.toString){var t=e.constructor&&e.constructor.name;return(t?t:"")+": "+JSON.stringify(e)}return e?e.toString():Object.prototype.toString.call(e)}function o(e){n.onUnhandledError(e);try{var r=t[b];r&&"function"==typeof r&&r.call(this,e)}catch(o){}}function a(e){return e&&e.then}function i(e){return e}function s(e){return H.reject(e)}function c(e,t){return function(n){try{u(e,t,n)}catch(r){u(e,!1,r)}}}function u(e,o,a){var i=C();if(e===a)throw new TypeError(I);if(e[T]===z){var s=null;try{"object"!=typeof a&&"function"!=typeof a||(s=a&&a.then)}catch(p){return i(function(){u(e,!1,p)})(),e}if(o!==P&&a instanceof H&&a.hasOwnProperty(T)&&a.hasOwnProperty(w)&&a[T]!==z)l(a),u(e,a[T],a[w]);else if(o!==P&&"function"==typeof s)try{s.call(a,i(c(e,o)),i(c(e,!1)))}catch(p){i(function(){u(e,!1,p)})()}else{e[T]=o;var h=e[w];if(e[w]=a,e[E]===E&&o===O&&(e[T]=e[D],e[w]=e[S]),o===P&&a instanceof Error){var d=t.currentTask&&t.currentTask.data&&t.currentTask.data[_];d&&v(a,L,{configurable:!0,enumerable:!1,writable:!0,value:d})}for(var g=0;g<h.length;)f(e,h[g++],h[g++],h[g++],h[g++]);if(0==h.length&&o==P){e[T]=j;try{throw new Error("Uncaught (in promise): "+r(a)+(a&&a.stack?"\n"+a.stack:""))}catch(p){var m=p;m.rejection=a,m.promise=e,m.zone=t.current,m.task=t.currentTask,y.push(m),n.scheduleMicroTask()}}}}return e}function l(e){if(e[T]===j){try{var n=t[M];n&&"function"==typeof n&&n.call(this,{rejection:e[w],promise:e})}catch(r){}e[T]=P;for(var o=0;o<y.length;o++)e===y[o].promise&&y.splice(o,1)}}function f(e,t,n,r,o){l(e);var a=e[T],c=a?"function"==typeof r?r:i:"function"==typeof o?o:s;t.scheduleMicroTask(Z,function(){try{var r=e[w],o=n&&E===n[E];o&&(n[S]=r,n[D]=a);var l=t.run(c,void 0,o&&c!==s&&c!==i?[]:[r]);u(n,!0,l)}catch(f){u(n,!1,f)}},n)}function p(e){var t=e.prototype,n=d(t,"then");if(!n||n.writable!==!1&&n.configurable){var r=t.then;t[k]=r,e.prototype.then=function(e,t){var n=this,o=new H(function(e,t){r.call(n,e,t)});return o.then(e,t)},e[A]=!0}}function h(e){return function(){var t=e.apply(this,arguments);if(t instanceof H)return t;var n=t.constructor;return n[A]||p(n),t}}var d=Object.getOwnPropertyDescriptor,v=Object.defineProperty,g=n.symbol,y=[],m=g("Promise"),k=g("then"),_="__creationTrace__";n.onUnhandledError=function(e){if(n.showUncaughtError()){var t=e&&e.rejection;t?console.error("Unhandled Promise rejection:",t instanceof Error?t.message:t,"; Zone:",e.zone.name,"; Task:",e.task&&e.task.source,"; Value:",t,t instanceof Error?t.stack:void 0):console.error(e)}},n.microtaskDrainDone=function(){for(;y.length;)for(var e=function(){var e=y.shift();try{e.zone.runGuarded(function(){throw e})}catch(t){o(t)}};y.length;)e()};var b=g("unhandledPromiseRejectionHandler"),T=g("state"),w=g("value"),E=g("finally"),S=g("parentPromiseValue"),D=g("parentPromiseState"),Z="Promise.then",z=null,O=!0,P=!1,j=0,C=function(){var e=!1;return function(t){return function(){e||(e=!0,t.apply(null,arguments))}}},I="Promise resolved with itself",L=g("currentTaskTrace"),M=g("rejectionHandledHandler"),R="function ZoneAwarePromise() { [native code] }",H=function(){function e(t){var n=this;if(!(n instanceof e))throw new Error("Must be an instanceof Promise.");n[T]=z,n[w]=[];try{t&&t(c(n,O),c(n,P))}catch(r){u(n,!1,r)}}return e.toString=function(){return R},e.resolve=function(e){return u(new this(null),O,e)},e.reject=function(e){return u(new this(null),P,e)},e.race=function(e){function t(e){i&&(i=r(e))}function n(e){i&&(i=o(e))}for(var r,o,i=new this(function(e,t){r=e,o=t}),s=0,c=e;s<c.length;s++){var u=c[s];a(u)||(u=this.resolve(u)),u.then(t,n)}return i},e.all=function(e){for(var t,n,r=new this(function(e,r){t=e,n=r}),o=0,i=[],s=0,c=e;s<c.length;s++){var u=c[s];a(u)||(u=this.resolve(u)),u.then(function(e){return function(n){i[e]=n,o--,o||t(i)}}(o),n),o++}return o||t(i),r},e.prototype.then=function(e,n){var r=new this.constructor(null),o=t.current;return this[T]==z?this[w].push(o,r,e,n):f(this,o,r,e,n),r},e.prototype["catch"]=function(e){return this.then(null,e)},e.prototype["finally"]=function(e){var n=new this.constructor(null);n[E]=E;var r=t.current;return this[T]==z?this[w].push(r,n,e,e):f(this,r,n,e,e),n},e}();H.resolve=H.resolve,H.reject=H.reject,H.race=H.race,H.all=H.all;var x=e[m]=e.Promise,F=t.__symbol__("ZoneAwarePromise"),q=d(e,"Promise");q&&!q.configurable||(q&&delete q.writable,q&&delete q.value,q||(q={configurable:!0,enumerable:!0}),q.get=function(){return e[F]?e[F]:e[m]},q.set=function(t){t===H?e[F]=t:(e[m]=t,t.prototype[k]||p(t),n.setNativePromise(t))},v(e,"Promise",q)),e.Promise=H;var A=g("thenPatched");if(x){p(x);var B=e.fetch;"function"==typeof B&&(e.fetch=h(B))}return Promise[t.__symbol__("uncaughtPromiseErrors")]=y,H});var P=Object.getOwnPropertyDescriptor,j=Object.defineProperty,C=Object.getPrototypeOf,I=Object.create,L=Array.prototype.slice,M="addEventListener",R="removeEventListener",H=Zone.__symbol__(M),x=Zone.__symbol__(R),F="true",q="false",A="__zone_symbol__",B=Zone.__symbol__,N="undefined"!=typeof window,W=N?window:void 0,X=N&&W||"object"==typeof self&&self||global,G="removeAttribute",U=[null],V="undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope,K=!("nw"in X)&&"undefined"!=typeof X.process&&"[object process]"==={}.toString.call(X.process),J=!K&&!V&&!(!N||!W.HTMLElement),Y="undefined"!=typeof X.process&&"[object process]"==={}.toString.call(X.process)&&!V&&!(!N||!W.HTMLElement),Q={},$=function(e){if(e=e||X.event){var t=Q[e.type];t||(t=Q[e.type]=B("ON_PROPERTY"+e.type));var n=this||e.target||X,r=n[t],o=r&&r.apply(this,arguments);return void 0==o||o||e.preventDefault(),o}},ee=B("originalInstance"),te=!1,ne=!1;Zone.__load_patch("toString",function(e){var t=Function.prototype.toString,n=B("OriginalDelegate"),r=B("Promise"),o=B("Error"),a=function(){if("function"==typeof this){var a=this[n];if(a)return"function"==typeof a?t.apply(this[n],arguments):Object.prototype.toString.call(a);if(this===Promise){var i=e[r];if(i)return t.apply(i,arguments)}if(this===Error){var s=e[o];if(s)return t.apply(s,arguments)}}return t.apply(this,arguments)};a[n]=t,Function.prototype.toString=a;var i=Object.prototype.toString,s="[object Promise]";Object.prototype.toString=function(){return this instanceof Promise?s:i.apply(this,arguments)}});var re={useG:!0},oe={},ae={},ie=/^__zone_symbol__(\w+)(true|false)$/,se="__zone_symbol__propagationStopped",ce=B("zoneTask"),ue=Object[B("defineProperty")]=Object.defineProperty,le=Object[B("getOwnPropertyDescriptor")]=Object.getOwnPropertyDescriptor,fe=Object.create,pe=B("unconfigurables"),he=["abort","animationcancel","animationend","animationiteration","auxclick","beforeinput","blur","cancel","canplay","canplaythrough","change","compositionstart","compositionupdate","compositionend","cuechange","click","close","contextmenu","curechange","dblclick","drag","dragend","dragenter","dragexit","dragleave","dragover","drop","durationchange","emptied","ended","error","focus","focusin","focusout","gotpointercapture","input","invalid","keydown","keypress","keyup","load","loadstart","loadeddata","loadedmetadata","lostpointercapture","mousedown","mouseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","mousewheel","orientationchange","pause","play","playing","pointercancel","pointerdown","pointerenter","pointerleave","pointerlockchange","mozpointerlockchange","webkitpointerlockerchange","pointerlockerror","mozpointerlockerror","webkitpointerlockerror","pointermove","pointout","pointerover","pointerup","progress","ratechange","reset","resize","scroll","seeked","seeking","select","selectionchange","selectstart","show","sort","stalled","submit","suspend","timeupdate","volumechange","touchcancel","touchmove","touchstart","touchend","transitioncancel","transitionend","waiting","wheel"],de=["afterscriptexecute","beforescriptexecute","DOMContentLoaded","fullscreenchange","mozfullscreenchange","webkitfullscreenchange","msfullscreenchange","fullscreenerror","mozfullscreenerror","webkitfullscreenerror","msfullscreenerror","readystatechange","visibilitychange"],ve=["absolutedeviceorientation","afterinput","afterprint","appinstalled","beforeinstallprompt","beforeprint","beforeunload","devicelight","devicemotion","deviceorientation","deviceorientationabsolute","deviceproximity","hashchange","languagechange","message","mozbeforepaint","offline","online","paint","pageshow","pagehide","popstate","rejectionhandled","storage","unhandledrejection","unload","userproximity","vrdisplyconnected","vrdisplaydisconnected","vrdisplaypresentchange"],ge=["beforecopy","beforecut","beforepaste","copy","cut","paste","dragstart","loadend","animationstart","search","transitionrun","transitionstart","webkitanimationend","webkitanimationiteration","webkitanimationstart","webkittransitionend"],ye=["encrypted","waitingforkey","msneedkey","mozinterruptbegin","mozinterruptend"],me=["activate","afterupdate","ariarequest","beforeactivate","beforedeactivate","beforeeditfocus","beforeupdate","cellchange","controlselect","dataavailable","datasetchanged","datasetcomplete","errorupdate","filterchange","layoutcomplete","losecapture","move","moveend","movestart","propertychange","resizeend","resizestart","rowenter","rowexit","rowsdelete","rowsinserted","command","compassneedscalibration","deactivate","help","mscontentzoom","msmanipulationstatechanged","msgesturechange","msgesturedoubletap","msgestureend","msgesturehold","msgesturestart","msgesturetap","msgotpointercapture","msinertiastart","mslostpointercapture","mspointercancel","mspointerdown","mspointerenter","mspointerhover","mspointerleave","mspointermove","mspointerout","mspointerover","mspointerup","pointerout","mssitemodejumplistitemremoved","msthumbnailclick","stop","storagecommit"],ke=["webglcontextrestored","webglcontextlost","webglcontextcreationerror"],_e=["autocomplete","autocompleteerror"],be=["toggle"],Te=["load"],we=["blur","error","focus","load","resize","scroll","messageerror"],Ee=["bounce","finish","start"],Se=["loadstart","progress","abort","error","load","progress","timeout","loadend","readystatechange"],De=["upgradeneeded","complete","abort","success","error","blocked","versionchange","close"],Ze=["close","error","open","message"],ze=["error","message"],Oe=he.concat(ke,_e,be,de,ve,ge,me),Pe=B("unbound");
+Zone.__load_patch("util",function(e,t,r){r.patchOnProperties=i,r.patchMethod=c,r.bindArguments=n}),Zone.__load_patch("timers",function(e){var t="set",n="clear";v(e,t,n,"Timeout"),v(e,t,n,"Interval"),v(e,t,n,"Immediate")}),Zone.__load_patch("requestAnimationFrame",function(e){v(e,"request","cancel","AnimationFrame"),v(e,"mozRequest","mozCancel","AnimationFrame"),v(e,"webkitRequest","webkitCancel","AnimationFrame")}),Zone.__load_patch("blocking",function(e,t){for(var n=["alert","prompt","confirm"],r=0;r<n.length;r++){var o=n[r];c(e,o,function(n,r,o){return function(r,a){return t.current.run(n,e,a,o)}})}}),Zone.__load_patch("EventTarget",function(e,t,n){var r=t.__symbol__("BLACK_LISTED_EVENTS");e[r]&&(t[r]=e[r]),z(e,n),Z(e,n);var o=e.XMLHttpRequestEventTarget;o&&o.prototype&&n.patchEventTarget(e,[o.prototype]),s("MutationObserver"),s("WebKitMutationObserver"),s("IntersectionObserver"),s("FileReader")}),Zone.__load_patch("on_property",function(e,t,n){E(n,e),g(),O(e)}),Zone.__load_patch("canvas",function(e){var t=e.HTMLCanvasElement;"undefined"!=typeof t&&t.prototype&&t.prototype.toBlob&&u(t.prototype,"toBlob",function(e,t){return{name:"HTMLCanvasElement.toBlob",target:e,cbIdx:0,args:t}})}),Zone.__load_patch("XHR",function(e,n){function r(e){function n(e){return e[o]}function r(e){XMLHttpRequest[s]=!1;var t=e.data,n=t.target,r=n[i];h||(h=n[H],d=n[x]),r&&d.call(n,y,r);var a=n[i]=function(){n.readyState===n.DONE&&!t.aborted&&XMLHttpRequest[s]&&e.state===m&&e.invoke()};h.call(n,y,a);var c=n[o];return c||(n[o]=e),b.apply(n,t.args),XMLHttpRequest[s]=!0,e}function l(){}function f(e){var t=e.data;return t.aborted=!0,T.apply(t.target,t.args)}var p=XMLHttpRequest.prototype,h=p[H],d=p[x];if(!h){var v=e.XMLHttpRequestEventTarget;if(v){var g=v.prototype;h=g[H],d=g[x]}}var y="readystatechange",m="scheduled",k=c(p,"open",function(){return function(e,t){return e[a]=0==t[2],e[u]=t[1],k.apply(e,t)}}),_="XMLHttpRequest.send",b=c(p,"send",function(){return function(e,n){if(e[a])return b.apply(e,n);var o={target:e,url:e[u],isPeriodic:!1,delay:null,args:n,aborted:!1};return t(_,l,o,r,f)}}),T=c(p,"abort",function(){return function(e){var t=n(e);if(t&&"string"==typeof t.type){if(null==t.cancelFn||t.data&&t.data.aborted)return;t.zone.cancelTask(t)}}})}r(e);var o=B("xhrTask"),a=B("xhrSync"),i=B("xhrListener"),s=B("xhrScheduled"),u=B("xhrURL")}),Zone.__load_patch("geolocation",function(e){e.navigator&&e.navigator.geolocation&&r(e.navigator.geolocation,["getCurrentPosition","watchPosition"])}),Zone.__load_patch("PromiseRejectionEvent",function(e,t){function n(t){return function(n){var r=h(e,t);r.forEach(function(r){var o=e.PromiseRejectionEvent;if(o){var a=new o(t,{promise:n.promise,reason:n.rejection});r.invoke(a)}})}}e.PromiseRejectionEvent&&(t[B("unhandledPromiseRejectionHandler")]=n("unhandledrejection"),t[B("rejectionHandledHandler")]=n("rejectionhandled"))})});
\ No newline at end of file
diff --git a/package.json b/package.json
index 8cbc6b08e..6eef8f154 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zone.js",
-  "version": "0.8.21",
+  "version": "0.8.22",
   "description": "Zones for JavaScript",
   "main": "dist/zone-node.js",
   "browser": "dist/zone.js",